From f8b1a8c9aeb1ab9081246d57459a7a3c5899397afdf54e2938097933749c2bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Mon, 1 Jul 2024 14:22:42 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main maven revision
 fe170edab7d28cf6b91053c42b72d67a

---
 apache-maven-3.9.7-build.tar.xz |  3 ---
 apache-maven-3.9.7-src.tar.gz   |  3 ---
 apache-maven-3.9.8-build.tar.xz |  3 +++
 apache-maven-3.9.8-src.tar.gz   |  3 +++
 maven.changes                   | 35 +++++++++++++++++++++++++++++++++
 maven.spec                      |  6 +-----
 6 files changed, 42 insertions(+), 11 deletions(-)
 delete mode 100644 apache-maven-3.9.7-build.tar.xz
 delete mode 100644 apache-maven-3.9.7-src.tar.gz
 create mode 100644 apache-maven-3.9.8-build.tar.xz
 create mode 100644 apache-maven-3.9.8-src.tar.gz

diff --git a/apache-maven-3.9.7-build.tar.xz b/apache-maven-3.9.7-build.tar.xz
deleted file mode 100644
index 934aab8..0000000
--- a/apache-maven-3.9.7-build.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a5b66ed0a921ad8c0eed50ab508a2e3f5a2eaee667d4e91f002321e59fb85c7
-size 5284
diff --git a/apache-maven-3.9.7-src.tar.gz b/apache-maven-3.9.7-src.tar.gz
deleted file mode 100644
index 2f830e0..0000000
--- a/apache-maven-3.9.7-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:469580a1f25b998f294a07391412f4ec6eefdd05c328c0068f44588e438e702d
-size 2713480
diff --git a/apache-maven-3.9.8-build.tar.xz b/apache-maven-3.9.8-build.tar.xz
new file mode 100644
index 0000000..c3c9ffe
--- /dev/null
+++ b/apache-maven-3.9.8-build.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ef198f1a0ab176be656595204291381e8e76f4867be5dd8975d3a03d466b3bb
+size 5136
diff --git a/apache-maven-3.9.8-src.tar.gz b/apache-maven-3.9.8-src.tar.gz
new file mode 100644
index 0000000..3445b8e
--- /dev/null
+++ b/apache-maven-3.9.8-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c035591b9238d6832c19ad6e56506631f6330ad5c53868a80fdd5eaea365a467
+size 2720279
diff --git a/maven.changes b/maven.changes
index 189135d..865b3fb 100644
--- a/maven.changes
+++ b/maven.changes
@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Tue Jun 18 08:12:47 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 3.9.8
+  * Bug
+    + MNG-7758: o.e.aether.resolution.ArtifactResolutionException
+      incorrectly examined when multiple repositories are involved
+    + MNG-8066: Maven hangs on self-referencing exceptions
+    + MNG-8116: Plugin configuration can randomly fail in case of
+      method overloading as it doesn't take into account
+      implementation attribute
+    + MNG-8131: Property replacement in dependency pom no longer
+      works
+    + MNG-8135: Profile activation based on OS properties is no
+      longer case insensitive
+    + MNG-8142: If JDK profile activator gets "invalid" JDK version
+      for whatever reason, it chokes but does not tell why
+    + MNG-8147: Profile interpolation broke their evaluation in case
+      of duplicate IDs
+  * Improvement
+    + MNG-7902: Sort plugins in validation report
+    + MNG-8140: When a model is discarded (by model builder) for
+      whatever reason, show why it happened
+    + MNG-8141: Model Builder should report if not sure about
+      "fully correct" outcome
+    + MNG-8150: Make SimplexTransferListener handle absent
+      source/target files
+  * Task
+    + MNG-8146: Drop use of commons-lang
+  * Dependency upgrade
+    + MNG-8136: Update to Eclipse Sisu 0.9.0.M3
+    + MNG-8143: Update to commons-cli 1.8.0
+    + MNG-8144: Update to Guava 32.2.1-jre
+    + MNG-8154: Upgrade default plugin bindings
+
 -------------------------------------------------------------------
 Tue Jun 11 15:23:33 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/maven.spec b/maven.spec
index 08c821e..1120dce 100644
--- a/maven.spec
+++ b/maven.spec
@@ -20,7 +20,7 @@
 %global homedir %{_datadir}/%{name}%{?maven_version_suffix}
 %global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix}
 Name:           maven
-Version:        3.9.7
+Version:        3.9.8
 Release:        0
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
@@ -42,7 +42,6 @@ BuildRequires:  ant
 BuildRequires:  aopalliance
 BuildRequires:  apache-commons-cli
 BuildRequires:  apache-commons-codec
-BuildRequires:  apache-commons-lang3
 BuildRequires:  apache-commons-logging
 BuildRequires:  atinject
 BuildRequires:  dos2unix
@@ -118,7 +117,6 @@ Group:          Development/Tools/Building
 Requires:       aopalliance
 Requires:       apache-commons-cli
 Requires:       apache-commons-codec
-Requires:       apache-commons-lang3
 Requires:       apache-commons-logging
 Requires:       atinject
 Requires:       glassfish-annotation-api
@@ -230,7 +228,6 @@ done
 %build
 mkdir -p lib
 build-jar-repository -s lib \
-    apache-commons-lang3 \
     atinject \
     commons-cli \
     glassfish-annotation-api \
@@ -297,7 +294,6 @@ chmod -x %{buildroot}%{homedir}/bin/*.cmd %{buildroot}%{homedir}/bin/*.conf
 # Transitive deps of wagon-http, missing because of unshading
 build-jar-repository -p %{buildroot}%{homedir}/lib \
     aopalliance \
-    apache-commons-lang3 \
     atinject \
     commons-cli \
     commons-codec \