summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-04-26 14:32:20 +0200
committerGitHub <noreply@github.com>2019-04-26 14:32:20 +0200
commit4870be782bc2b56fb089bd554d78d2753f6f3d57 (patch)
treeaad05ece3ae8dc04261a69923cda894c1979ef74
parent5f6a5a5d626808459bc65c95eb226e746ed3d18f (diff)
Revert "Revert "Update to newer java lz4 version (1.5.1) and use new artifact ids""
-rwxr-xr-xconfig/pom.xml4
-rw-r--r--configserver/pom.xml4
-rw-r--r--container-dependencies-enforcer/pom.xml2
-rw-r--r--container-dependency-versions/pom.xml10
-rw-r--r--docker-api/pom.xml4
-rw-r--r--document/pom.xml4
-rw-r--r--vespajlib/pom.xml4
7 files changed, 16 insertions, 16 deletions
diff --git a/config/pom.xml b/config/pom.xml
index 40ad965a410..8f0b728edcb 100755
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -83,8 +83,8 @@
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
- <groupId>net.jpountz.lz4</groupId>
- <artifactId>lz4</artifactId>
+ <groupId>org.lz4</groupId>
+ <artifactId>lz4-java</artifactId>
</dependency>
</dependencies>
<profiles>
diff --git a/configserver/pom.xml b/configserver/pom.xml
index f346cde63a3..5391d6636f9 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -208,8 +208,8 @@
<artifactId>jersey-proxy-client</artifactId>
</dependency>
<dependency>
- <groupId>net.jpountz.lz4</groupId>
- <artifactId>lz4</artifactId>
+ <groupId>org.lz4</groupId>
+ <artifactId>lz4-java</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml
index 70c572185dc..6a8fdbcfa95 100644
--- a/container-dependencies-enforcer/pom.xml
+++ b/container-dependencies-enforcer/pom.xml
@@ -99,7 +99,7 @@
<include>javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided</include>
<include>javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided</include>
<include>net.jcip:jcip-annotations:[1.0]:jar:provided</include>
- <include>net.jpountz.lz4:lz4:[1.3.0]:jar:provided</include>
+ <include>org.lz4:lz4-java:[1.5.1]:jar:provided</include>
<include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided</include>
<include>org.apache.felix:org.apache.felix.log:[1.0.1]:jar:provided</include>
<include>org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided</include>
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index 48cd9da9a01..99e8ad2919c 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -214,11 +214,6 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>net.jpountz.lz4</groupId>
- <artifactId>lz4</artifactId>
- <version>1.3.0</version>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.version}</version>
@@ -359,6 +354,11 @@
<version>${mimepull.version}</version>
</dependency>
<dependency>
+ <groupId>org.lz4</groupId>
+ <artifactId>lz4-java</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
diff --git a/docker-api/pom.xml b/docker-api/pom.xml
index 1cb03f1819d..749ed513aac 100644
--- a/docker-api/pom.xml
+++ b/docker-api/pom.xml
@@ -100,8 +100,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>net.jpountz.lz4</groupId>
- <artifactId>lz4</artifactId>
+ <groupId>org.lz4</groupId>
+ <artifactId>lz4-java</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/document/pom.xml b/document/pom.xml
index 19f1a9470fc..f21efe6de31 100644
--- a/document/pom.xml
+++ b/document/pom.xml
@@ -40,8 +40,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.jpountz.lz4</groupId>
- <artifactId>lz4</artifactId>
+ <groupId>org.lz4</groupId>
+ <artifactId>lz4-java</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml
index 32040785fc2..c1843dd4b09 100644
--- a/vespajlib/pom.xml
+++ b/vespajlib/pom.xml
@@ -20,8 +20,8 @@
<!-- compile scope -->
<dependency>
- <groupId>net.jpountz.lz4</groupId>
- <artifactId>lz4</artifactId>
+ <groupId>org.lz4</groupId>
+ <artifactId>lz4-java</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>