diff --git a/0001-Remove-test-dependency-on-JUnit-Pioneer.patch b/0001-Remove-test-dependency-on-JUnit-Pioneer.patch index 3d08f2de40703f7bc9b05eb04e812e436d6969db..565591aadc78686c52fae4ac665739743812acac 100644 --- a/0001-Remove-test-dependency-on-JUnit-Pioneer.patch +++ b/0001-Remove-test-dependency-on-JUnit-Pioneer.patch @@ -1,10 +1,10 @@ -From 711eb211c37eaa29c24a47538e44ef5f25e31e5d Mon Sep 17 00:00:00 2001 +From 0727af1a55207a3f46d529157087c210b61f720b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski -Date: Fri, 23 Aug 2024 04:46:18 +0200 +Date: Wed, 16 Jul 2025 20:57:50 +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 @@ -18,59 +18,111 @@ sed -i '/^import org.junitpioneer/ d x }' $(grep org.junitpioneer -rl src/test/java/) --- - pom.xml | 6 ------ - .../commons/lang3/StringUtilsContainsTest.java | 3 +-- + pom.xml | 5 ----- + .../commons/lang3/StringUtilsContainsTest.java | 5 +---- + .../org/apache/commons/lang3/StringUtilsTest.java | 5 +---- + .../apache/commons/lang3/SystemPropertiesTest.java | 2 -- .../commons/lang3/time/DateFormatUtilsTest.java | 6 ++---- - .../apache/commons/lang3/time/DateUtilsTest.java | 11 +++++------ + .../apache/commons/lang3/time/DateUtilsTest.java | 13 +++++-------- .../lang3/time/DurationFormatUtilsTest.java | 3 +-- .../commons/lang3/time/FastDateFormatTest.java | 14 +++++--------- + .../commons/lang3/time/FastDateParserTest.java | 9 +-------- .../time/FastDateParser_TimeZoneStrategyTest.java | 7 +------ .../commons/lang3/time/FastDatePrinterTest.java | 10 +++------- - 8 files changed, 18 insertions(+), 42 deletions(-) - + 11 files changed, 20 insertions(+), 59 deletions(-) + diff --git a/pom.xml b/pom.xml -index 9e79b83..56bf4b7 100644 +index 812a3ee13..9d1f1b4f5 100644 --- a/pom.xml +++ b/pom.xml -@@ -64,12 +64,6 @@ +@@ -63,11 +63,6 @@ junit-jupiter test - - org.junit-pioneer - junit-pioneer -- 1.9.1 - test - - org.hamcrest - hamcrest + org.easymock + easymock diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java -index 0630853..1c0caf0 100644 +index 61579a921..eecd4f5ab 100644 --- a/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java +++ b/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java -@@ -27,7 +27,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; +@@ -27,9 +27,6 @@ import java.util.Locale; import org.junit.jupiter.api.Test; -import org.junitpioneer.jupiter.DefaultLocale; +-import org.junitpioneer.jupiter.ReadsDefaultLocale; +-import org.junitpioneer.jupiter.WritesDefaultLocale; /** - * Unit tests {@link StringUtils} - Contains methods -@@ -230,7 +229,7 @@ public class StringUtilsContainsTest extends AbstractLangTest { - assertTrue(StringUtils.containsAnyIgnoreCase("abc", "d", "abc")); + * Tests {@link StringUtils} - Contains methods +@@ -233,7 +230,6 @@ void testContainsAnyIgnoreCase_StringStringArray() { } + @Test - @DefaultLocale(language = "de", country = "DE") + @ReadsDefaultLocale + @WritesDefaultLocale + void testContainsIgnoreCase_LocaleIndependence() { +@@ -254,6 +250,7 @@ void testContainsIgnoreCase_LocaleIndependence() { + } + } + ++ @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") + @Test + void testContainsIgnoreCase_StringString() { + assertFalse(StringUtils.containsIgnoreCase(null, null)); +diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsTest.java +index cc803e490..e150b7a6e 100644 +--- a/src/test/java/org/apache/commons/lang3/StringUtilsTest.java ++++ b/src/test/java/org/apache/commons/lang3/StringUtilsTest.java +@@ -50,9 +50,6 @@ + import org.junit.jupiter.api.Test; + import org.junit.jupiter.params.ParameterizedTest; + import org.junit.jupiter.params.provider.ValueSource; +-import org.junitpioneer.jupiter.DefaultLocale; +-import org.junitpioneer.jupiter.ReadsDefaultLocale; +-import org.junitpioneer.jupiter.WritesDefaultLocale; + + /** + * Tests for methods of {@link StringUtils} +@@ -2900,12 +2897,12 @@ void testToRootLowerCase() { + } + + @Test +- @DefaultLocale("tr") + @ReadsDefaultLocale + void testToRootLowerCaseTurkish() { + assertEquals("title", StringUtils.toRootLowerCase("TITLE")); + } + + @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void testContainsIgnoreCase_LocaleIndependence() { - final Locale[] locales = { Locale.ENGLISH, new Locale("tr"), Locale.getDefault() }; + @ReadsDefaultLocale + @WritesDefaultLocale +diff --git a/src/test/java/org/apache/commons/lang3/SystemPropertiesTest.java b/src/test/java/org/apache/commons/lang3/SystemPropertiesTest.java +index 086d2c0d1..c9ff856af 100644 +--- a/src/test/java/org/apache/commons/lang3/SystemPropertiesTest.java ++++ b/src/test/java/org/apache/commons/lang3/SystemPropertiesTest.java +@@ -31,8 +31,6 @@ + import org.junit.jupiter.api.function.ThrowingSupplier; + import org.junit.jupiter.params.ParameterizedTest; + import org.junit.jupiter.params.provider.ValueSource; +-import org.junitpioneer.jupiter.SetSystemProperty; +-import org.junitpioneer.jupiter.SetSystemProperty.SetSystemProperties; + + @SetSystemProperties({ + @SetSystemProperty(key = SystemPropertiesTest.KEY_SPACE_1, value = "value1"), 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 3e8fd08..17ef99f 100644 +index e6e442cde..a774a1bb8 100644 --- a/src/test/java/org/apache/commons/lang3/time/DateFormatUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/time/DateFormatUtilsTest.java -@@ -31,8 +31,6 @@ import java.util.TimeZone; +@@ -31,8 +31,6 @@ import org.apache.commons.lang3.AbstractLangTest; import org.junit.jupiter.api.Test; @@ -79,82 +131,84 @@ index 3e8fd08..17ef99f 100644 /** * TestCase for DateFormatUtils. -@@ -160,7 +158,7 @@ public class DateFormatUtilsTest extends AbstractLangTest { +@@ -160,7 +158,7 @@ void testLANG1462() { assertEquals("20030608221112", DateFormatUtils.format(calendar, "yyyyMMddHHmmss")); } - @DefaultTimeZone("UTC") + @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void testLang530() throws ParseException { + void testLang530() throws ParseException { final Date d = new Date(); -@@ -212,7 +210,7 @@ public class DateFormatUtilsTest extends AbstractLangTest { +@@ -212,7 +210,7 @@ void testLang916() { } } - @DefaultLocale(language = "en") + @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void testSMTP() { + 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 8122908..7a8f8d8 100644 +index e06d71934..75c4b9f29 100644 --- a/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java -@@ -41,7 +41,6 @@ import org.junit.jupiter.api.AfterEach; +@@ -43,9 +43,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junitpioneer.jupiter.DefaultLocale; +-import org.junitpioneer.jupiter.ReadsDefaultLocale; +-import org.junitpioneer.jupiter.WritesDefaultLocale; /** * Tests {@link org.apache.commons.lang3.time.DateUtils}. -@@ -806,13 +805,13 @@ public class DateUtilsTest extends AbstractLangTest { +@@ -796,13 +793,13 @@ void testLANG799() throws ParseException { } /** Parse English date with German Locale. */ - @DefaultLocale(language = "de") + @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void testLANG799_DE_FAIL() { + void testLANG799_DE_FAIL() { assertThrows(ParseException.class, () -> DateUtils.parseDate("Wed, 09 Apr 2008 23:55:38 GMT", "EEE, dd MMM yyyy HH:mm:ss zzz")); } - @DefaultLocale(language = "de") + @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void testLANG799_DE_OK() throws ParseException { + void testLANG799_DE_OK() throws ParseException { DateUtils.parseDate("Mi, 09 Apr 2008 23:55:38 GMT", "EEE, dd MMM yyyy HH:mm:ss zzz"); -@@ -820,13 +819,13 @@ public class DateUtilsTest extends AbstractLangTest { +@@ -810,13 +807,13 @@ void testLANG799_DE_OK() throws ParseException { } // Parse German date with English Locale - @DefaultLocale(language = "en") + @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void testLANG799_EN_FAIL() { + void testLANG799_EN_FAIL() { assertThrows(ParseException.class, () -> DateUtils.parseDate("Mi, 09 Apr 2008 23:55:38 GMT", "EEE, dd MMM yyyy HH:mm:ss zzz")); } - @DefaultLocale(language = "en") + @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void testLANG799_EN_OK() throws ParseException { + void testLANG799_EN_OK() throws ParseException { DateUtils.parseDate("Wed, 09 Apr 2008 23:55:38 GMT", "EEE, dd MMM yyyy HH:mm:ss zzz"); -@@ -834,7 +833,7 @@ public class DateUtilsTest extends AbstractLangTest { +@@ -824,7 +821,7 @@ void testLANG799_EN_OK() throws ParseException { } /** 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 { + 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 +index 378b0ec2d..61d3757d6 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; +@@ -34,7 +34,6 @@ import org.apache.commons.lang3.AbstractLangTest; import org.apache.commons.lang3.time.DurationFormatUtils.Token; import org.junit.jupiter.api.Test; @@ -162,27 +216,27 @@ index 1fc92ca..00cc444 100644 /** * Tests {@link DurationFormatUtils}. -@@ -142,7 +141,6 @@ public class DurationFormatUtilsTest extends AbstractLangTest { +@@ -142,7 +141,6 @@ void testDurationsByBruteForce() { /** Attempting to test edge cases in DurationFormatUtils.formatPeriod. */ @Test - @DefaultTimeZone(TimeZones.GMT_ID) - public void testEdgeDurations() { + 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 { +@@ -202,6 +200,7 @@ void testEdgeDurations() { } + @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void testEmptyOptionals() { + 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 698dd1a..dbfa995 100644 +index c9840df6f..e7ab929c6 100644 --- a/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java +++ b/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java -@@ -40,8 +40,6 @@ import java.util.concurrent.atomic.AtomicLongArray; +@@ -42,8 +42,6 @@ import org.apache.commons.lang3.AbstractLangTest; import org.junit.jupiter.api.Test; @@ -190,35 +244,35 @@ index 698dd1a..dbfa995 100644 -import org.junitpioneer.jupiter.DefaultTimeZone; /** - * Unit tests {@link org.apache.commons.lang3.time.FastDateFormat}. -@@ -100,7 +98,7 @@ public class FastDateFormatTest extends AbstractLangTest { + * Tests {@link org.apache.commons.lang3.time.FastDateFormat}. +@@ -102,7 +100,7 @@ private AtomicLongArray measureTime(final Format printer, final Format parser) t return totalElapsed; } - @DefaultLocale(language = "en", country = "US") + @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void test_changeDefault_Locale_DateInstance() { + void test_changeDefault_Locale_DateInstance() { final FastDateFormat format1 = FastDateFormat.getDateInstance(FastDateFormat.FULL, Locale.GERMANY); -@@ -115,7 +113,7 @@ public class FastDateFormatTest extends AbstractLangTest { +@@ -117,7 +115,7 @@ void test_changeDefault_Locale_DateInstance() { assertNotSame(format2, format3); } - @DefaultLocale(language = "en", country = "US") + @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void test_changeDefault_Locale_DateTimeInstance() { + void test_changeDefault_Locale_DateTimeInstance() { final FastDateFormat format1 = FastDateFormat.getDateTimeInstance(FastDateFormat.FULL, FastDateFormat.FULL, Locale.GERMANY); -@@ -155,7 +153,7 @@ public class FastDateFormatTest extends AbstractLangTest { +@@ -157,7 +155,7 @@ void test_getInstance_String() { assertEquals(TimeZone.getDefault(), format2.getTimeZone()); } - @DefaultLocale(language = "en", country = "US") + @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void test_getInstance_String_Locale() { + void test_getInstance_String_Locale() { final FastDateFormat format1 = FastDateFormat.getInstance("MM/DD/yyyy", Locale.GERMANY); -@@ -167,8 +165,7 @@ public class FastDateFormatTest extends AbstractLangTest { +@@ -169,8 +167,7 @@ void test_getInstance_String_Locale() { assertEquals(Locale.GERMANY, format1.getLocale()); } @@ -226,9 +280,9 @@ index 698dd1a..dbfa995 100644 - @DefaultTimeZone("America/New_York") + @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void test_getInstance_String_TimeZone() { + void test_getInstance_String_TimeZone() { -@@ -188,8 +185,7 @@ public class FastDateFormatTest extends AbstractLangTest { +@@ -190,8 +187,7 @@ void test_getInstance_String_TimeZone() { assertNotSame(format4, format6); } @@ -236,13 +290,44 @@ index 698dd1a..dbfa995 100644 - @DefaultTimeZone("America/New_York") + @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void test_getInstance_String_TimeZone_Locale() { + 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/FastDateParserTest.java b/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java +index 3369ff382..792ef42d6 100644 +--- a/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java ++++ b/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java +@@ -49,18 +49,10 @@ + import org.junit.jupiter.params.ParameterizedTest; + import org.junit.jupiter.params.provider.Arguments; + 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; +-import org.junitpioneer.jupiter.cartesian.ArgumentSets; +-import org.junitpioneer.jupiter.cartesian.CartesianTest; + + /** + * Tests {@link org.apache.commons.lang3.time.FastDateParser}. + */ +-/* Make test reproducible */ @DefaultLocale(language = "en") +-/* Make test reproducible */ @DefaultTimeZone(TimeZones.GMT_ID) + /* Make test reproducible */ @ReadsDefaultLocale + /* Make test reproducible */ @ReadsDefaultTimeZone + class FastDateParserTest extends AbstractLangTest { +@@ -249,6 +241,7 @@ void test_Equality_Hash(final TriFunction + } + } + ++@org.junit.jupiter.api.Disabled("JUnit Pioneer not available") + @Test + void test1806() throws ParseException { + final String formatStub = "yyyy-MM-dd'T'HH:mm:ss.SSS"; 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 +index 4aa50f8e8..123316c86 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; +@@ -41,16 +41,10 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -251,24 +336,27 @@ index 5530290..553b1be 100644 -import org.junitpioneer.jupiter.ReadsDefaultLocale; -import org.junitpioneer.jupiter.ReadsDefaultTimeZone; + /** + * Tests {@link FastDateParser}. + */ -/* 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)); + class FastDateParser_TimeZoneStrategyTest extends AbstractLangTest { +@@ -73,6 +67,7 @@ private String[][] getZoneStringsSorted(final Locale locale) { + return ArraySorter.sort(DateFormatSymbols.getInstance(locale).getZoneStrings(), Comparator.comparing(array -> array[0])); } +@org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void testLang1219() throws ParseException { + 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 1bf938a..85ba109 100644 +index cb8c9deca..355a7d7e9 100644 --- a/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java +++ b/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java -@@ -33,8 +33,6 @@ import java.util.TimeZone; +@@ -33,8 +33,6 @@ import org.apache.commons.lang3.AbstractLangTest; import org.apache.commons.lang3.SerializationUtils; import org.junit.jupiter.api.Test; @@ -276,8 +364,8 @@ index 1bf938a..85ba109 100644 -import org.junitpioneer.jupiter.DefaultTimeZone; /** - * Unit tests {@link org.apache.commons.lang3.time.FastDatePrinter}. -@@ -167,8 +165,7 @@ public class FastDatePrinterTest extends AbstractLangTest { + * Tests {@link org.apache.commons.lang3.time.FastDatePrinter}. +@@ -167,8 +165,7 @@ void testEquals() { assertNotEquals(printer1, new Object()); } @@ -285,18 +373,18 @@ index 1bf938a..85ba109 100644 - @DefaultTimeZone("America/New_York") + @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void testFormat() { + void testFormat() { final GregorianCalendar cal1 = new GregorianCalendar(2003, 0, 10, 15, 33, 20); -@@ -406,7 +403,7 @@ public class FastDatePrinterTest extends AbstractLangTest { +@@ -406,7 +403,7 @@ void testStringBufferOptions() { assertEquals(expected, format.format(epoch, sb).toString()); } - @DefaultTimeZone("UTC") + @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void testTimeZoneAsZ() { + void testTimeZoneAsZ() { final Calendar c = Calendar.getInstance(FastTimeZone.getGmtTimeZone()); -@@ -432,8 +429,7 @@ public class FastDatePrinterTest extends AbstractLangTest { +@@ -432,8 +429,7 @@ void testToStringContainsName() { assertTrue(printer.toString().startsWith("FastDate")); } @@ -304,8 +392,8 @@ index 1bf938a..85ba109 100644 - @DefaultTimeZone("America/New_York") + @org.junit.jupiter.api.Disabled("JUnit Pioneer not available") @Test - public void testWeekYear() { + void testWeekYear() { final GregorianCalendar cal = new GregorianCalendar(2020, 12, 31, 0, 0, 0); -- -2.46.0 - +2.50.1 + diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec index 25d60eee7b478254374627c4cba7e9c46b4f64d1..3c6559b7779009357fb0df03c298893389615e73 100644 --- a/apache-commons-lang3.spec +++ b/apache-commons-lang3.spec @@ -2,7 +2,7 @@ %bcond_without bootstrap Name: apache-commons-lang3 -Version: 3.17.0 +Version: 3.18.0 Release: %{anolis_release}%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 @@ -26,7 +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 +Obsoletes: %{name}-javadoc < 3.18.0 %description The standard Java libraries fail to provide enough methods for @@ -80,6 +80,9 @@ sed -i '//d' pom.xml %doc RELEASE-NOTES.txt %changelog +* Fri Sep 19 2025 Hong Wei Qin - 3.18.0-1 +- Update to 3.18.0 to fix CVE-2025-48924 + * Tue Apr 15 2025 mgb01105731 - 3.17.0-1 - Update to 3.17.0 diff --git a/commons-lang3-3.17.0-src.tar.gz b/commons-lang3-3.17.0-src.tar.gz deleted file mode 100644 index a46fa7fd462643ab5a6c7baf9f957c01453d087b..0000000000000000000000000000000000000000 Binary files a/commons-lang3-3.17.0-src.tar.gz and /dev/null differ diff --git a/commons-lang3-3.18.0-src.tar.gz b/commons-lang3-3.18.0-src.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..3e3eab232d1334109f91be95c12e0adabd3a5aef Binary files /dev/null and b/commons-lang3-3.18.0-src.tar.gz differ