summaryrefslogtreecommitdiffstats
path: root/model-integration
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahooinc.com>2023-01-19 17:24:11 +0100
committerBjørn Christian Seime <bjorncs@yahooinc.com>2023-01-20 10:50:39 +0100
commite05b87aa234cffa597131da4879405aed0526853 (patch)
tree897f24a06a21b9574f49075a70ba3cc0769c7641 /model-integration
parentffba12c231f17e69dcd3f72edf6308772113fd0a (diff)
Add JNA in lib/jars + export as packages from jdisc_core
Jdisc-core will embed JNA. The JNA in lib/jars is used by fatjars only.
Diffstat (limited to 'model-integration')
-rw-r--r--model-integration/pom.xml22
1 files changed, 21 insertions, 1 deletions
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>