From cfd1394f6bbfd4068d70be09d2970191b25b54188394a3bcc13b7bf548cabc53 Mon Sep 17 00:00:00 2001
From: Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
Date: Wed, 29 Dec 2021 12:54:58 +0000
Subject: [PATCH 1/2] Accepting request 943059 from
 home:david.anes:branches:Java:packages

Fix bad version in default.properties that may break other packages

OBS-URL: https://build.opensuse.org/request/show/943059
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-lang3?expand=0&rev=28
---
 apache-commons-lang3.changes | 5 +++++
 default.properties           | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apache-commons-lang3.changes b/apache-commons-lang3.changes
index b2fd7a1..146ac7d 100644
--- a/apache-commons-lang3.changes
+++ b/apache-commons-lang3.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Dec 29 12:49:05 UTC 2021 - David Anes <david.anes@suse.com>
+
+- Fix component version in default.properties to 3.12 
+
 -------------------------------------------------------------------
 Fri Dec 24 14:28:12 UTC 2021 - David Anes <david.anes@suse.com>
 
diff --git a/default.properties b/default.properties
index 3bca4ad..8512e6c 100644
--- a/default.properties
+++ b/default.properties
@@ -42,7 +42,7 @@ component.package = org.apache.commons.lang3
 component.title = Core Language Utilities
 
 # The current version number of this component
-component.version = 3.9
+component.version = 3.12
 
 # The name that is used to create the jar file
 final.name = ${component.name}-${component.version}

From 982ec89dfe43136c5bb1ec2cc134d8bd927f03541b2d3b9630a58607fdf4046b Mon Sep 17 00:00:00 2001
From: David Anes <david.anes@suse.com>
Date: Wed, 29 Dec 2021 15:24:10 +0000
Subject: [PATCH 2/2] Accepting request 943068 from
 home:pmonrealgonzalez:branches:Java:packages

- Remove the junit bom dependency for now as it breaks the build of
  other packages like log4j.
  * Add apache-commons-lang3-junit-bom.patch

OBS-URL: https://build.opensuse.org/request/show/943068
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-lang3?expand=0&rev=29
---
 apache-commons-lang3-junit-bom.patch | 23 +++++++++++++++++++++++
 apache-commons-lang3.changes         |  7 +++++++
 apache-commons-lang3.spec            |  3 +++
 3 files changed, 33 insertions(+)
 create mode 100644 apache-commons-lang3-junit-bom.patch

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 @@
+     </contributor>
+   </contributors>
+ 
+-  <dependencyManagement>
+-    <dependencies>
+-      <dependency>
+-        <groupId>org.junit</groupId>
+-        <artifactId>junit-bom</artifactId>
+-        <version>5.7.1</version>
+-        <type>pom</type>
+-        <scope>import</scope>
+-      </dependency>
+-    </dependencies>
+-  </dependencyManagement>
+-
+   <!-- Lang should depend on very little -->
+   <dependencies>
+     <!-- testing -->
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 <pmonreal@suse.com>
+
+- 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 <david.anes@suse.com>
 
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