[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/files/, dev-java/snappy/

[Miroslav Šulc]

commit:     9fcef6d71f67f917d61d241421fa60c7e60b8988
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Sep 21 13:28:28 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Oct  1 07:40:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fcef6d7

dev-java/snappy: depend on commons-lang:3.6

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch     | 11 +++++++++++
 .../{snappy-1.1.10.1.ebuild => snappy-1.1.10.1-r1.ebuild}     |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch 
b/dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch
new file mode 100644
index 000000000000..064482eabb7f
--- /dev/null
+++ b/dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch
@@ -0,0 +1,11 @@
+--- 
a/src/test/java/org/xerial/snappy/SnappyHadoopCompatibleOutputStreamTest.java
++++ 
b/src/test/java/org/xerial/snappy/SnappyHadoopCompatibleOutputStreamTest.java
+@@ -2,7 +2,7 @@ package org.xerial.snappy;
+ 
+ import org.apache.commons.io.FileUtils;
+ import org.apache.commons.io.IOUtils;
+-import org.apache.commons.lang.SystemUtils;
++import org.apache.commons.lang3.SystemUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.hadoop.io.compress.SnappyCodec;
+ import org.junit.AfterClass;

diff --git a/dev-java/snappy/snappy-1.1.10.1.ebuild 
b/dev-java/snappy/snappy-1.1.10.1-r1.ebuild
similarity index 96%
rename from dev-java/snappy/snappy-1.1.10.1.ebuild
rename to dev-java/snappy/snappy-1.1.10.1-r1.ebuild
index 2813bcdd4901..9097dcb28f01 100644
--- a/dev-java/snappy/snappy-1.1.10.1.ebuild
+++ b/dev-java/snappy/snappy-1.1.10.1-r1.ebuild
@@ -35,7 +35,7 @@ DEPEND=">=virtual/jdk-1.8:*
        test? (
                dev-java/ant-junit4:0
                dev-java/commons-io:1
-               dev-java/commons-lang:2.1
+               dev-java/commons-lang:3.6
                dev-java/plexus-classworlds:0
                dev-java/xerial-core:0
        )"
@@ -50,6 +50,7 @@ PATCHES=(
        "${FILESDIR}/1.1.7.8-unbundle-bitshuffle.patch"
        "${FILESDIR}/1.1.7.8-gentoo.patch"
        "${FILESDIR}/snappy-1.1.10.1-SnappyOutputStreamTest.patch"
+       "${FILESDIR}/snappy-1.1.10.1-commons-lang3.patch"
 )
 
 JAVA_RESOURCE_DIRS="src/main/resources"
@@ -57,7 +58,7 @@ JAVA_SRC_DIR="src/main/java"
 
 JAVA_TEST_GENTOO_CLASSPATH="
        commons-io-1
-       commons-lang-2.1
+       commons-lang-3.6
        junit-4
        plexus-classworlds
        xerial-core