diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-03-07 18:46:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-07 18:46:41 +0100 |
commit | 8bb70ca7166fc33b77b429f5c0311ed09a7dd920 (patch) | |
tree | 2e154f542cea745afca461898d98af626d1dca68 | |
parent | 3eb6aa9161ca016d8db3914970054d5519052c45 (diff) |
Revert "Revert "Revert "Upgrade from net.jpountz.lz4 1.3.0 to org.lz4 1.7.1"""
-rw-r--r-- | container-dependencies-enforcer/pom.xml | 2 | ||||
-rw-r--r-- | container-dependency-versions/pom.xml | 8 | ||||
-rw-r--r-- | vespajlib/pom.xml | 4 | ||||
-rw-r--r-- | vespajlib/src/main/java/net/jpountz/lz4/package-info.java | 2 | ||||
-rw-r--r-- | vespajlib/src/main/java/net/jpountz/util/package-info.java | 5 | ||||
-rw-r--r-- | vespajlib/src/main/java/net/jpountz/xxhash/package-info.java | 2 |
6 files changed, 9 insertions, 14 deletions
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 224fd47b256..34ad2883625 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -97,7 +97,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:[${org.lz4.version}]:jar:provided</include> + <include>net.jpountz.lz4:lz4:[${lz4.version}]:jar:provided</include> <include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided</include> <include>org.apache.felix:org.apache.felix.log:[${felix.log.version}]: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 3e73e8bdf5e..af1d7293b29 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -179,9 +179,9 @@ <version>1.0</version> </dependency> <dependency> - <groupId>org.lz4</groupId> - <artifactId>lz4-java</artifactId> - <version>${org.lz4.version}</version> + <groupId>net.jpountz.lz4</groupId> + <artifactId>lz4</artifactId> + <version>${lz4.version}</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -447,7 +447,7 @@ <javax.servlet-api.version>3.1.0</javax.servlet-api.version> <jaxb.version>2.3.0</jaxb.version> <jetty.version>9.4.27.v20200227</jetty.version> - <org.lz4.version>1.7.1</org.lz4.version> + <lz4.version>1.3.0</lz4.version> <org.json.version>20090211</org.json.version> <slf4j.version>1.7.5</slf4j.version> <xml-apis.version>1.4.01</xml-apis.version> diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml index 7631a2af0fb..a8380e9513c 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>org.apache.commons</groupId> diff --git a/vespajlib/src/main/java/net/jpountz/lz4/package-info.java b/vespajlib/src/main/java/net/jpountz/lz4/package-info.java index 3536beff420..25c41288d47 100644 --- a/vespajlib/src/main/java/net/jpountz/lz4/package-info.java +++ b/vespajlib/src/main/java/net/jpountz/lz4/package-info.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 1, minor = 7, micro = 1)) +@ExportPackage(version = @Version(major = 1, minor = 3, micro = 0)) package net.jpountz.lz4; import com.yahoo.osgi.annotation.ExportPackage; import com.yahoo.osgi.annotation.Version; diff --git a/vespajlib/src/main/java/net/jpountz/util/package-info.java b/vespajlib/src/main/java/net/jpountz/util/package-info.java deleted file mode 100644 index f09b2dde726..00000000000 --- a/vespajlib/src/main/java/net/jpountz/util/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 1, minor = 7, micro = 1)) -package net.jpountz.util; -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; diff --git a/vespajlib/src/main/java/net/jpountz/xxhash/package-info.java b/vespajlib/src/main/java/net/jpountz/xxhash/package-info.java index e8ad7b05556..7599a76f46c 100644 --- a/vespajlib/src/main/java/net/jpountz/xxhash/package-info.java +++ b/vespajlib/src/main/java/net/jpountz/xxhash/package-info.java @@ -1,5 +1,5 @@ // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 1, minor = 7, micro = 1)) +@ExportPackage(version = @Version(major = 1, minor = 3, micro = 0)) package net.jpountz.xxhash; import com.yahoo.osgi.annotation.ExportPackage; import com.yahoo.osgi.annotation.Version; |