9 changed files with 141 additions and 77 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/apache-maven-3.6.3-src.tar.gz
+SOURCES/apache-maven-3.8.5-src.tar.gz
--- a/.maven.metadata
+++ b/.maven.metadata
@ -1 +1 @@
-ccf441f3bf7f477301ebc80742cbda1da73c30a2 SOURCES/apache-maven-3.6.3-src.tar.gz
+976a947711e82f11f47c7b128dd8df903642075b SOURCES/apache-maven-3.8.5-src.tar.gz
--- a/SOURCES/0001-Adapt-mvn-script.patch
+++ b/SOURCES/0001-Adapt-mvn-script.patch
@ -1,14 +1,14 @@
-From 247eafd819d6092661ebc57c54815acd20abd3de Mon Sep 17 00:00:00 2001
+From 3c59030162ccb3c38cf62a74a36e52cead52706b Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Wed, 1 Feb 2017 14:54:26 +0100
-Subject: [PATCH 1/4] Adapt mvn script
+Subject: [PATCH 1/6] Adapt mvn script

 ---
- apache-maven/src/bin/mvn | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
+ apache-maven/src/bin/mvn | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)

 diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
-index a554c6617..739501af4 100755
+index dfa384b8e..605c0edd3 100755
 --- a/apache-maven/src/bin/mvn
 +++ b/apache-maven/src/bin/mvn
@@ -22,7 +22,7 @@
@ -20,7 +20,7 @@ index a554c6617..739501af4 100755
 #   MAVEN_OPTS      (Optional) Java runtime options used when Maven is executed.
 #   MAVEN_SKIP_RC   (Optional) Flag to disable loading of mavenrc files.
 # -----------------------------------------------------------------------------
-@@ -33,12 +33,18 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
+@@ -37,12 +37,18 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
     . /etc/mavenrc
   fi
 
@ -39,7 +39,7 @@ index a554c6617..739501af4 100755
 # OS specific support. $var _must_ be set to either true or false.
 cygwin=false;
 mingw=false;
-@@ -63,7 +67,8 @@ done
+@@ -67,7 +73,8 @@ done
 
 saveddir=`pwd`
 
@ -50,5 +50,5 @@ index a554c6617..739501af4 100755
 # make it fully qualified
 MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
 -- 
-2.21.0
+2.35.1

--- a/SOURCES/0002-Invoke-logback-via-reflection.patch
+++ b/SOURCES/0002-Invoke-logback-via-reflection.patch
@ -1,7 +1,7 @@
-From 7610a10691e680db00edcbd4ce6767a30641cd71 Mon Sep 17 00:00:00 2001
+From 4d0c432cf88f2f70e6f793569d3dedace062fdef Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Tue, 6 Jun 2017 13:47:43 +0200
-Subject: [PATCH 2/4] Invoke logback via reflection
+Subject: [PATCH 2/6] Invoke logback via reflection

 ---
 .../logging/impl/LogbackConfiguration.java    | 19 ++++++++++++++-----
@ -49,5 +49,5 @@ index 5d9fab744..ced38cb5a 100644
 
     @Override
 -- 
-2.21.0
+2.35.1

--- a/SOURCES/0003-Use-non-shaded-HTTP-wagon.patch
+++ b/SOURCES/0003-Use-non-shaded-HTTP-wagon.patch
@ -1,7 +1,7 @@
-From c8933d155694ce37b1d4be59a744c8f7cbde6bb5 Mon Sep 17 00:00:00 2001
+From 81328d875bca5aae7d26e2058f4568a610c680d4 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Mon, 1 Jul 2019 09:51:56 +0200
-Subject: [PATCH 4/4] Use non-shaded HTTP wagon
+Subject: [PATCH 3/6] Use non-shaded HTTP wagon

 ---
 apache-maven/pom.xml | 15 ---------------
@ -9,7 +9,7 @@ Subject: [PATCH 4/4] Use non-shaded HTTP wagon
 2 files changed, 16 deletions(-)

 diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
-index 82e12a3..f02a45e 100644
+index 7ff412767..b15091576 100644
 --- a/apache-maven/pom.xml
 +++ b/apache-maven/pom.xml
@@ -63,21 +63,6 @@ under the License.
@ -33,12 +33,12 @@ index 82e12a3..f02a45e 100644
 -      </exclusions>
     </dependency>
     <dependency>
-       <!-- this is included in Wagon Http
+       <groupId>org.slf4j</groupId>
 diff --git a/pom.xml b/pom.xml
-index 44e287a..cdef69c 100644
+index c319cae26..42afab5f1 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -328,7 +328,6 @@ under the License.
+@@ -333,7 +333,6 @@ under the License.
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-http</artifactId>
         <version>${wagonVersion}</version>
@ -47,5 +47,5 @@ index 44e287a..cdef69c 100644
           <exclusion>
             <groupId>commons-logging</groupId>
 -- 
-2.24.1
+2.35.1

--- a/SOURCES/0004-Remove-dependency-on-powermock.patch
+++ b/SOURCES/0004-Remove-dependency-on-powermock.patch
@ -1,17 +1,17 @@
-From f6eb583525c7f777bde16182c57a47345fd53cb0 Mon Sep 17 00:00:00 2001
+From d0bc26194a0e432206d7f92cf0b6fbef67946cc4 Mon Sep 17 00:00:00 2001
 From: Marian Koncek <mkoncek@redhat.com>
 Date: Thu, 5 Sep 2019 15:21:04 +0200
-Subject: [PATCH] Remove dependency on powermock
+Subject: [PATCH 4/6] Remove dependency on powermock

 ---
 .../StringSearchModelInterpolatorTest.java    | 66 -------------------
 1 file changed, 66 deletions(-)

 diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
-index 45800d6..fbf3b23 100644
+index c95e37271..aafafa52f 100644
 --- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
 +++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
-@@ -36,8 +36,6 @@ import java.util.concurrent.FutureTask;
+@@ -36,8 +36,6 @@
 import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@ -20,7 +20,7 @@ index 45800d6..fbf3b23 100644
 
 /**
  * @author jdcasey
-@@ -374,70 +372,6 @@ public class StringSearchModelInterpolatorTest
+@@ -375,70 +373,6 @@ public void testInterpolateObjectWithPomFile()
         ) ) );
     }
 
@ -92,5 +92,5 @@ index 45800d6..fbf3b23 100644
         throws Exception
     {
 -- 
-2.24.1
+2.35.1

--- a/SOURCES/0005-Port-to-maven-resolver-1.7.2.patch
+++ b/SOURCES/0005-Port-to-maven-resolver-1.7.2.patch
@ -0,0 +1,25 @@
+From 25be70bc5a6eb0ddc2838a631cf1a5e20c784e1e Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Fri, 17 Dec 2021 13:05:49 +0100
+Subject: [PATCH 5/6] Port to maven-resolver 1.7.2
+
+---
+ .../org/apache/maven/repository/internal/MavenAetherModule.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
+index 41e98aaea..d72e3c0f3 100644
+--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
+@@ -28,7 +28,7 @@
+ 
+ import org.apache.maven.model.building.DefaultModelBuilderFactory;
+ import org.apache.maven.model.building.ModelBuilder;
+-import org.eclipse.aether.impl.AetherModule;
+import org.eclipse.aether.impl.guice.AetherModule;
+ import org.eclipse.aether.impl.ArtifactDescriptorReader;
+ import org.eclipse.aether.impl.MetadataGeneratorFactory;
+ import org.eclipse.aether.impl.VersionRangeResolver;
+-- 
+2.35.1
+
--- a/SOURCES/0006-Restore-DefaultModelValidator-compatibility-with-Mav.patch
+++ b/SOURCES/0006-Restore-DefaultModelValidator-compatibility-with-Mav.patch
@ -0,0 +1,37 @@
+From 7f97d98125938d065c2025716f041a1dbde326c2 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Fri, 22 Apr 2022 11:15:38 +0200
+Subject: [PATCH 6/6] Restore DefaultModelValidator compatibility with Maven
+ 3.5.4
+
+---
+ .../maven/model/validation/DefaultModelValidator.java       | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+index f77321c16..4ed22f3ed 100644
+--- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+@@ -44,6 +44,7 @@
+ import org.apache.maven.model.building.ModelProblem.Version;
+ import org.apache.maven.model.building.ModelProblemCollector;
+ import org.apache.maven.model.building.ModelProblemCollectorRequest;
+import org.apache.maven.model.interpolation.DefaultModelVersionProcessor;
+ import org.apache.maven.model.interpolation.ModelVersionProcessor;
+ import org.codehaus.plexus.util.StringUtils;
+ 
+@@ -85,6 +86,11 @@
+ 
+     private ModelVersionProcessor versionProcessor;
+ 
+    public DefaultModelValidator()
+    {
+        this( new DefaultModelVersionProcessor() );
+    }
+
+     @Inject
+     public DefaultModelValidator(  ModelVersionProcessor versionProcessor )
+     {
+-- 
+2.35.1
+
--- a/SPECS/maven.spec
+++ b/SPECS/maven.spec
@ -6,14 +6,15 @@

 Name:           maven
 Epoch:          1
-Version:        3.6.3
-Release:        19%{?dist}
+Version:        3.8.5
+Release:        6%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
 # bundled slf4j is MIT
 License:        ASL 2.0 and MIT
 URL:            https://maven.apache.org/
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch

 Source0:        https://archive.apache.org/dist/%{name}/%{name}-3/%{version}/source/apache-%{name}-%{version}-src.tar.gz
 Source1:        maven-bash-completion
@ -25,11 +26,15 @@ Patch1:         0001-Adapt-mvn-script.patch
 Patch2:         0002-Invoke-logback-via-reflection.patch
 Patch3:         0003-Use-non-shaded-HTTP-wagon.patch
 Patch4:         0004-Remove-dependency-on-powermock.patch
+Patch5:         0005-Port-to-maven-resolver-1.7.2.patch
+# XMvn needs to be ported to Maven 3.8.5
+# For now restore backwards compatibility with Maven 3.8.4
+Patch6:         0006-Restore-DefaultModelValidator-compatibility-with-Mav.patch

-BuildRequires:  maven-local-openjdk8
 %if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
+BuildRequires:  javapackages-bootstrap-openjdk8
 %else
+BuildRequires:  maven-local-openjdk8
 BuildRequires:  mvn(com.google.inject:guice::no_aop:)
 BuildRequires:  mvn(commons-cli:commons-cli)
 BuildRequires:  mvn(commons-jxpath:commons-jxpath)
@ -53,6 +58,7 @@ BuildRequires:  mvn(org.apache.maven.wagon:wagon-http)
 BuildRequires:  mvn(org.apache.maven.wagon:wagon-provider-api)
 BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires:  mvn(org.codehaus.mojo:extra-enforcer-rules)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-classworlds)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
@ -82,8 +88,6 @@ Requires: %{name}-lib = %{epoch}:%{version}-%{release}
 Requires: %{name}-jdk-binding = %{epoch}:%{version}-%{release}
 Suggests: %{name}-openjdk17 = %{epoch}:%{version}-%{release}

-Requires: which
-
 Requires(post): alternatives
 Requires(postun): alternatives

@ -112,8 +116,7 @@ Summary:        OpenJDK 8 binding for Maven
 RemovePathPostfixes: -openjdk8
 Provides: maven-jdk-binding = %{epoch}:%{version}-%{release}
 Requires: maven = %{epoch}:%{version}-%{release}
-Requires: java-1.8.0-openjdk-headless
-Recommends: java-1.8.0-openjdk-devel
+Requires: java-1.8.0-openjdk-devel
 Conflicts: maven-jdk-binding

 %description openjdk8
@ -124,8 +127,7 @@ Summary:        OpenJDK 11 binding for Maven
 RemovePathPostfixes: -openjdk11
 Provides: maven-jdk-binding = %{epoch}:%{version}-%{release}
 Requires: maven = %{epoch}:%{version}-%{release}
-Requires: java-11-openjdk-headless
-Recommends: java-11-openjdk-devel
+Requires: java-11-openjdk-devel
 Conflicts: maven-jdk-binding

 %description openjdk11
@ -136,8 +138,7 @@ Summary:        OpenJDK 17 binding for Maven
 RemovePathPostfixes: -openjdk17
 Provides: maven-jdk-binding = %{epoch}:%{version}-%{release}
 Requires: maven = %{epoch}:%{version}-%{release}
-Requires: java-17-openjdk-headless
-Recommends: java-17-openjdk-devel
+Requires: java-17-openjdk-devel
 Conflicts: maven-jdk-binding

 %description openjdk17
@ -163,10 +164,12 @@ Configures Maven to run with OpenJDK 21.
 find -name '*.java' -exec sed -i 's/\r//' {} +
 find -name 'pom.xml' -exec sed -i 's/\r//' {} +

-%patch -P 1 -p1
-%patch -P 2 -p1
-%patch -P 3 -p1
-%patch -P 4 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1

 # not really used during build, but a precaution
 find -name '*.jar' -not -path '*/test/*' -delete
@ -259,10 +262,10 @@ ln -s %{homedir}/bin/mvnDebug.1.gz %{buildroot}%{_mandir}/man1/mvnDebug%{maven_v

 # JDK bindings
 install -d -m 755 %{buildroot}%{_javaconfdir}/
-echo JAVA_HOME=%{_jvmlibdir}/jre-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8
-echo JAVA_HOME=%{_jvmlibdir}/jre-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11
-echo JAVA_HOME=%{_jvmlibdir}/jre-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17
-echo JAVA_HOME=%{_jvmlibdir}/jre-21-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk21
+echo JAVA_HOME=%{_jvmlibdir}/java-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8
+echo JAVA_HOME=%{_jvmlibdir}/java-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11
+echo JAVA_HOME=%{_jvmlibdir}/java-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17
+echo JAVA_HOME=%{_jvmlibdir}/java-21-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk21


 %post
@ -312,51 +315,50 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
 %config %{_javaconfdir}/maven.conf-openjdk21

 %changelog
-* Sat Nov 23 2024 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-19
- Switch to Fedora tests
+* Thu Feb 08 2024 Marián Konček <mkoncek@redhat.com> - 1:3.8.5-6
+- Rebuild to regenerate auto-requires
+
+* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.8.5-5
+- Rebuild to regenerate auto-requires

-* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-18
- Fix patch usage
+* Mon Jan 22 2024 Marián Konček <mkoncek@redhat.com> - 1:3.8.5-4
+- Add OpenJDK 21 binding
+- Related: RHEL-17126

-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-17
- Rebuild with regenerated Requires on Java
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.8.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

-* Thu Oct 17 2024 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-16
- Suggest maven-openjdk17
- Resolves: RHEL-62398
+* Thu May 05 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.8.5-2
+- Add build-dependency on extra-enforcer-rules

-* Thu Oct 17 2024 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-16
- Add maven-openjdk21
- Resolves: RHEL-62407
+* Thu Apr 21 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.8.5-1
+- Update to upstream version 3.8.5

-* Tue Jan 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-15
- Add missing Requires on which
- Resolves: rhbz#2165596
+* Thu Jan 27 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.8.4-3
+- Suggest OpenJDK 17 as default Maven binding

-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-15
- Turn hard dependency on java-devel into a weak dependencny
- Resolves: rhbz#2165593
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.8.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

-* Thu Dec 01 2022 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-15
+* Fri Dec 17 2021 Marian Koncek <mkoncek@redhat.com> - 1:3.8.4-1
+- Update to upstream version 3.8.4
+
+* Fri Nov 05 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-14
 - Do not override JAVA_HOME set by user
- Resolves: rhbz#2096431
+- Resolves: rhbz#2020478
+
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-13
+- Suggest OpenJDK 17 as default Maven binding

-* Fri Sep 24 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-14
+* Fri Sep 24 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-12
 - Add OpenJDK 17 binding

-* Thu Aug 19 2021 Marian Koncek <mkoncek@redhat.com> - 1:3.6.3-13
+* Fri Sep 24 2021 Marian Koncek <mkoncek@redhat.com> - 1:3.6.3-11
 - Create a symlink to jansi shared object
 - Related: rhbz#1994935

-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:3.6.3-12
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-11
- Rebuild to workaround DistroBaker issue
-
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-10
- Bootstrap Maven for CentOS Stream 9
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.6.3-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-9
 - Bootstrap build