From 13a8fcccc20ca98f7b9d7c427874d05fc56259aa Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Thu, 25 Apr 2019 08:49:26 +0200
Subject: Revert "Update to newer java lz4 version (1.5.1) and use new artifact
 ids"

---
 config/pom.xml                          |  4 ++--
 configserver/pom.xml                    |  4 ++--
 container-dependencies-enforcer/pom.xml |  2 +-
 container-dependency-versions/pom.xml   | 10 +++++-----
 docker-api/pom.xml                      |  4 ++--
 document/pom.xml                        |  4 ++--
 vespajlib/pom.xml                       |  4 ++--
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/config/pom.xml b/config/pom.xml
index 8f0b728edcb..40ad965a410 100755
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -83,8 +83,8 @@
       <artifactId>jackson-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.lz4</groupId>
-      <artifactId>lz4-java</artifactId>
+      <groupId>net.jpountz.lz4</groupId>
+      <artifactId>lz4</artifactId>
     </dependency>
   </dependencies>
   <profiles>
diff --git a/configserver/pom.xml b/configserver/pom.xml
index 5391d6636f9..f346cde63a3 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -208,8 +208,8 @@
       <artifactId>jersey-proxy-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.lz4</groupId>
-      <artifactId>lz4-java</artifactId>
+      <groupId>net.jpountz.lz4</groupId>
+      <artifactId>lz4</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml
index 6a8fdbcfa95..70c572185dc 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>org.lz4:lz4-java:[1.5.1]:jar:provided</include>
+                                                <include>net.jpountz.lz4:lz4:[1.3.0]: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 99e8ad2919c..48cd9da9a01 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -213,6 +213,11 @@
                 <artifactId>jcip-annotations</artifactId>
                 <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>
@@ -353,11 +358,6 @@
                 <artifactId>mimepull</artifactId>
                 <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>
diff --git a/docker-api/pom.xml b/docker-api/pom.xml
index 749ed513aac..1cb03f1819d 100644
--- a/docker-api/pom.xml
+++ b/docker-api/pom.xml
@@ -100,8 +100,8 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.lz4</groupId>
-            <artifactId>lz4-java</artifactId>
+            <groupId>net.jpountz.lz4</groupId>
+            <artifactId>lz4</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/document/pom.xml b/document/pom.xml
index f21efe6de31..19f1a9470fc 100644
--- a/document/pom.xml
+++ b/document/pom.xml
@@ -40,8 +40,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.lz4</groupId>
-            <artifactId>lz4-java</artifactId>
+            <groupId>net.jpountz.lz4</groupId>
+            <artifactId>lz4</artifactId>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml
index c1843dd4b09..32040785fc2 100644
--- a/vespajlib/pom.xml
+++ b/vespajlib/pom.xml
@@ -20,8 +20,8 @@
 
     <!-- compile scope -->
     <dependency>
-      <groupId>org.lz4</groupId>
-      <artifactId>lz4-java</artifactId>
+      <groupId>net.jpountz.lz4</groupId>
+      <artifactId>lz4</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
-- 
cgit v1.2.3