Compare commits
No commits in common. "c8-stream-3.6" and "c10s" have entirely different histories.
c8-stream-
...
c10s
@ -1 +0,0 @@
|
|||||||
a3a500d9968ec85cc7a070601860f72412be2ded SOURCES/commons-lang3-3.9-src.tar.gz
|
|
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
|||||||
|
1
|
22
.gitignore
vendored
22
.gitignore
vendored
@ -1 +1,21 @@
|
|||||||
SOURCES/commons-lang3-3.9-src.tar.gz
|
/results_*
|
||||||
|
/*.src.rpm
|
||||||
|
|
||||||
|
/commons-lang3-3.0.1-src.tar.gz
|
||||||
|
/commons-lang3-3.1-src.tar.gz
|
||||||
|
/commons-lang3-3.2-src.tar.gz
|
||||||
|
/commons-lang3-3.2.1-src.tar.gz
|
||||||
|
/commons-lang3-3.3-src.tar.gz
|
||||||
|
/commons-lang3-3.3.1-src.tar.gz
|
||||||
|
/commons-lang3-3.3.2-src.tar.gz
|
||||||
|
/commons-lang3-3.4-src.tar.gz
|
||||||
|
/commons-lang3-3.5-src.tar.gz
|
||||||
|
/commons-lang3-3.6-src.tar.gz
|
||||||
|
/commons-lang3-3.7-src.tar.gz
|
||||||
|
/commons-lang3-3.8.1-src.tar.gz
|
||||||
|
/commons-lang3-3.9-src.tar.gz
|
||||||
|
/commons-lang3-3.10-src.tar.gz
|
||||||
|
/commons-lang3-3.11-src.tar.gz
|
||||||
|
/commons-lang3-3.12.0-src.tar.gz
|
||||||
|
/commons-lang3-3.13.0-src.tar.gz
|
||||||
|
/commons-lang3-3.14.0-src.tar.gz
|
||||||
|
311
0001-Remove-test-dependency-on-JUnit-Pioneer.patch
Normal file
311
0001-Remove-test-dependency-on-JUnit-Pioneer.patch
Normal file
@ -0,0 +1,311 @@
|
|||||||
|
From 98753efcb2ff4d531a1eca08ded5c227ae6149b6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||||
|
Date: Thu, 11 Mar 2021 13:14:20 +0100
|
||||||
|
Subject: [PATCH] Remove test dependency on JUnit Pioneer
|
||||||
|
|
||||||
|
sed -i '/<groupId>org.junit-pioneer/,/<dependency>/d' pom.xml
|
||||||
|
|
||||||
|
sed -i '/^import org.junitpioneer/ d
|
||||||
|
/@Default\(Locale\|TimeZone\)([^)]*)/ {
|
||||||
|
h
|
||||||
|
d
|
||||||
|
}
|
||||||
|
/@Test/ {
|
||||||
|
x
|
||||||
|
s/\( *\)..*/\1@org.junit.jupiter.api.Disabled("JUnit Pioneer not available")/
|
||||||
|
/./p
|
||||||
|
s/.*//
|
||||||
|
x
|
||||||
|
}' $(grep org.junitpioneer -rl src/test/java/)
|
||||||
|
---
|
||||||
|
pom.xml | 6 ------
|
||||||
|
.../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 +++-------
|
||||||
|
8 files changed, 18 insertions(+), 42 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pom.xml b/pom.xml
|
||||||
|
index 1c62e33..c8b4d1a 100644
|
||||||
|
--- a/pom.xml
|
||||||
|
+++ b/pom.xml
|
||||||
|
@@ -526,12 +526,6 @@
|
||||||
|
<artifactId>junit-jupiter</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
- <dependency>
|
||||||
|
- <groupId>org.junit-pioneer</groupId>
|
||||||
|
- <artifactId>junit-pioneer</artifactId>
|
||||||
|
- <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 87c5548..a2cb3dc 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;
|
||||||
|
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
|
||||||
|
@@ -230,7 +229,7 @@ public class StringUtilsContainsTest extends AbstractLangTest {
|
||||||
|
assertTrue(StringUtils.containsAnyIgnoreCase("abc", "d", "abc"));
|
||||||
|
}
|
||||||
|
|
||||||
|
- @DefaultLocale(language = "de", country = "DE")
|
||||||
|
+ @org.junit.jupiter.api.Disabled("JUnit Pioneer not available")
|
||||||
|
@Test
|
||||||
|
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 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
|
||||||
|
@@ -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.
|
||||||
|
@@ -160,7 +158,7 @@ public class DateFormatUtilsTest extends AbstractLangTest {
|
||||||
|
assertEquals("20030608221112", DateFormatUtils.format(calendar, "yyyyMMddHHmmss"));
|
||||||
|
}
|
||||||
|
|
||||||
|
- @DefaultTimeZone("UTC")
|
||||||
|
+ @org.junit.jupiter.api.Disabled("JUnit Pioneer not available")
|
||||||
|
@Test
|
||||||
|
public void testLang530() throws ParseException {
|
||||||
|
final Date d = new Date();
|
||||||
|
@@ -212,7 +210,7 @@ public class DateFormatUtilsTest extends AbstractLangTest {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- @DefaultLocale(language = "en")
|
||||||
|
+ @org.junit.jupiter.api.Disabled("JUnit Pioneer not available")
|
||||||
|
@Test
|
||||||
|
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 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
|
||||||
|
@@ -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;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests {@link org.apache.commons.lang3.time.DateUtils}.
|
||||||
|
@@ -806,13 +805,13 @@ public class DateUtilsTest extends AbstractLangTest {
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Parse English date with German Locale. */
|
||||||
|
- @DefaultLocale(language = "de")
|
||||||
|
+ @org.junit.jupiter.api.Disabled("JUnit Pioneer not available")
|
||||||
|
@Test
|
||||||
|
public 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 {
|
||||||
|
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 {
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse German date with English Locale
|
||||||
|
- @DefaultLocale(language = "en")
|
||||||
|
+ @org.junit.jupiter.api.Disabled("JUnit Pioneer not available")
|
||||||
|
@Test
|
||||||
|
public 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 {
|
||||||
|
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 {
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 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 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
|
||||||
|
@@ -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}.
|
||||||
|
@@ -99,7 +97,7 @@ public class FastDateFormatTest extends AbstractLangTest {
|
||||||
|
return totalElapsed;
|
||||||
|
}
|
||||||
|
|
||||||
|
- @DefaultLocale(language = "en", country = "US")
|
||||||
|
+ @org.junit.jupiter.api.Disabled("JUnit Pioneer not available")
|
||||||
|
@Test
|
||||||
|
public void test_changeDefault_Locale_DateInstance() {
|
||||||
|
final FastDateFormat format1 = FastDateFormat.getDateInstance(FastDateFormat.FULL, Locale.GERMANY);
|
||||||
|
@@ -114,7 +112,7 @@ public class FastDateFormatTest extends AbstractLangTest {
|
||||||
|
assertNotSame(format2, format3);
|
||||||
|
}
|
||||||
|
|
||||||
|
- @DefaultLocale(language = "en", country = "US")
|
||||||
|
+ @org.junit.jupiter.api.Disabled("JUnit Pioneer not available")
|
||||||
|
@Test
|
||||||
|
public void test_changeDefault_Locale_DateTimeInstance() {
|
||||||
|
final FastDateFormat format1 = FastDateFormat.getDateTimeInstance(FastDateFormat.FULL, FastDateFormat.FULL, Locale.GERMANY);
|
||||||
|
@@ -154,7 +152,7 @@ public class FastDateFormatTest extends AbstractLangTest {
|
||||||
|
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() {
|
||||||
|
final FastDateFormat format1 = FastDateFormat.getInstance("MM/DD/yyyy", Locale.GERMANY);
|
||||||
|
@@ -166,8 +164,7 @@ public class FastDateFormatTest extends AbstractLangTest {
|
||||||
|
assertEquals(Locale.GERMANY, format1.getLocale());
|
||||||
|
}
|
||||||
|
|
||||||
|
- @DefaultLocale(language = "en", country = "US")
|
||||||
|
- @DefaultTimeZone("America/New_York")
|
||||||
|
+ @org.junit.jupiter.api.Disabled("JUnit Pioneer not available")
|
||||||
|
@Test
|
||||||
|
public void test_getInstance_String_TimeZone() {
|
||||||
|
|
||||||
|
@@ -187,8 +184,7 @@ public class FastDateFormatTest extends AbstractLangTest {
|
||||||
|
assertNotSame(format4, format6);
|
||||||
|
}
|
||||||
|
|
||||||
|
- @DefaultLocale(language = "en", country = "US")
|
||||||
|
- @DefaultTimeZone("America/New_York")
|
||||||
|
+ @org.junit.jupiter.api.Disabled("JUnit Pioneer not available")
|
||||||
|
@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 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
|
||||||
|
@@ -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;
|
||||||
|
-import org.junitpioneer.jupiter.DefaultTimeZone;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unit tests {@link org.apache.commons.lang3.time.FastDatePrinter}.
|
||||||
|
@@ -166,8 +164,7 @@ public class FastDatePrinterTest extends AbstractLangTest {
|
||||||
|
assertNotEquals(printer1, new Object());
|
||||||
|
}
|
||||||
|
|
||||||
|
- @DefaultLocale(language = "en", country = "US")
|
||||||
|
- @DefaultTimeZone("America/New_York")
|
||||||
|
+ @org.junit.jupiter.api.Disabled("JUnit Pioneer not available")
|
||||||
|
@Test
|
||||||
|
public void testFormat() {
|
||||||
|
final GregorianCalendar cal1 = new GregorianCalendar(2003, 0, 10, 15, 33, 20);
|
||||||
|
@@ -407,7 +404,7 @@ public class FastDatePrinterTest extends AbstractLangTest {
|
||||||
|
assertEquals(expected, format.format(epoch, sb).toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
- @DefaultTimeZone("UTC")
|
||||||
|
+ @org.junit.jupiter.api.Disabled("JUnit Pioneer not available")
|
||||||
|
@Test
|
||||||
|
public void testTimeZoneAsZ() {
|
||||||
|
final Calendar c = Calendar.getInstance(FastTimeZone.getGmtTimeZone());
|
||||||
|
@@ -433,8 +430,7 @@ public class FastDatePrinterTest extends AbstractLangTest {
|
||||||
|
assertTrue(printer.toString().startsWith("FastDate"));
|
||||||
|
}
|
||||||
|
|
||||||
|
- @DefaultLocale(language = "en", country = "US")
|
||||||
|
- @DefaultTimeZone("America/New_York")
|
||||||
|
+ @org.junit.jupiter.api.Disabled("JUnit Pioneer not available")
|
||||||
|
@Test
|
||||||
|
public void testWeekYear() {
|
||||||
|
final GregorianCalendar cal = new GregorianCalendar(2020, 12, 31, 0, 0, 0);
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
@ -1,16 +1,30 @@
|
|||||||
|
%bcond_with bootstrap
|
||||||
|
|
||||||
Name: apache-commons-lang3
|
Name: apache-commons-lang3
|
||||||
Version: 3.9
|
Version: 3.14.0
|
||||||
Release: 4%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: Provides a host of helper utilities for the java.lang API
|
Summary: Provides a host of helper utilities for the java.lang API
|
||||||
License: ASL 2.0
|
License: Apache-2.0
|
||||||
URL: http://commons.apache.org/lang
|
URL: https://commons.apache.org/lang
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
ExclusiveArch: %{java_arches} noarch
|
||||||
|
|
||||||
Source0: http://archive.apache.org/dist/commons/lang/source/commons-lang3-%{version}-src.tar.gz
|
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:)
|
BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
|
||||||
|
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||||
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
|
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
|
||||||
|
BuildRequires: mvn(org.easymock:easymock)
|
||||||
|
BuildRequires: mvn(org.hamcrest:hamcrest)
|
||||||
|
BuildRequires: mvn(org.junit.jupiter:junit-jupiter)
|
||||||
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The standard Java libraries fail to provide enough methods for
|
The standard Java libraries fail to provide enough methods for
|
||||||
@ -29,45 +43,152 @@ therefore created differently named artifact and jar files. This is
|
|||||||
the new version, while apache-commons-lang is the compatibility
|
the new version, while apache-commons-lang is the compatibility
|
||||||
package.
|
package.
|
||||||
|
|
||||||
%{?module_package}
|
|
||||||
%{?javadoc_package}
|
%{?javadoc_package}
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n commons-lang3-%{version}-src
|
%setup -q -n commons-lang3-%{version}-src
|
||||||
|
|
||||||
|
%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 org.apache.commons:commons-text
|
||||||
|
|
||||||
%mvn_file : %{name} commons-lang3
|
%mvn_file : %{name} commons-lang3
|
||||||
|
|
||||||
# testParseSync() test fails on ARM and PPC64LE for unknown reason
|
# testParseSync() test fails on ARM and PPC64LE for unknown reason
|
||||||
sed -i 's/\s*public void testParseSync().*/@org.junit.Ignore\n&/' \
|
sed -i 's/\s*public void testParseSync().*/@org.junit.jupiter.api.Disabled\n&/' \
|
||||||
src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java
|
src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java
|
||||||
|
|
||||||
# non-deterministic tests fail randomly
|
# non-deterministic tests fail randomly
|
||||||
rm src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
|
rm src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
|
||||||
|
|
||||||
|
# Missing dependencies
|
||||||
|
rm src/test/java/org/apache/commons/lang3/HashSetvBitSetTest.java
|
||||||
|
|
||||||
|
# Remove limits and Java 11 options
|
||||||
|
sed -i '/<argLine>/d' pom.xml
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# FIXME tests run against current system version of commons-lang3, not the one being built
|
# See "-DcommonsLang3Version" in maven-surefire for the tested version
|
||||||
%mvn_build -f
|
%mvn_build -f
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%mvn_install
|
%mvn_install
|
||||||
|
|
||||||
%files -n %{?module_prefix}%{name} -f .mfiles
|
%files -f .mfiles
|
||||||
%license LICENSE.txt NOTICE.txt
|
%license LICENSE.txt NOTICE.txt
|
||||||
%doc RELEASE-NOTES.txt
|
%doc RELEASE-NOTES.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.14.0-6
|
||||||
|
- Bump release for October 2024 mass rebuild:
|
||||||
|
Resolves: RHEL-64018
|
||||||
|
|
||||||
|
* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 3.14.0-5
|
||||||
|
- Bump release for Aug 2024 java mass rebuild
|
||||||
|
|
||||||
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.14.0-4
|
||||||
|
- Bump release for June 2024 mass rebuild
|
||||||
|
|
||||||
|
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* 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
|
||||||
|
- Non-bootstrap build
|
||||||
|
|
||||||
|
* Wed Mar 10 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12.0-1
|
||||||
|
- Update to upstream version 3.12.0
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.11-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Aug 12 2020 Fabio Valentini <decathorpe@gmail.com> - 3.11-1
|
||||||
|
- Update to version 3.11.
|
||||||
|
- Fixes RHBZ#1699692
|
||||||
|
|
||||||
|
* Tue Aug 04 2020 Marian Koncek <mkoncek@redhat.com> - 3.11-1
|
||||||
|
- Update to upstream version 3.11
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.8.1-6
|
||||||
|
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||||
|
|
||||||
|
* Wed Apr 15 2020 Marian Koncek <mkoncek@redhat.com> - 3.10-1
|
||||||
|
- Update to upstream version 3.10
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.9-4
|
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.9-4
|
||||||
- Build with OpenJDK 8
|
- Build with OpenJDK 8
|
||||||
|
|
||||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.9-3
|
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.9-3
|
||||||
- Mass rebuild for javapackages-tools 201902
|
- Mass rebuild for javapackages-tools 201902
|
||||||
|
|
||||||
|
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.9-2
|
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.9-2
|
||||||
- Mass rebuild for javapackages-tools 201901
|
- Mass rebuild for javapackages-tools 201901
|
||||||
|
|
||||||
* Mon May 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.9-1
|
* Mon May 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.9-1
|
||||||
- Update to upstream version 3.9
|
- Update to upstream version 3.9
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Oct 12 2018 Marian Koncek <mkoncek@redhat.com> - 3.8.1-2
|
||||||
|
- Fix incorrect OSGi metadata
|
||||||
|
- Resolves: rhbz#1636556
|
||||||
|
|
||||||
|
* Mon Oct 01 2018 Marian Koncek <mkoncek@redhat.com> - 3.8.1-1
|
||||||
|
- Update to upstream version 3.8.1
|
||||||
|
- Resolves: rhbz#1619243
|
||||||
|
|
||||||
|
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.7-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.7-3
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.7-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
7
gating.yaml
Normal file
7
gating.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-10
|
||||||
|
decision_contexts:
|
||||||
|
- osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
|
7
plans/javapackages.fmf
Normal file
7
plans/javapackages.fmf
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
summary: Run javapackages-specific tests
|
||||||
|
discover:
|
||||||
|
how: fmf
|
||||||
|
url: https://src.fedoraproject.org/tests/javapackages
|
||||||
|
ref: c10s
|
||||||
|
execute:
|
||||||
|
how: tmt
|
Loading…
Reference in New Issue
Block a user