diff options
| -rw-r--r-- | container-dev/pom.xml | 8 | ||||
| -rw-r--r-- | container/pom.xml | 4 | ||||
| -rw-r--r-- | jdisc_core/pom.xml | 3 | ||||
| -rw-r--r-- | model-integration/pom.xml | 22 | ||||
| -rw-r--r-- | vespa-3party-jars/pom.xml | 4 | ||||
| -rw-r--r-- | vespa-athenz/pom.xml | 9 |
6 files changed, 44 insertions, 6 deletions
diff --git a/container-dev/pom.xml b/container-dev/pom.xml index c327b73d953..bc87185bf25 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -54,6 +54,10 @@ <classifier>no_aop</classifier> </dependency> <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -171,10 +175,6 @@ <artifactId>commons-exec</artifactId> </exclusion> <exclusion> - <groupId>net.java.dev.jna</groupId> - <artifactId>jna</artifactId> - </exclusion> - <exclusion> <groupId>net.openhft</groupId> <artifactId>zero-allocation-hashing</artifactId> </exclusion> diff --git a/container/pom.xml b/container/pom.xml index 5a48394accd..29216b6579c 100644 --- a/container/pom.xml +++ b/container/pom.xml @@ -34,6 +34,10 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>airlift-zstd</artifactId> </exclusion> + <exclusion> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 0e261f9dbef..c5263da0803 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -195,7 +195,7 @@ <goal>copy-dependencies</goal> </goals> <configuration> - <excludeTransitive>true</excludeTransitive> + <excludeTransitive>false</excludeTransitive> <stripVersion>true</stripVersion> <outputDirectory>${project.build.directory}/dependency</outputDirectory> </configuration> @@ -227,6 +227,7 @@ <argument>${project.build.directory}/dependency/slf4j-api.jar</argument> <argument>${project.build.directory}/dependency/slf4j-jdk14.jar</argument> <argument>${project.build.directory}/dependency/jcl-over-slf4j.jar</argument> + <argument>${project.build.directory}/dependency/jna.jar</argument> <argument>${project.build.directory}/dependency/log4j-over-slf4j.jar</argument> <argument>${project.build.directory}/dependency/annotations.jar</argument> <argument>${project.build.directory}/dependency/config-lib.jar</argument> diff --git a/model-integration/pom.xml b/model-integration/pom.xml index 67f22b80d18..1302984a314 100644 --- a/model-integration/pom.xml +++ b/model-integration/pom.xml @@ -32,6 +32,13 @@ <scope>provided</scope> </dependency> <dependency> + <!-- required for bundle-plugin to generate import-package statements for Java's standard library + misc 3party --> + <groupId>com.yahoo.vespa</groupId> + <artifactId>jdisc_core</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>searchlib</artifactId> <version>${project.version}</version> @@ -61,6 +68,11 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>com.google.protobuf</groupId> @@ -76,7 +88,15 @@ <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </exclusion> - </exclusions> + <exclusion> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/vespa-3party-jars/pom.xml b/vespa-3party-jars/pom.xml index 4c269e723b6..9158c8ba281 100644 --- a/vespa-3party-jars/pom.xml +++ b/vespa-3party-jars/pom.xml @@ -29,6 +29,10 @@ <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk18on</artifactId> </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + </dependency> </dependencies> <build> diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml index 8a649154960..d71948b59d3 100644 --- a/vespa-athenz/pom.xml +++ b/vespa-athenz/pom.xml @@ -41,6 +41,11 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <scope>provided</scope> + </dependency> <!-- test --> <dependency> @@ -119,6 +124,10 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </exclusion> + <exclusion> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + </exclusion> </exclusions> </dependency> <dependency> |