Specify required resolver version

0001-Adapt-mvn-script.patch

@@ -1,14 +1,14 @@
-From 6e8f6a1b27c09d0a84fb5f3b7269cf5840db04f8 Mon Sep 17 00:00:00 2001
+From 2b3b2007375d73aec09cc0687392cdeaac938a21 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/5] Adapt mvn script
 
 ---
  apache-maven/src/bin/mvn | 19 ++++++++++++++++---
  1 file changed, 16 insertions(+), 3 deletions(-)
 
 diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
-index dfa384b8e..8c03825ed 100755
+index 47dc7d7f4e..01632abd29 100755
 --- a/apache-maven/src/bin/mvn
 +++ b/apache-maven/src/bin/mvn
 @@ -22,7 +22,7 @@
@@ -65,5 +65,5 @@ index dfa384b8e..8c03825ed 100755
  
  # For Cygwin, switch paths to Windows format before running java
 -- 
-2.36.1
+2.52.0
 

0001-Set-Guice-class-loading-to-CHILD-avoid-using-termina.patch

@@ -1,45 +0,0 @@
-From 1f97959a11cc4277d42da08ff581cc061849cea8 Mon Sep 17 00:00:00 2001
-From: Slawomir Jaranowski <s.jaranowski@gmail.com>
-Date: Fri, 25 Jul 2025 15:33:11 +0200
-Subject: [PATCH] Set Guice class loading to CHILD - avoid using terminally
- deprecated methods
-
-Default Guice class loading uses a terminally deprecated JDK memory-access classes.
-
-Fix #10312
----
- .../src/main/java/org/apache/maven/cli/MavenCli.java  | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
-index 18451bc43f..c7808b2455 100644
---- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
-+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
-@@ -271,6 +271,7 @@ public int doMain(CliRequest cliRequest) {
-             initialize(cliRequest);
-             cli(cliRequest);
-             properties(cliRequest);
-+            setupGuiceClassLoading();
-             logging(cliRequest);
-             informativeCommands(cliRequest);
-             version(cliRequest);
-@@ -475,6 +476,16 @@ private CommandLine cliMerge(CommandLine mavenConfig, CommandLine mavenCli) {
-         return commandLineBuilder.build();
-     }
- 
-+    /**
-+     * Sets up Guice class loading mode to CHILD, if not already set.
-+     * Default Guice class loading mode uses a terminally deprecated JDK memory-access classes.
-+     */
-+    void setupGuiceClassLoading() {
-+        if (System.getProperty("guice_custom_class_loading", "").trim().isEmpty()) {
-+            System.setProperty("guice_custom_class_loading", "CHILD");
-+        }
-+    }
-+
-     /**
-      * configure logging
-      */
--- 
-2.51.1
-

0002-Invoke-logback-via-reflection.patch

@@ -1,14 +1,14 @@
-From d1e6e9bcce8553e85957987d05d28583fcb55fdf Mon Sep 17 00:00:00 2001
+From 33ffcbcb1ed2dc9450ecb2f54d744379339572da 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/5] Invoke logback via reflection
 
 ---
  .../cli/logging/impl/LogbackConfiguration.java | 18 +++++++++++++-----
  1 file changed, 13 insertions(+), 5 deletions(-)
 
 diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
-index 4dc5a37b8..a977ba085 100644
+index 4dc5a37b88..a977ba0854 100644
 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
 +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
 @@ -31,21 +31,29 @@
@@ -47,5 +47,5 @@ index 4dc5a37b8..a977ba085 100644
  
      @Override
 -- 
-2.40.1
+2.52.0
 

0003-Remove-dependency-on-powermock.patch

@@ -1,17 +1,17 @@
-From fdc9034faeb960d15aa39820d610e00cd7121e03 Mon Sep 17 00:00:00 2001
+From c8e2ec01fd4080225ef54cc394b15d14a4d54ff4 Mon Sep 17 00:00:00 2001
 From: Marian Koncek <mkoncek@redhat.com>
 Date: Thu, 5 Sep 2019 15:21:04 +0200
-Subject: [PATCH 3/4] Remove dependency on powermock
+Subject: [PATCH 3/5] Remove dependency on powermock
 
 ---
  .../StringSearchModelInterpolatorTest.java    | 59 -------------------
  1 file changed, 59 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 b2612e540..20b7162e2 100644
+index 9bfd685101..d8c51e2fdd 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
-@@ -35,8 +35,6 @@
+@@ -40,8 +40,6 @@
  import static org.hamcrest.CoreMatchers.anyOf;
  import static org.hamcrest.CoreMatchers.is;
  import static org.junit.Assert.assertThat;
@@ -20,7 +20,7 @@ index b2612e540..20b7162e2 100644
  
  /**
   * @author jdcasey
-@@ -344,63 +342,6 @@ public void testInterpolateObjectWithPomFile() throws Exception {
+@@ -349,63 +347,6 @@ public void testInterpolateObjectWithPomFile() throws Exception {
                          is(System.getProperty("user.dir") + File.separator + '.' + File.separator + "target"))));
      }
  
@@ -85,5 +85,5 @@ index b2612e540..20b7162e2 100644
          final Model model = new Model();
  
 -- 
-2.40.1
+2.52.0
 

0004-Fix-build-with-qdox-2.0.1.patch

@@ -1,7 +1,7 @@
-From a46e8cb4641508c71379a07869551c770f18f1b9 Mon Sep 17 00:00:00 2001
+From ecf07ac5b51f753fec95f2102ce8ea53d39846a8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
 Date: Tue, 2 May 2023 18:12:26 +0200
-Subject: [PATCH 4/4] Fix build with qdox-2.0.1
+Subject: [PATCH 4/5] Fix build with qdox-2.0.1
 
 ---
  .../org/apache/maven/plugin/DefaultExtensionRealmCache.java   | 2 +-
@@ -17,7 +17,7 @@ Subject: [PATCH 4/4] Fix build with qdox-2.0.1
  10 files changed, 15 insertions(+), 15 deletions(-)
 
 diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
-index e2b712305..ce7bcae4e 100644
+index e2b712305a..fbe386c1db 100644
 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
 +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
 @@ -138,7 +138,7 @@ public void flush() {
@@ -25,12 +25,12 @@ index e2b712305..ce7bcae4e 100644
      }
  
 -    public void register(MavenProject project, Key key, CacheRecord record) {
-+    public void register(MavenProject project, Key key, CacheRecord record_) {
++    public void register(MavenProject project, Key key, CacheRecord rcrd) {
          // default cache does not track extension usage
      }
  
 diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
-index f2088b593..e5d7244fd 100644
+index f2088b593a..55000de738 100644
 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
 +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
 @@ -177,7 +177,7 @@ protected static boolean pluginEquals(Plugin a, Plugin b) {
@@ -38,12 +38,12 @@ index f2088b593..e5d7244fd 100644
      }
  
 -    public void register(MavenProject project, Key cacheKey, CacheRecord record) {
-+    public void register(MavenProject project, Key cacheKey, CacheRecord record_) {
++    public void register(MavenProject project, Key cacheKey, CacheRecord rcrd) {
          // default cache does not track record usage
      }
  }
 diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
-index 10321374b..c9e1d0e59 100644
+index 10321374ba..070d747d0c 100644
 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
 +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
 @@ -204,7 +204,7 @@ protected static boolean pluginEquals(Plugin a, Plugin b) {
@@ -51,12 +51,12 @@ index 10321374b..c9e1d0e59 100644
      }
  
 -    public void register(MavenProject project, Key key, CacheRecord record) {
-+    public void register(MavenProject project, Key key, CacheRecord record_) {
++    public void register(MavenProject project, Key key, CacheRecord rcrd) {
          // default cache does not track plugin usage
      }
  
 diff --git a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
-index 022b99320..b5cb6e66a 100644
+index 022b993206..72d47e5c85 100644
 --- a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
 +++ b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
 @@ -86,7 +86,7 @@ CacheRecord put(
@@ -64,13 +64,13 @@ index 022b99320..b5cb6e66a 100644
       *
       * @param project The project that employs the plugin realm, must not be {@code null}.
 -     * @param record The cache record being used for the project, must not be {@code null}.
-+     * @param record_ The cache record being used for the project, must not be {@code null}.
++     * @param rcrd The cache record being used for the project, must not be {@code null}.
       */
 -    void register(MavenProject project, Key key, CacheRecord record);
-+    void register(MavenProject project, Key key, CacheRecord record_);
++    void register(MavenProject project, Key key, CacheRecord rcrd);
  }
 diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
-index b0c07ae9a..97f76524c 100644
+index b0c07ae9a1..1096f88156 100644
 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
 +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
 @@ -92,7 +92,7 @@ Key createKey(
@@ -78,13 +78,13 @@ index b0c07ae9a..97f76524c 100644
       *
       * @param project The project that employs the plugin realm, must not be {@code null}.
 -     * @param record The cache record being used for the project, must not be {@code null}.
-+     * @param record_ The cache record being used for the project, must not be {@code null}.
++     * @param rcrd The cache record being used for the project, must not be {@code null}.
       */
 -    void register(MavenProject project, Key cacheKey, CacheRecord record);
-+    void register(MavenProject project, Key cacheKey, CacheRecord record_);
++    void register(MavenProject project, Key cacheKey, CacheRecord rcrd);
  }
 diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
-index bf655efc3..7b0e25259 100644
+index bf655efc3f..8653574e91 100644
 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
 +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
 @@ -102,7 +102,7 @@ default CacheRecord get(Key key, PluginRealmSupplier supplier)
@@ -92,13 +92,13 @@ index bf655efc3..7b0e25259 100644
       *
       * @param project The project that employs the plugin realm, must not be {@code null}.
 -     * @param record The cache record being used for the project, must not be {@code null}.
-+     * @param record_ The cache record being used for the project, must not be {@code null}.
++     * @param rcrd The cache record being used for the project, must not be {@code null}.
       */
 -    void register(MavenProject project, Key key, CacheRecord record);
-+    void register(MavenProject project, Key key, CacheRecord record_);
++    void register(MavenProject project, Key key, CacheRecord rcrd);
  }
 diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
-index 1a1f70638..cb446c759 100644
+index 1a1f706380..c3ac589471 100644
 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
 +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
 @@ -115,7 +115,7 @@ public void flush() {
@@ -106,12 +106,12 @@ index 1a1f70638..cb446c759 100644
      }
  
 -    public void register(MavenProject project, Key key, CacheRecord record) {
-+    public void register(MavenProject project, Key key, CacheRecord record_) {
++    public void register(MavenProject project, Key key, CacheRecord rcrd) {
          // default cache does not track record usage
      }
  
 diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
-index 241c86095..922ec982c 100644
+index 241c860955..6d4ae1ba47 100644
 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
 +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
 @@ -77,7 +77,7 @@ public DependencyFilter getExtensionArtifactFilter() {
@@ -119,26 +119,26 @@ index 241c86095..922ec982c 100644
       *
       * @param project The project that employs the plugin realm, must not be {@code null}.
 -     * @param record The cache record being used for the project, must not be {@code null}.
-+     * @param record_ The cache record being used for the project, must not be {@code null}.
++     * @param rcrd The cache record being used for the project, must not be {@code null}.
       */
 -    void register(MavenProject project, Key key, CacheRecord record);
-+    void register(MavenProject project, Key key, CacheRecord record_);
++    void register(MavenProject project, Key key, CacheRecord rcrd);
  }
 diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
-index c45128530..a854fd234 100644
+index 0e59582e81..c761ecb8a8 100644
 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
 +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
-@@ -227,7 +227,7 @@ public void flush() {
+@@ -229,7 +229,7 @@ public void flush() {
      }
  
      @Override
 -    public void register(MavenProject project, Key cacheKey, CacheRecord record) {
-+    public void register(MavenProject project, Key cacheKey, CacheRecord record_) {
++    public void register(MavenProject project, Key cacheKey, CacheRecord rcrd) {
          // default cache does not track record usage
      }
  }
 diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
-index 025800698..f6ba70b86 100644
+index 025800698c..e3d1156bd5 100644
 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
 +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
 @@ -93,7 +93,7 @@ Key createKey(
@@ -146,11 +146,11 @@ index 025800698..f6ba70b86 100644
       *
       * @param project The project that employs the plugin realm, must not be {@code null}.
 -     * @param record The cache record being used for the project, must not be {@code null}.
-+     * @param record_ The cache record being used for the project, must not be {@code null}.
++     * @param rcrd The cache record being used for the project, must not be {@code null}.
       */
 -    void register(MavenProject project, Key cacheKey, CacheRecord record);
-+    void register(MavenProject project, Key cacheKey, CacheRecord record_);
++    void register(MavenProject project, Key cacheKey, CacheRecord rcrd);
  }
 -- 
-2.40.1
+2.52.0
 

0005-Reproducible-maven.build.timestamp.patch

@@ -1,4 +1,4 @@
-From 599dc0284287da5d48f578f5fe90b84dd4e0e485 Mon Sep 17 00:00:00 2001
+From 0d5ede756650a0e4f01183723a9185b711ee4ecf Mon Sep 17 00:00:00 2001
 From: Emmanuel Bourg <ebourg@apache.org>
 Date: Mon, 4 Sep 2023 17:10:19 +0200
 Subject: [PATCH 5/5] Reproducible maven.build.timestamp
@@ -12,7 +12,7 @@ builds reproducible.
  2 files changed, 18 insertions(+), 2 deletions(-)
 
 diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
-index f2af8036a..9e0db2cb0 100644
+index f2af8036ae..9e0db2cb08 100644
 --- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
 +++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
 @@ -44,7 +44,15 @@ public BuildTimestampValueSource(Date startTime, String format) {
@@ -33,7 +33,7 @@ index f2af8036a..9e0db2cb0 100644
  
              return formattedDate;
 diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java
-index e1721334f..2ea2ce381 100644
+index e1721334f4..2ea2ce3815 100644
 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java
 +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java
 @@ -21,6 +21,7 @@
@@ -61,5 +61,5 @@ index e1721334f..2ea2ce381 100644
          dateFormat.setTimeZone(DEFAULT_BUILD_TIME_ZONE);
          formattedTimestamp = dateFormat.format(time);
 -- 
-2.42.0
+2.52.0
 

apache-maven-3.9.11-src.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f312bb9db25937f1fd7ca1d53a086a3cdde596086147a42a75af027058810b9e
-size 2729505

maven.changes

@@ -1,3 +1,69 @@
+-------------------------------------------------------------------
+Thu Dec 18 05:38:34 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Specify required maven-resolver version since the
+  maven-resolver-provider requires methods added in 1.9.25
+
+-------------------------------------------------------------------
+Wed Dec 17 08:09:39 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 3.9.12
+  * New features and improvements
+    + Apply resolver changes and improvements
+    + Update formatting of prerequisites-requirements error to
+      improve readability
+    + Allow a Maven plugin to require a Java version
+    + Use MavenRepositorySystem in ProjectBuildingHelper instead
+      of deprecated RepositorySystem
+    + Make maven.config use UTF8
+    + Simplify prefix resolution
+  * Bug Fixes
+    + Add default implementation for new method in
+      MavenPluginManager
+    + Repository layout should be used in MavenRepositorySystem
+    + Fix plugin prefix resolution when metadata is not available
+      from repository
+    + Improve source root modification warning message
+    + Bug: bad cache isolation between two sessions
+    + Set Guice class loading to CHILD - avoid using terminally
+      deprecated methods
+    + Avoid parsing MAVEN_OPTS (3.9.x)
+  * Documentation updates
+    + clarify repository vs deployment repository
+    + add maintained branches
+  * Maintenance
+    + Add IntelliJ icon
+    + Build by JDK 25
+    + Deprecate org.apache.maven.repository.RepositorySystem in
+      3.9.x
+  * Build
+    + Bump actions/download-artifact from 5.0.0 to 6.0.0
+    + Bump actions/upload-artifact from 4.6.2 to 5.0.0
+  * Dependency updates
+    + Bump actions/cache from 4.2.3 to 5.0.0
+    + Bump resolverVersion from 1.9.24 to 1.9.25
+    + Bump actions/checkout from 5.0.0 to 6.0.1
+    + Bump actions/setup-java from 5.0.0 to 5.1.0
+    + Bump commons-cli:commons-cli from 1.9.0 to 1.11.0
+    + Bump org.codehaus.plexus:plexus-interpolation from 1.28 to
+      1.29
+    + Bump commons-io:commons-io from 2.19.0 to 2.21.0
+    + Bump xmlunitVersion from 2.10.3 to 2.11.0
+    + Bump org.codehaus.mojo:animal-sniffer-maven-plugin from 1.24
+      to 1.26
+    + Bump org.ow2.asm:asm from 9.8 to 9.9
+    + Bump com.google.guava:guava from 33.4.8-jre to 33.5.0-jre
+- Removed patch:
+  * 0001-Set-Guice-class-loading-to-CHILD-avoid-using-termina.patch
+    + integrated in this version
+- Modified patches:
+  * 0001-Adapt-mvn-script.patch
+  * 0002-Invoke-logback-via-reflection.patch
+  * 0003-Remove-dependency-on-powermock.patch
+  * 0004-Fix-build-with-qdox-2.0.1.patch
+  * 0005-Reproducible-maven.build.timestamp.patch
+    + rediff
+
 -------------------------------------------------------------------
 Tue Nov  4 22:41:54 UTC 2025 - Fridrich Strba <fstrba@suse.com>
 

maven.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package maven
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %global homedir %{_datadir}/%{name}%{?maven_version_suffix}
 %global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix}
 Name:           maven
-Version:        3.9.11
+Version:        3.9.12
 Release:        0
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
@@ -38,7 +38,6 @@ Patch2:         0002-Invoke-logback-via-reflection.patch
 Patch3:         0003-Remove-dependency-on-powermock.patch
 Patch4:         0004-Fix-build-with-qdox-2.0.1.patch
 Patch5:         0005-Reproducible-maven.build.timestamp.patch
-Patch6:         0001-Set-Guice-class-loading-to-CHILD-avoid-using-termina.patch
 BuildRequires:  ant
 BuildRequires:  aopalliance
 BuildRequires:  apache-commons-cli
@@ -57,7 +56,7 @@ BuildRequires:  jansi
 BuildRequires:  javapackages-local
 BuildRequires:  jcl-over-slf4j
 BuildRequires:  jdom2
-BuildRequires:  maven-resolver-api >= 1.8.1
+BuildRequires:  maven-resolver-api >= 1.9.25
 BuildRequires:  maven-resolver-connector-basic
 BuildRequires:  maven-resolver-impl
 BuildRequires:  maven-resolver-named-locks
@@ -187,7 +186,6 @@ BuildArch:      noarch
 %patch -P 3 -p1
 %patch -P 4 -p1
 %patch -P 5 -p1
-%patch -P 6 -p1
 
 # not really used during build, but a precaution
 find -name '*.jar' -not -path '*/test/*' -delete