diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-01-24 18:58:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-24 18:58:58 +0100 |
| commit | 1ef8e73ab5ef6ea72297bed35ecc1f0f0703c46f (patch) | |
| tree | ab772b77fed05e050b16c471950a79896b0a294b /filedistribution | |
| parent | 4e54a8cf76b8b472b20645b7dd0a2036e5637e3d (diff) | |
Revert "Bjorncs/bundle cleanup [run-systemtest]" (#25713)
Diffstat (limited to 'filedistribution')
| -rw-r--r-- | filedistribution/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | filedistribution/pom.xml | 23 |
2 files changed, 23 insertions, 1 deletions
diff --git a/filedistribution/CMakeLists.txt b/filedistribution/CMakeLists.txt index 05c9ec571fb..73c581c0b7f 100644 --- a/filedistribution/CMakeLists.txt +++ b/filedistribution/CMakeLists.txt @@ -1 +1,2 @@ # 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 a2dd5081c48..6485919b14b 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -14,7 +14,7 @@ <artifactId>filedistribution</artifactId> <version>8-SNAPSHOT</version> - <packaging>jar</packaging> + <packaging>container-plugin</packaging> <name>${project.artifactId}</name> <dependencies> @@ -56,9 +56,30 @@ <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> |