From bea4923ae0e1a0b5a4c54a4e4143d55f3393a5b1f375e890b7f96d6199e444e6 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 2 Nov 2020 14:43:06 +0000
Subject: [PATCH] Accepting request 844228 from
 home:pmonrealgonzalez:branches:Java:packages

- Update to 1.15
  * Fix: MurmurHash3: Ensure hash128 maintains the sign extension bug.
  * Update: Base32/Base64/BCodec: Added strict decoding property to
    control handling of trailing bits. Default lenient mode discards
    them without error. Strict mode raise an exception.
  * Update: Base32/Base64 Input/OutputStream: Added strict decoding
    property to control handling of trailing bits. Default lenient
    mode discards them without error. Strict mode raise an exception.
  * Update: Update tests from JUnit 4.12 to 4.13.
  * Add: Base16Codec and Base16Input/OutputStream.
  * Add: Hex encode/decode with existing arrays.
  * Update: Update actions/checkout from v1 to v2.3.2.
  * Update: Update actions/setup-java from v1.4.0 to v1.4.1.
- Remove timeout.patch

OBS-URL: https://build.opensuse.org/request/show/844228
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-codec?expand=0&rev=47
---
 apache-commons-codec-build.xml    |  2 +-
 apache-commons-codec.changes      | 18 ++++++++++++++++++
 apache-commons-codec.spec         |  6 ++----
 commons-codec-1.14-src.tar.gz     |  3 ---
 commons-codec-1.15-src.tar.gz     |  3 +++
 commons-codec-1.15-src.tar.gz.asc | 17 +++++++++++++++++
 timeout.patch                     | 26 --------------------------
 7 files changed, 41 insertions(+), 34 deletions(-)
 delete mode 100644 commons-codec-1.14-src.tar.gz
 create mode 100644 commons-codec-1.15-src.tar.gz
 create mode 100644 commons-codec-1.15-src.tar.gz.asc
 delete mode 100644 timeout.patch

diff --git a/apache-commons-codec-build.xml b/apache-commons-codec-build.xml
index eb08d27..8816cdc 100644
--- a/apache-commons-codec-build.xml
+++ b/apache-commons-codec-build.xml
@@ -10,7 +10,7 @@
 
   <property name="project.groupId" value="commons-codec"/>
   <property name="project.artifactId" value="commons-codec"/>
-  <property name="project.version" value="1.14"/>
+  <property name="project.version" value="1.15"/>
   <property name="project.name" value="Apache Commons Codec"/>
   <property name="project.description" value="The Apache Commons Codec package
 contains simple encoder and decoders for various formats such as Base64 and Hexadecimal.
diff --git a/apache-commons-codec.changes b/apache-commons-codec.changes
index 94deae5..dd43aed 100644
--- a/apache-commons-codec.changes
+++ b/apache-commons-codec.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue Oct 27 07:51:13 UTC 2020 - Pedro Monreal <pmonreal@suse.com>
+
+- Update to 1.15
+  * Fix: MurmurHash3: Ensure hash128 maintains the sign extension bug.
+  * Update: Base32/Base64/BCodec: Added strict decoding property to
+    control handling of trailing bits. Default lenient mode discards
+    them without error. Strict mode raise an exception.
+  * Update: Base32/Base64 Input/OutputStream: Added strict decoding
+    property to control handling of trailing bits. Default lenient
+    mode discards them without error. Strict mode raise an exception.
+  * Update: Update tests from JUnit 4.12 to 4.13.
+  * Add: Base16Codec and Base16Input/OutputStream.
+  * Add: Hex encode/decode with existing arrays.
+  * Update: Update actions/checkout from v1 to v2.3.2.
+  * Update: Update actions/setup-java from v1.4.0 to v1.4.1.
+- Remove timeout.patch
+
 -------------------------------------------------------------------
 Tue Jun  2 08:57:59 UTC 2020 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
 
diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec
index bda74a8..83e8490 100644
--- a/apache-commons-codec.spec
+++ b/apache-commons-codec.spec
@@ -21,19 +21,18 @@
 %define short_name commons-%{base_name}
 %bcond_with tests
 Name:           apache-commons-codec
-Version:        1.14
+Version:        1.15
 Release:        0
 Summary:        Apache Commons Codec Package
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            http://commons.apache.org/codec/
 Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source2:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
 Source1:        %{name}-build.xml
 # Data in DoubleMetaphoneTest.java originally has an inadmissible license.
 # The author gives MIT in e-mail communication.
 Source100:      aspell-mail.txt
-# PATCH-FIX-OPENSUSE Avoid spurious timeout in BeiderMorse tests
-Patch0:         timeout.patch
 BuildRequires:  ant
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
@@ -72,7 +71,6 @@ Javadoc for %{name}.
 %setup -q -n %{short_name}-%{version}-src
 cp %{SOURCE1} build.xml
 cp %{SOURCE100} aspell-mail.txt
-%patch0 -p1
 
 #fixes eof encoding
 dos2unix RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt
diff --git a/commons-codec-1.14-src.tar.gz b/commons-codec-1.14-src.tar.gz
deleted file mode 100644
index 5ad13ac..0000000
--- a/commons-codec-1.14-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:094e7ba23ba9ea778ae4e884ec1f29cd133457156eaab26e4815cec99e02b987
-size 406760
diff --git a/commons-codec-1.15-src.tar.gz b/commons-codec-1.15-src.tar.gz
new file mode 100644
index 0000000..2d5e13d
--- /dev/null
+++ b/commons-codec-1.15-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5286132affdb74f165a33389e8f1bbbbae147790fcc6decf3d0d35875ec5e907
+size 423639
diff --git a/commons-codec-1.15-src.tar.gz.asc b/commons-codec-1.15-src.tar.gz.asc
new file mode 100644
index 0000000..d055cf1
--- /dev/null
+++ b/commons-codec-1.15-src.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCgAGBQJfSPJsAAoJECGTn/DKKmVn0UcQAKHXUaFx3Mbv7VCklOrAM8Jl
+Bj+i9S9koFKp4nbDLZPE3Ayj9e8JGBWnecbwZ2XHnt592/6oYzfiyhvEEmQRxX0g
+8BjdsGczqPnpZeKPPUVqsJ87TnHEChO02c+ZAYIroVeamBKeiVWMgXnjFsGfFwvR
+z3zlULIcurGt+U1NT8vPp8WWwS/GTfDurXZWViruSHaRLxMNnxIo5IpOkDIp8jwn
+ZheYmb9Efr8YNT58IosJjFnSmt9omyWZ3iCgBSdXe7RPNx9FSKyQayiLCWJS1LFW
+5+NcBgrxds3eF977ox3ppdwPNTxwTiKGz54D2YkHt42RhQob5Ab+z+m57IylWuD5
+JAirPSjFf6coOg88/8WwfwbLuAH4WbebTCn2nvwqq4VQPfAjHo0L6xGtI78WHsqG
+pUsg1eIrlpdQfTAogtUQm1RLk7m6Kq9IRzJKg4zEKL/x2sVnvEPAF+qFL3SMAW9C
+pPvrg2uvJmCFPMJHnBXVOuDQCBEqcwRwnAbzqaaSB4bg9vhW5xiXMk+QUgMXMqpG
+LMzANgMccZossZlYZMbzlL52FyaqdYoFeY6JVQYDpObk9IWkZ+Hi5pIbz7y+FZqh
+rW/RqxWla4D9nNkVOOg4P9kMOgADYf7NtpVABzv4J6UPzC/M7xj2QbuD6zHoqXNm
+SPM2UzVw8pxO9FtbuwRz
+=qoYf
+-----END PGP SIGNATURE-----
diff --git a/timeout.patch b/timeout.patch
deleted file mode 100644
index c16f94e..0000000
--- a/timeout.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: commons-codec-1.8-src/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
-===================================================================
---- commons-codec-1.8-src.orig/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
-+++ commons-codec-1.8-src/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
-@@ -125,7 +125,7 @@ public class BeiderMorseEncoderTest exte
-         Languages.getInstance("thereIsNoSuchLanguage");
-     }
- 
--    @Test(timeout = 10000L)
-+    @Test
-     public void testLongestEnglishSurname() throws EncoderException {
-         final BeiderMorseEncoder bmpm = createGenericApproxEncoder();
-         bmpm.encode("MacGhilleseatheanaich");
-Index: commons-codec-1.8-src/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
-===================================================================
---- commons-codec-1.8-src.orig/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
-+++ commons-codec-1.8-src/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
-@@ -71,7 +71,7 @@ public class PhoneticEngineTest {
-         this.maxPhonemes = maxPhonemes;
-     }
- 
--    @Test(timeout = 10000L)
-+    @Test
-     public void testEncode() {
-         final PhoneticEngine engine = new PhoneticEngine(this.nameType, this.ruleType, this.concat, this.maxPhonemes);
-