diff options
| author | gjoranv <gjoranv@gmail.com> | 2022-11-11 16:14:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-11 16:14:46 +0100 |
| commit | addec6a36075d63d2ad6e93069a7bb19bd75716a (patch) | |
| tree | 49be0324195f5f1abcc10b19441ef29c2a8324c3 | |
| parent | 141667ab79d1aa51ebc18f28838736952ec31975 (diff) | |
| parent | 20ff44985e2227374b308d5f841e2195f11fe7c5 (diff) | |
Merge pull request #24838 from vespa-engine/balder/netty-transitive-4.1.85.Final
Enforce fresh and single netty dependency.
| -rw-r--r-- | parent/pom.xml | 17 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 22 |
2 files changed, 28 insertions, 11 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index 66fffa82b6e..14e5c2154f5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -634,6 +634,21 @@ <version>${airline.version}</version> </dependency> <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-epoll</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-tcnative</artifactId> + <version>${netty-tcnative.version}</version> + </dependency> + <dependency> <groupId>io.prometheus</groupId> <artifactId>simpleclient</artifactId> <version>${prometheus.client.version}</version> @@ -1078,6 +1093,8 @@ <maven-site-plugin.version>3.9.1</maven-site-plugin.version> <maven-source-plugin.version>3.2.1</maven-source-plugin.version> <mockito.version>4.0.0</mockito.version> + <netty.version>4.1.85.Final</netty.version> + <netty-tcnative.version>2.0.54.Final</netty-tcnative.version> <onnxruntime.version>1.12.1</onnxruntime.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml --> <org.json.version>20220320</org.json.version> <org.lz4.version>1.8.0</org.lz4.version> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index b76b8c8d936..477e1f61622 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -61,17 +61,17 @@ io.dropwizard.metrics:metrics-core:3.2.5 io.jsonwebtoken:jjwt-api:0.11.2 io.jsonwebtoken:jjwt-impl:0.11.2 io.jsonwebtoken:jjwt-jackson:0.11.2 -io.netty:netty-buffer:4.1.73.Final -io.netty:netty-codec:4.1.73.Final -io.netty:netty-common:4.1.73.Final -io.netty:netty-handler:4.1.73.Final -io.netty:netty-resolver:4.1.73.Final -io.netty:netty-tcnative:2.0.48.Final -io.netty:netty-tcnative-classes:2.0.48.Final -io.netty:netty-transport:4.1.73.Final -io.netty:netty-transport-classes-epoll:4.1.73.Final -io.netty:netty-transport-native-epoll:4.1.73.Final -io.netty:netty-transport-native-unix-common:4.1.73.Final +io.netty:netty-buffer:4.1.85.Final +io.netty:netty-codec:4.1.85.Final +io.netty:netty-common:4.1.85.Final +io.netty:netty-handler:4.1.85.Final +io.netty:netty-resolver:4.1.85.Final +io.netty:netty-tcnative:2.0.54.Final +io.netty:netty-tcnative-classes:2.0.54.Final +io.netty:netty-transport:4.1.85.Final +io.netty:netty-transport-classes-epoll:4.1.85.Final +io.netty:netty-transport-native-epoll:4.1.85.Final +io.netty:netty-transport-native-unix-common:4.1.85.Final io.prometheus:simpleclient:0.6.0 io.prometheus:simpleclient_common:0.6.0 javax.annotation:javax.annotation-api:1.2 |