.apache-commons-lang3.metadata

@@ -1 +1 @@
-16a0fbd2b4927189fdee1428c0b74a837abd187c SOURCES/commons-lang3-3.12.0-src.tar.gz
+6c881153339bb15e8fe2e27243410945b4164228 SOURCES/commons-lang3-3.14.0-src.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/commons-lang3-3.12.0-src.tar.gz
+SOURCES/commons-lang3-3.14.0-src.tar.gz

SOURCES/0001-Remove-test-dependency-on-JUnit-Pioneer.patch

@@ -22,32 +22,34 @@ sed -i '/^import org.junitpioneer/ d
  .../commons/lang3/StringUtilsContainsTest.java     |  3 +--
  .../commons/lang3/time/DateFormatUtilsTest.java    |  6 ++----
  .../apache/commons/lang3/time/DateUtilsTest.java   | 11 +++++------
+ .../lang3/time/DurationFormatUtilsTest.java        |  3 +--
  .../commons/lang3/time/FastDateFormatTest.java     | 14 +++++---------
+ .../time/FastDateParser_TimeZoneStrategyTest.java  |  7 +------
  .../commons/lang3/time/FastDatePrinterTest.java    | 10 +++-------
- 6 files changed, 16 insertions(+), 34 deletions(-)
+ 8 files changed, 18 insertions(+), 42 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 167a85a47..d08c66336 100644
+index 1c62e33..c8b4d1a 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -533,12 +533,6 @@
+@@ -526,12 +526,6 @@
        <artifactId>junit-jupiter</artifactId>
        <scope>test</scope>
      </dependency>
 -    <dependency>
 -      <groupId>org.junit-pioneer</groupId>
 -      <artifactId>junit-pioneer</artifactId>
--      <version>1.3.0</version>
+-      <version>1.9.1</version>
 -      <scope>test</scope>
 -    </dependency>
      <dependency>
        <groupId>org.hamcrest</groupId>
        <artifactId>hamcrest</artifactId>
 diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java
-index 6ef2732a1..2e9d44f55 100644
+index 87c5548..a2cb3dc 100644
 --- a/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java
 +++ b/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java
-@@ -23,7 +23,6 @@
+@@ -27,7 +27,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  import java.util.Locale;
  
  import org.junit.jupiter.api.Test;
@@ -55,8 +57,8 @@ index 6ef2732a1..2e9d44f55 100644
  
  /**
   * Unit tests {@link org.apache.commons.lang3.StringUtils} - Contains methods
-@@ -248,7 +247,7 @@ public void testContainsAny_StringWithSupplementaryChars() {
-         assertFalse(StringUtils.containsAny(CharU20001, CharU20000));
+@@ -230,7 +229,7 @@ public class StringUtilsContainsTest extends AbstractLangTest {
+         assertTrue(StringUtils.containsAnyIgnoreCase("abc", "d", "abc"));
      }
  
 -    @DefaultLocale(language = "de", country = "DE")
@@ -65,20 +67,20 @@ index 6ef2732a1..2e9d44f55 100644
      public void testContainsIgnoreCase_LocaleIndependence() {
          final Locale[] locales = { Locale.ENGLISH, new Locale("tr"), Locale.getDefault() };
 diff --git a/src/test/java/org/apache/commons/lang3/time/DateFormatUtilsTest.java b/src/test/java/org/apache/commons/lang3/time/DateFormatUtilsTest.java
-index cff1aac5e..515650a98 100644
+index 3e8fd08..17ef99f 100644
 --- a/src/test/java/org/apache/commons/lang3/time/DateFormatUtilsTest.java
 +++ b/src/test/java/org/apache/commons/lang3/time/DateFormatUtilsTest.java
-@@ -30,8 +30,6 @@
- import java.util.TimeZone;
+@@ -31,8 +31,6 @@ import java.util.TimeZone;
  
+ import org.apache.commons.lang3.AbstractLangTest;
  import org.junit.jupiter.api.Test;
 -import org.junitpioneer.jupiter.DefaultLocale;
 -import org.junitpioneer.jupiter.DefaultTimeZone;
  
  /**
   * TestCase for DateFormatUtils.
-@@ -153,7 +151,7 @@ public void testLANG1000() throws Exception {
-         DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.parse(date);
+@@ -160,7 +158,7 @@ public class DateFormatUtilsTest extends AbstractLangTest {
+         assertEquals("20030608221112", DateFormatUtils.format(calendar, "yyyyMMddHHmmss"));
      }
  
 -    @DefaultTimeZone("UTC")
@@ -86,7 +88,7 @@ index cff1aac5e..515650a98 100644
      @Test
      public void testLang530() throws ParseException {
          final Date d = new Date();
-@@ -205,7 +203,7 @@ public void testLang916() {
+@@ -212,7 +210,7 @@ public class DateFormatUtilsTest extends AbstractLangTest {
          }
      }
  
@@ -96,21 +98,21 @@ index cff1aac5e..515650a98 100644
      public void testSMTP() {
          TimeZone timeZone = TimeZone.getTimeZone("GMT-3");
 diff --git a/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java b/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java
-index dd6025dce..00a97010e 100644
+index d3e7abb..47dc56d 100644
 --- a/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java
 +++ b/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java
-@@ -39,7 +39,6 @@
+@@ -41,7 +41,6 @@ import org.junit.jupiter.api.AfterEach;
  import org.junit.jupiter.api.BeforeAll;
  import org.junit.jupiter.api.BeforeEach;
  import org.junit.jupiter.api.Test;
 -import org.junitpioneer.jupiter.DefaultLocale;
  
  /**
-  * Unit tests {@link org.apache.commons.lang3.time.DateUtils}.
-@@ -795,13 +794,13 @@ public void testLANG799() throws ParseException {
+  * Tests {@link org.apache.commons.lang3.time.DateUtils}.
+@@ -806,13 +805,13 @@ public class DateUtilsTest extends AbstractLangTest {
      }
  
-     // Parse English date with German Locale
+     /** Parse English date with German Locale. */
 -    @DefaultLocale(language = "de")
 +    @org.junit.jupiter.api.Disabled("JUnit Pioneer not available")
      @Test
@@ -123,7 +125,7 @@ index dd6025dce..00a97010e 100644
      @Test
      public void testLANG799_DE_OK() throws ParseException {
          DateUtils.parseDate("Mi, 09 Apr 2008 23:55:38 GMT", "EEE, dd MMM yyyy HH:mm:ss zzz");
-@@ -809,13 +808,13 @@ public void testLANG799_DE_OK() throws ParseException {
+@@ -820,13 +819,13 @@ public class DateUtilsTest extends AbstractLangTest {
      }
  
      // Parse German date with English Locale
@@ -139,29 +141,57 @@ index dd6025dce..00a97010e 100644
      @Test
      public void testLANG799_EN_OK() throws ParseException {
          DateUtils.parseDate("Wed, 09 Apr 2008 23:55:38 GMT", "EEE, dd MMM yyyy HH:mm:ss zzz");
-@@ -823,7 +822,7 @@ public void testLANG799_EN_OK() throws ParseException {
+@@ -834,7 +833,7 @@ public class DateUtilsTest extends AbstractLangTest {
      }
  
-     // Parse German date with English Locale, specifying German Locale override
+     /** Parse German date with English Locale, specifying German Locale override. */
 -    @DefaultLocale(language = "en")
 +    @org.junit.jupiter.api.Disabled("JUnit Pioneer not available")
      @Test
      public void testLANG799_EN_WITH_DE_LOCALE() throws ParseException {
          DateUtils.parseDate("Mi, 09 Apr 2008 23:55:38 GMT", Locale.GERMAN, "EEE, dd MMM yyyy HH:mm:ss zzz");
+diff --git a/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java b/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java
+index baedbce..30b67e3 100644
+--- a/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java
++++ b/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java
+@@ -33,7 +33,6 @@ import java.util.TimeZone;
+ 
+ import org.apache.commons.lang3.AbstractLangTest;
+ import org.junit.jupiter.api.Test;
+-import org.junitpioneer.jupiter.DefaultTimeZone;
+ 
+ /**
+  * Tests {@link DurationFormatUtils}.
+@@ -157,7 +156,6 @@ public class DurationFormatUtilsTest extends AbstractLangTest {
+ 
+     /** Attempting to test edge cases in DurationFormatUtils.formatPeriod. */
+     @Test
+-    @DefaultTimeZone(TimeZones.GMT_ID)
+     public void testEdgeDurations() {
+         // This test case must use a time zone without DST
+         TimeZone.setDefault(FastTimeZone.getGmtTimeZone());
+@@ -249,6 +247,7 @@ public class DurationFormatUtilsTest extends AbstractLangTest {
+ 
+     }
+ 
++    @org.junit.jupiter.api.Disabled("JUnit Pioneer not available")
+     @Test
+     public void testEmptyOptionals() {
+       assertEquals(
 diff --git a/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java b/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java
-index b945d1748..fcf41956d 100644
+index ffaf5a0..51530e0 100644
 --- a/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java
 +++ b/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java
-@@ -36,8 +36,6 @@
- import java.util.concurrent.atomic.AtomicLongArray;
+@@ -40,8 +40,6 @@ import java.util.concurrent.atomic.AtomicLongArray;
  
+ import org.apache.commons.lang3.AbstractLangTest;
  import org.junit.jupiter.api.Test;
 -import org.junitpioneer.jupiter.DefaultLocale;
 -import org.junitpioneer.jupiter.DefaultTimeZone;
  
  /**
   * Unit tests {@link org.apache.commons.lang3.time.FastDateFormat}.
-@@ -92,7 +90,7 @@ private AtomicLongArray measureTime(final Format printer, final Format parser) t
+@@ -99,7 +97,7 @@ public class FastDateFormatTest extends AbstractLangTest {
          return totalElapsed;
      }
  
@@ -170,7 +200,7 @@ index b945d1748..fcf41956d 100644
      @Test
      public void test_changeDefault_Locale_DateInstance() {
          final FastDateFormat format1 = FastDateFormat.getDateInstance(FastDateFormat.FULL, Locale.GERMANY);
-@@ -107,7 +105,7 @@ public void test_changeDefault_Locale_DateInstance() {
+@@ -114,7 +112,7 @@ public class FastDateFormatTest extends AbstractLangTest {
          assertNotSame(format2, format3);
      }
  
@@ -179,7 +209,7 @@ index b945d1748..fcf41956d 100644
      @Test
      public void test_changeDefault_Locale_DateTimeInstance() {
          final FastDateFormat format1 = FastDateFormat.getDateTimeInstance(FastDateFormat.FULL, FastDateFormat.FULL, Locale.GERMANY);
-@@ -147,7 +145,7 @@ public void test_getInstance_String() {
+@@ -154,7 +152,7 @@ public class FastDateFormatTest extends AbstractLangTest {
          assertEquals(TimeZone.getDefault(), format2.getTimeZone());
      }
  
@@ -188,7 +218,7 @@ index b945d1748..fcf41956d 100644
      @Test
      public void test_getInstance_String_Locale() {
          final FastDateFormat format1 = FastDateFormat.getInstance("MM/DD/yyyy", Locale.GERMANY);
-@@ -159,8 +157,7 @@ public void test_getInstance_String_Locale() {
+@@ -166,8 +164,7 @@ public class FastDateFormatTest extends AbstractLangTest {
          assertEquals(Locale.GERMANY, format1.getLocale());
      }
  
@@ -198,7 +228,7 @@ index b945d1748..fcf41956d 100644
      @Test
      public void test_getInstance_String_TimeZone() {
  
-@@ -180,8 +177,7 @@ public void test_getInstance_String_TimeZone() {
+@@ -187,8 +184,7 @@ public class FastDateFormatTest extends AbstractLangTest {
          assertNotSame(format4, format6);
      }
  
@@ -208,12 +238,38 @@ index b945d1748..fcf41956d 100644
      @Test
      public void test_getInstance_String_TimeZone_Locale() {
          final FastDateFormat format1 = FastDateFormat.getInstance("MM/DD/yyyy",
+diff --git a/src/test/java/org/apache/commons/lang3/time/FastDateParser_TimeZoneStrategyTest.java b/src/test/java/org/apache/commons/lang3/time/FastDateParser_TimeZoneStrategyTest.java
+index c46498c..9b1827b 100644
+--- a/src/test/java/org/apache/commons/lang3/time/FastDateParser_TimeZoneStrategyTest.java
++++ b/src/test/java/org/apache/commons/lang3/time/FastDateParser_TimeZoneStrategyTest.java
+@@ -40,13 +40,7 @@ import org.junit.jupiter.api.AfterAll;
+ import org.junit.jupiter.api.Test;
+ import org.junit.jupiter.params.ParameterizedTest;
+ import org.junit.jupiter.params.provider.MethodSource;
+-import org.junitpioneer.jupiter.DefaultLocale;
+-import org.junitpioneer.jupiter.DefaultTimeZone;
+-import org.junitpioneer.jupiter.ReadsDefaultLocale;
+-import org.junitpioneer.jupiter.ReadsDefaultTimeZone;
+ 
+-/* Make test reproducible */ @DefaultLocale(language = "en")
+-/* Make test reproducible */ @DefaultTimeZone(TimeZones.GMT_ID)
+ /* Make test reproducible */ @ReadsDefaultLocale
+ /* Make test reproducible */ @ReadsDefaultTimeZone
+ public class FastDateParser_TimeZoneStrategyTest extends AbstractLangTest {
+@@ -68,6 +62,7 @@ public class FastDateParser_TimeZoneStrategyTest extends AbstractLangTest {
+         return ArraySorter.sort(Locale.getAvailableLocales(), Comparator.comparing(Locale::toString));
+     }
+ 
++@org.junit.jupiter.api.Disabled("JUnit Pioneer not available")
+     @Test
+     public void testLang1219() throws ParseException {
+         final FastDateParser parser = new FastDateParser("dd.MM.yyyy HH:mm:ss z", TimeZone.getDefault(), Locale.GERMAN);
 diff --git a/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java b/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java
-index f3511a51e..d4de29113 100644
+index 8da22d4..73944c6 100644
 --- a/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java
 +++ b/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java
-@@ -32,8 +32,6 @@
- 
+@@ -33,8 +33,6 @@ import java.util.TimeZone;
+ import org.apache.commons.lang3.AbstractLangTest;
  import org.apache.commons.lang3.SerializationUtils;
  import org.junit.jupiter.api.Test;
 -import org.junitpioneer.jupiter.DefaultLocale;
@@ -221,7 +277,7 @@ index f3511a51e..d4de29113 100644
  
  /**
   * Unit tests {@link org.apache.commons.lang3.time.FastDatePrinter}.
-@@ -166,8 +164,7 @@ public void testEquals() {
+@@ -166,8 +164,7 @@ public class FastDatePrinterTest extends AbstractLangTest {
          assertNotEquals(printer1, new Object());
      }
  
@@ -231,7 +287,7 @@ index f3511a51e..d4de29113 100644
      @Test
      public void testFormat() {
          final GregorianCalendar cal1 = new GregorianCalendar(2003, 0, 10, 15, 33, 20);
-@@ -407,7 +404,7 @@ public void testStringBufferOptions() {
+@@ -407,7 +404,7 @@ public class FastDatePrinterTest extends AbstractLangTest {
          assertEquals(expected, format.format(epoch, sb).toString());
      }
  
@@ -240,7 +296,7 @@ index f3511a51e..d4de29113 100644
      @Test
      public void testTimeZoneAsZ() {
          final Calendar c = Calendar.getInstance(FastTimeZone.getGmtTimeZone());
-@@ -433,8 +430,7 @@ public void testToStringContainsName() {
+@@ -433,8 +430,7 @@ public class FastDatePrinterTest extends AbstractLangTest {
          assertTrue(printer.toString().startsWith("FastDate"));
      }
  
@@ -251,5 +307,5 @@ index f3511a51e..d4de29113 100644
      public void testWeekYear() {
          final GregorianCalendar cal = new GregorianCalendar(2020, 12, 31, 0, 0, 0);
 -- 
-2.29.2
+2.43.0
 

SPECS/apache-commons-lang3.spec

@@ -1,20 +1,21 @@
 %bcond_with bootstrap
 
 Name:           apache-commons-lang3
-Version:        3.12.0
-Release:        8%{?dist}
+Version:        3.14.0
+Release:        6%{?dist}
 Summary:        Provides a host of helper utilities for the java.lang API
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            https://commons.apache.org/lang
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 Source0:        https://archive.apache.org/dist/commons/lang/source/commons-lang3-%{version}-src.tar.gz
 Patch1:         0001-Remove-test-dependency-on-JUnit-Pioneer.patch
 
-BuildRequires:  maven-local-openjdk8
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
+BuildRequires:  maven-local
 BuildRequires:  mvn(biz.aQute.bnd:biz.aQute.bndlib)
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
@@ -45,14 +46,14 @@ package.
 %{?javadoc_package}
 
 %prep
-%setup -n commons-lang3-%{version}-src
+%setup -q -n commons-lang3-%{version}-src
 
-%patch -P 1 -p1
+%patch 1 -p1
 
 %pom_remove_plugin :maven-javadoc-plugin
 %pom_remove_dep org.openjdk.jmh:jmh-core
 %pom_remove_dep org.openjdk.jmh:jmh-generator-annprocess
-%pom_remove_dep :junit-bom
+%pom_remove_dep org.apache.commons:commons-text
 
 %mvn_file : %{name} commons-lang3
 
@@ -71,7 +72,7 @@ sed -i '/<argLine>/d' pom.xml
 
 %build
 # See "-DcommonsLang3Version" in maven-surefire for the tested version
-%mvn_build
+%mvn_build -f
 
 %install
 %mvn_install
@@ -81,24 +82,54 @@ sed -i '/<argLine>/d' pom.xml
 %doc RELEASE-NOTES.txt
 
 %changelog
-* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 3.12.0-8
-- Fix patch usage
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.14.0-6
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
 
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 3.12.0-7
-- Rebuild with regenerated Requires on Java
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 3.14.0-5
+- Bump release for Aug 2024 java mass rebuild
 
-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12.0-6
-- Rebuild to regenerate auto-requires
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.14.0-4
+- Bump release for June 2024 mass rebuild
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.12.0-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12.0-4
-- Rebuild to workaround DistroBaker issue
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12.0-3
-- Bootstrap Maven for CentOS Stream 9
+* Mon Dec 18 2023 Marian Koncek <mkoncek@redhat.com> - 3.14.0-1
+- Update to upstream version 3.14.0
+
+* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.13.0-3
+- Rebuild to regenerate auto-Requires on java
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.13.0-2
+- Rebuild
+
+* Fri Aug 11 2023 Marian Koncek <mkoncek@redhat.com> - 3.13.0-1
+- Update to upstream version 3.13.0
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Apr 27 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12.0-6
+- Workaround build issue with RPM 4.18
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.12.0-5
+- Rebuilt for java-17-openjdk as system jdk
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12.0-2
 - Bootstrap build