diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2023-01-25 14:55:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-25 14:55:14 +0100 |
| commit | 5865dcca9bb427fd265609b4edf80e8fdd30a168 (patch) | |
| tree | a6b2b2e167023c6c456347ee8eeaccbcdf634081 /filedistribution | |
| parent | 904dd2bd8e3a19d4552719ca52baa427d511fcde (diff) | |
Revert "Revert "Bjorncs/bundle cleanup [run-systemtest]" (#25713)"
This reverts commit 1ef8e73ab5ef6ea72297bed35ecc1f0f0703c46f.
Diffstat (limited to 'filedistribution')
| -rw-r--r-- | filedistribution/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | filedistribution/pom.xml | 23 |
2 files changed, 1 insertions, 23 deletions
diff --git a/filedistribution/CMakeLists.txt b/filedistribution/CMakeLists.txt index 73c581c0b7f..05c9ec571fb 100644 --- a/filedistribution/CMakeLists.txt +++ b/filedistribution/CMakeLists.txt @@ -1,2 +1 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_jar(filedistribution-jar-with-dependencies.jar) diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index 6485919b14b..a2dd5081c48 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -14,7 +14,7 @@ <artifactId>filedistribution</artifactId> <version>8-SNAPSHOT</version> - <packaging>container-plugin</packaging> + <packaging>jar</packaging> <name>${project.artifactId}</name> <dependencies> @@ -56,30 +56,9 @@ <build> <plugins> <plugin> - <groupId>com.yahoo.vespa</groupId> - <artifactId>bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <configuration> - <finalName>${project.artifactId}-jar-with-dependencies</finalName> - <createDependencyReducedPom>false</createDependencyReducedPom> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> |