summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--parent/pom.xml11
-rw-r--r--vespa-dependencies-enforcer/allowed-maven-dependencies.txt9
2 files changed, 20 insertions, 0 deletions
diff --git a/parent/pom.xml b/parent/pom.xml
index c6ae9cdc7e3..545db6ba1f1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -697,6 +697,12 @@
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.vespa.version}</version>
+ <classifier>linux-x86_64</classifier>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <version>${netty.vespa.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -704,6 +710,11 @@
<version>${netty-tcnative.vespa.version}</version>
</dependency>
<dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-tcnative-boringssl-static</artifactId>
+ <version>${netty-tcnative.vespa.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
<version>${prometheus.client.vespa.version}</version>
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index 1ca890eb2a8..525c77f7df6 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -58,10 +58,17 @@ io.netty:netty-codec:${netty.vespa.version}
io.netty:netty-common:${netty.vespa.version}
io.netty:netty-handler:${netty.vespa.version}
io.netty:netty-resolver:${netty.vespa.version}
+io.netty:netty-tcnative-boringssl-static:${netty-tcnative.vespa.version}
+io.netty:netty-tcnative-boringssl-static:${netty-tcnative.vespa.version}:linux-aarch_64
+io.netty:netty-tcnative-boringssl-static:${netty-tcnative.vespa.version}:linux-x86_64
+io.netty:netty-tcnative-boringssl-static:${netty-tcnative.vespa.version}:osx-aarch_64
+io.netty:netty-tcnative-boringssl-static:${netty-tcnative.vespa.version}:osx-x86_64
+io.netty:netty-tcnative-boringssl-static:${netty-tcnative.vespa.version}:windows-x86_64
io.netty:netty-tcnative-classes:${netty-tcnative.vespa.version}
io.netty:netty-tcnative:${netty-tcnative.vespa.version}
io.netty:netty-transport-classes-epoll:${netty.vespa.version}
io.netty:netty-transport-native-epoll:${netty.vespa.version}
+io.netty:netty-transport-native-epoll:${netty.vespa.version}:linux-x86_64
io.netty:netty-transport-native-unix-common:${netty.vespa.version}
io.netty:netty-transport:${netty.vespa.version}
io.prometheus:simpleclient:${prometheus.client.vespa.version}
@@ -122,8 +129,10 @@ org.apache.velocity:velocity-engine-core:${velocity.vespa.version}
org.apache.yetus:audience-annotations:0.12.0
org.apache.zookeeper:zookeeper-jute:${zookeeper.client.vespa.version}
org.apache.zookeeper:zookeeper-jute:3.8.1
+org.apache.zookeeper:zookeeper-jute:3.9.1
org.apache.zookeeper:zookeeper:${zookeeper.client.vespa.version}
org.apache.zookeeper:zookeeper:3.8.1
+org.apache.zookeeper:zookeeper:3.9.1
org.apiguardian:apiguardian-api:${apiguardian.vespa.version}
org.assertj:assertj-core:${assertj.vespa.version}
org.bouncycastle:bcpkix-jdk18on:${bouncycastle.vespa.version}