diff --git a/0001-Remove-test-dependency-on-JUnit-Pioneer.patch b/0001-Remove-test-dependency-on-JUnit-Pioneer.patch index 9492ec01513b92a474c936ec16a9794fd2be5be8..3d08f2de40703f7bc9b05eb04e812e436d6969db 100644 --- a/0001-Remove-test-dependency-on-JUnit-Pioneer.patch +++ b/0001-Remove-test-dependency-on-JUnit-Pioneer.patch @@ -1,10 +1,10 @@ -From 98753efcb2ff4d531a1eca08ded5c227ae6149b6 Mon Sep 17 00:00:00 2001 +From 711eb211c37eaa29c24a47538e44ef5f25e31e5d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski -Date: Thu, 11 Mar 2021 13:14:20 +0100 +Date: Fri, 23 Aug 2024 04:46:18 +0200 Subject: [PATCH] Remove test dependency on JUnit Pioneer - + sed -i '/org.junit-pioneer/,//d' pom.xml - + sed -i '/^import org.junitpioneer/ d /@Default\(Locale\|TimeZone\)([^)]*)/ { h @@ -22,41 +22,43 @@ 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 9e79b83..56bf4b7 100644 --- a/pom.xml +++ b/pom.xml -@@ -533,12 +533,6 @@ +@@ -64,12 +64,6 @@ junit-jupiter test - - org.junit-pioneer - junit-pioneer -- 1.3.0 +- 1.9.1 - test - org.hamcrest hamcrest 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 0630853..1c0caf0 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; -import org.junitpioneer.jupiter.DefaultLocale; /** - * Unit tests {@link org.apache.commons.lang3.StringUtils} - Contains methods -@@ -248,7 +247,7 @@ public void testContainsAny_StringWithSupplementaryChars() { - assertFalse(StringUtils.containsAny(CharU20001, CharU20000)); + * Unit tests {@link StringUtils} - Contains methods +@@ -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 8122908..7a8f8d8 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 1fc92ca..00cc444 100644 +--- a/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java ++++ b/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java +@@ -34,7 +34,6 @@ import java.util.TimeZone; + import org.apache.commons.lang3.AbstractLangTest; + import org.apache.commons.lang3.time.DurationFormatUtils.Token; + import org.junit.jupiter.api.Test; +-import org.junitpioneer.jupiter.DefaultTimeZone; + + /** + * Tests {@link DurationFormatUtils}. +@@ -142,7 +141,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()); +@@ -202,6 +200,7 @@ public class DurationFormatUtilsTest extends AbstractLangTest { + + } + ++ @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") + @Test + public void testEmptyOptionals() { + assertEquals("", DurationFormatUtils.formatDuration(0L, "[d'd'][H'h'][m'm'][s's']")); 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 698dd1a..dbfa995 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 +@@ -100,7 +98,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() { +@@ -115,7 +113,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() { +@@ -155,7 +153,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() { +@@ -167,8 +165,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() { +@@ -188,8 +185,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 5530290..553b1be 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 1bf938a..85ba109 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() { +@@ -167,8 +165,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() { +@@ -406,7 +403,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() { +@@ -432,8 +429,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.46.0 + diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec index 7b34e5993817428003f8b202195c04e04e74b833..25d60eee7b478254374627c4cba7e9c46b4f64d1 100644 --- a/apache-commons-lang3.spec +++ b/apache-commons-lang3.spec @@ -2,7 +2,7 @@ %bcond_without bootstrap Name: apache-commons-lang3 -Version: 3.12.0 +Version: 3.17.0 Release: %{anolis_release}%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 @@ -14,7 +14,7 @@ Source0: https://archive.apache.org/dist/commons/lang/source/commons-lang Patch1: 0001-Remove-test-dependency-on-JUnit-Pioneer.patch %if %{with bootstrap} -BuildRequires: javapackages-bootstrap-openjdk8 +BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local-openjdk8 BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib) @@ -26,6 +26,7 @@ BuildRequires: mvn(org.easymock:easymock) BuildRequires: mvn(org.hamcrest:hamcrest) BuildRequires: mvn(org.junit.jupiter:junit-jupiter) %endif +Obsoletes: %{name}-javadoc < 3.17.0 %description The standard Java libraries fail to provide enough methods for @@ -44,15 +45,13 @@ therefore created differently named artifact and jar files. This is the new version, while apache-commons-lang is the compatibility package. -%{?javadoc_package} - %prep %autosetup -p1 -n commons-lang3-%{version}-src %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 +70,7 @@ sed -i '//d' pom.xml %build # See "-DcommonsLang3Version" in maven-surefire for the tested version -%mvn_build +%mvn_build -j -f %install %mvn_install @@ -81,5 +80,8 @@ sed -i '//d' pom.xml %doc RELEASE-NOTES.txt %changelog +* Tue Apr 15 2025 mgb01105731 - 3.17.0-1 +- Update to 3.17.0 + * Fri Apr 14 2023 Funda Wang - 3.12.0-1 - Import package for anolis 23 diff --git a/commons-lang3-3.12.0-src.tar.gz b/commons-lang3-3.12.0-src.tar.gz deleted file mode 100644 index 2ed6ab91be44500ab445dc7eb35123e8234cd3d0..0000000000000000000000000000000000000000 Binary files a/commons-lang3-3.12.0-src.tar.gz and /dev/null differ diff --git a/commons-lang3-3.17.0-src.tar.gz b/commons-lang3-3.17.0-src.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a46fa7fd462643ab5a6c7baf9f957c01453d087b Binary files /dev/null and b/commons-lang3-3.17.0-src.tar.gz differ