aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2023-07-11 12:04:40 +0200
committerGitHub <noreply@github.com>2023-07-11 12:04:40 +0200
commitff0b7e8b0f5bb4543c93b75bca899a265fe73ed2 (patch)
treeecae1ced16afb9440404dd0cd04ea9fc81d4b257
parent612c48ffb15e452d8c29e8df474c15281cc171d6 (diff)
parent86dc16a4bc6b228246d5b2823c893a63630cfd0a (diff)
Merge pull request #27688 from vespa-engine/renovate/com.github.luben-zstd-jni-1.x
Update dependency com.github.luben:zstd-jni to v1.5.5-4
-rw-r--r--airlift-zstd/pom.xml1
-rw-r--r--parent/pom.xml6
-rw-r--r--vespa-dependencies-enforcer/allowed-maven-dependencies.txt2
3 files changed, 7 insertions, 2 deletions
diff --git a/airlift-zstd/pom.xml b/airlift-zstd/pom.xml
index 9d9cb344891..6de23df5496 100644
--- a/airlift-zstd/pom.xml
+++ b/airlift-zstd/pom.xml
@@ -29,7 +29,6 @@
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
- <version>1.5.2-1</version>
<scope>test</scope>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 47b257c7e00..07bcd175a2f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -491,6 +491,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>com.github.luben</groupId>
+ <artifactId>zstd-jni</artifactId>
+ <version>1.5.5-4</version>
+ </dependency>
+ <dependency>
<!-- Needed by zookeeper, which has an optional dependency.
Version must be the same as the one zk uses - check the zk pom file. -->
<groupId>com.github.spotbugs</groupId>
@@ -1126,6 +1131,7 @@
<artifactId>checker-qual</artifactId>
<version>3.30.0</version>
</dependency>
+
</dependencies>
</dependencyManagement>
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index d0dd136aa69..5199ca0c479 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -220,7 +220,7 @@ xml-apis:xml-apis:1.4.01
#[test-only]
# Contains dependencies that are used exclusively in 'test' scope
-com.github.luben:zstd-jni:1.5.2-1
+com.github.luben:zstd-jni:1.5.5-4
com.github.tomakehurst:wiremock-jre8-standalone:2.35.0
com.google.guava:guava-testlib:27.1-jre
com.google.inject:guice:4.2.3