diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-04-28 21:23:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-28 21:23:35 +0200 |
| commit | 7ae52a55c4e9e9b2537cd9ee71db206066585c11 (patch) | |
| tree | 634a1fd3d61e0abf52a2866de314c6ad39773a3d | |
| parent | 8f58e1a5baf9d4a507456b6c5cbaba28914aa40a (diff) | |
| parent | 7fad239e333869bf1c21ea4a4a70da3435637b1b (diff) | |
Merge pull request #9212 from vespa-engine/revert-9200-revert-9175-revert-9157-hmusum/update-java-lz4-dep
Revert "Revert "Revert "Update to newer java lz4 version (1.5.1) and use new artifact ids"""
| -rwxr-xr-x | config/pom.xml | 4 | ||||
| -rw-r--r-- | configserver/pom.xml | 4 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | container-dependency-versions/pom.xml | 10 | ||||
| -rw-r--r-- | docker-api/pom.xml | 4 | ||||
| -rw-r--r-- | document/pom.xml | 4 | ||||
| -rw-r--r-- | 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 @@ -214,6 +214,11 @@ <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> @@ -354,11 +359,6 @@ <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 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> |