diff --git a/apache-commons-lang3-junit-bom.patch b/apache-commons-lang3-junit-bom.patch new file mode 100644 index 0000000..6446ffe --- /dev/null +++ b/apache-commons-lang3-junit-bom.patch @@ -0,0 +1,23 @@ +Index: commons-lang3-3.12.0-src/pom.xml +=================================================================== +--- commons-lang3-3.12.0-src.orig/pom.xml ++++ commons-lang3-3.12.0-src/pom.xml +@@ -513,18 +513,6 @@ + + + +- +- +- +- org.junit +- junit-bom +- 5.7.1 +- pom +- import +- +- +- +- + + + diff --git a/apache-commons-lang3.changes b/apache-commons-lang3.changes index 146ac7d..e1e9749 100644 --- a/apache-commons-lang3.changes +++ b/apache-commons-lang3.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 29 15:18:48 UTC 2021 - Pedro Monreal + +- Remove the junit bom dependency for now as it breaks the build of + other packages like log4j. + * Add apache-commons-lang3-junit-bom.patch + ------------------------------------------------------------------- Wed Dec 29 12:49:05 UTC 2021 - David Anes diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec index 82798b7..4f086b0 100644 --- a/apache-commons-lang3.spec +++ b/apache-commons-lang3.spec @@ -28,6 +28,7 @@ URL: https://commons.apache.org/proper/commons-lang/ Source0: https://dlcdn.apache.org/commons/lang/source/%{short_name}-%{version}-src.tar.gz Source1: build.xml Source2: default.properties +Patch0: apache-commons-lang3-junit-bom.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 1.8 @@ -57,6 +58,8 @@ Javadoc for %{name}. %prep %setup -q -n %{short_name}-%{version}-src +%patch0 -p1 + cp %{SOURCE1} . cp %{SOURCE2} . sed -i 's/\r//' *.txt