diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-03-09 13:59:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-09 13:59:42 +0100 |
| commit | dcb329a743be6dfbd51030f3bdb95a9fc4c1d36b (patch) | |
| tree | 3f6e4033c2f2d700c186c9b159d2338db7f3164b /vespajlib | |
| parent | a70515167a9f7f717d47002a6f41503d535a4048 (diff) | |
| parent | dbf7d9bcf251a027f9f39d84eae75fb043484281 (diff) | |
Merge pull request #12501 from vespa-engine/revert-12498-revert-12494-revert-12492-revert-12480-balder/lz4-from-net.jpountz-to-org.lz4
Revert "Revert "Revert "Revert "Upgrade from net.jpountz.lz4 1.3.0 to org.lz4 1.7.1""""
Diffstat (limited to 'vespajlib')
4 files changed, 9 insertions, 4 deletions
diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml index a8380e9513c..7631a2af0fb 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>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 25c41288d47..3536beff420 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 = 3, micro = 0)) +@ExportPackage(version = @Version(major = 1, minor = 7, micro = 1)) 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 new file mode 100644 index 00000000000..f09b2dde726 --- /dev/null +++ b/vespajlib/src/main/java/net/jpountz/util/package-info.java @@ -0,0 +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)) +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 7599a76f46c..e8ad7b05556 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 = 3, micro = 0)) +@ExportPackage(version = @Version(major = 1, minor = 7, micro = 1)) package net.jpountz.xxhash; import com.yahoo.osgi.annotation.ExportPackage; import com.yahoo.osgi.annotation.Version; |