diff --git a/0001-Adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch
index d531bed..829e345 100644
--- a/0001-Adapt-mvn-script.patch
+++ b/0001-Adapt-mvn-script.patch
@@ -1,14 +1,14 @@
-From 46041685a82b861bc8616bb603e341adb740a302 Mon Sep 17 00:00:00 2001
+From bf34ee0a7363af06a70974c5b5334b5531f2c648 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/3] Adapt mvn script
+Subject: [PATCH 1/6] Adapt mvn script
 
 ---
- apache-maven/src/bin/mvn | 19 ++++++++++++++++---
- 1 file changed, 16 insertions(+), 3 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 a554c66..818cf70 100755
+index dfa384b8e..605c0edd3 100755
 --- a/apache-maven/src/bin/mvn
 +++ b/apache-maven/src/bin/mvn
 @@ -22,7 +22,7 @@
@@ -20,11 +20,11 @@ index a554c66..818cf70 100755
  #   MAVEN_OPTS      (Optional) Java runtime options used when Maven is executed.
  #   MAVEN_SKIP_RC   (Optional) Flag to disable loading of mavenrc files.
  # -----------------------------------------------------------------------------
-@@ -37,12 +37,24 @@
+@@ -37,12 +37,18 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
      . /etc/mavenrc
    fi
  
-+  if [ -f /etc/java/maven.conf ] ; then
++  if [ -z "$JAVA_HOME" ] ; then
 +    . /etc/java/maven.conf
 +  fi
 +
@@ -34,18 +34,12 @@ index a554c66..818cf70 100755
  
  fi
  
-+if [ -f /usr/share/java-utils/java-functions ] ; then
-+  . /usr/share/java-utils/java-functions
-+  set_jvm
-+  set_javacmd
-+fi
 +export JAVA_HOME
-+export JAVACMD
 +
  # OS specific support. $var _must_ be set to either true or false.
  cygwin=false;
  mingw=false;
-@@ -67,7 +79,8 @@
+@@ -67,7 +73,8 @@ done
  
  saveddir=`pwd`
  
@@ -55,15 +49,6 @@ index a554c66..818cf70 100755
  
  # make it fully qualified
  MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
-@@ -105,7 +118,7 @@
-   exit 1
- fi
- 
--CLASSWORLDS_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar`
-+CLASSWORLDS_JAR=`build-classpath plexus-classworlds`
- CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
- 
- # For Cygwin, switch paths to Windows format before running java
 -- 
-2.17.1
+2.36.0
 
diff --git a/0002-Invoke-logback-via-reflection.patch b/0002-Invoke-logback-via-reflection.patch
index 2843df5..4a45be3 100644
--- a/0002-Invoke-logback-via-reflection.patch
+++ b/0002-Invoke-logback-via-reflection.patch
@@ -1,7 +1,7 @@
-From 7610a10691e680db00edcbd4ce6767a30641cd71 Mon Sep 17 00:00:00 2001
+From 6df635d9ba9e5e0354f01c158b9410783bbeec53 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.36.0
 
diff --git a/0004-Use-non-shaded-HTTP-wagon.patch b/0003-Use-non-shaded-HTTP-wagon.patch
similarity index 80%
rename from 0004-Use-non-shaded-HTTP-wagon.patch
rename to 0003-Use-non-shaded-HTTP-wagon.patch
index 58c0c6e..85cfd9e 100644
--- a/0004-Use-non-shaded-HTTP-wagon.patch
+++ b/0003-Use-non-shaded-HTTP-wagon.patch
@@ -1,7 +1,7 @@
-From c8933d155694ce37b1d4be59a744c8f7cbde6bb5 Mon Sep 17 00:00:00 2001
+From af685ec847255712ce328677162573451101e0e3 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 2686570af..d22ae121d 100644
+index 7ff412767..b15091576 100644
 --- a/apache-maven/pom.xml
 +++ b/apache-maven/pom.xml
 @@ -63,21 +63,6 @@ under the License.
@@ -32,13 +32,13 @@ index 2686570af..d22ae121d 100644
 -        </exclusion>
 -      </exclusions>
      </dependency>
-     <!--  This is included in Wagon HTTP.
-           We are just making the dependency explicit
+     <dependency>
+       <groupId>org.slf4j</groupId>
 diff --git a/pom.xml b/pom.xml
-index 237cdc39e..85436c54d 100644
+index c319cae26..42afab5f1 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -334,7 +334,6 @@
+@@ -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 237cdc39e..85436c54d 100644
            <exclusion>
              <groupId>commons-logging</groupId>
 -- 
-2.21.0
+2.36.0
 
diff --git a/0004-Remove-dependency-on-powermock.patch b/0004-Remove-dependency-on-powermock.patch
new file mode 100644
index 0000000..1e1ccd4
--- /dev/null
+++ b/0004-Remove-dependency-on-powermock.patch
@@ -0,0 +1,96 @@
+From a8fc2a43c376db91aebd631acdeeef88673df0d1 Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Thu, 5 Sep 2019 15:21:04 +0200
+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 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 static org.hamcrest.CoreMatchers.anyOf;
+ import static org.hamcrest.CoreMatchers.is;
+ import static org.junit.Assert.assertThat;
+-import static org.powermock.reflect.Whitebox.getField;
+-import static org.powermock.reflect.Whitebox.getInternalState;
+ 
+ /**
+  * @author jdcasey
+@@ -375,70 +373,6 @@ public void testInterpolateObjectWithPomFile()
+         ) ) );
+     }
+ 
+-    public void testNotInterpolateObjectWithFile()
+-            throws Exception
+-    {
+-        Model model = new Model();
+-
+-        File baseDir = new File( System.getProperty( "user.dir" ) );
+-
+-        Properties p = new Properties();
+-
+-        ObjectWithNotInterpolatedFile obj = new ObjectWithNotInterpolatedFile( baseDir );
+-
+-        StringSearchModelInterpolator interpolator = (StringSearchModelInterpolator) createInterpolator();
+-
+-        ModelBuildingRequest config = createModelBuildingRequest( p );
+-
+-        SimpleProblemCollector collector = new SimpleProblemCollector();
+-        interpolator.interpolateObject( obj, model, new File( "." ), config, collector );
+-        assertProblemFree( collector );
+-
+-        //noinspection unchecked
+-        Map<Class<?>, ?> cache =
+-                (Map<Class<?>, ?>) getField( StringSearchModelInterpolator.class, "CACHED_ENTRIES" )
+-                        .get( null );
+-
+-        Object objCacheItem = cache.get( Object.class );
+-        Object fileCacheItem = cache.get( File.class );
+-
+-        assertNotNull( objCacheItem );
+-        assertNotNull( fileCacheItem );
+-
+-        assertThat( ( (Object[]) getInternalState( objCacheItem, "fields" ) ).length, is( 0 ) );
+-        assertThat( ( (Object[]) getInternalState( fileCacheItem, "fields" ) ).length, is( 0 ) );
+-    }
+-
+-    public void testNotInterpolateFile()
+-            throws Exception
+-    {
+-        Model model = new Model();
+-
+-        File baseDir = new File( System.getProperty( "user.dir" ) );
+-
+-        Properties p = new Properties();
+-
+-        StringSearchModelInterpolator interpolator = (StringSearchModelInterpolator) createInterpolator();
+-
+-        ModelBuildingRequest config = createModelBuildingRequest( p );
+-
+-        SimpleProblemCollector collector = new SimpleProblemCollector();
+-        interpolator.interpolateObject( baseDir, model, new File( "." ), config, collector );
+-        assertProblemFree( collector );
+-
+-        //noinspection unchecked
+-        Map<Class<?>, ?> cache =
+-                (Map<Class<?>, ?>) getField( StringSearchModelInterpolator.class, "CACHED_ENTRIES" )
+-                        .get( null );
+-
+-        Object fileCacheItem = cache.get( File.class );
+-
+-        assertNotNull( fileCacheItem );
+-
+-        assertThat( ( (Object[]) getInternalState( fileCacheItem, "fields" ) ).length, is( 0 ) );
+-    }
+-
+-
+     public void testConcurrentInterpolation()
+         throws Exception
+     {
+-- 
+2.36.0
+
diff --git a/0005-Port-to-maven-resolver-1.7.2.patch b/0005-Port-to-maven-resolver-1.7.2.patch
index ceda5bb..32ce91f 100644
--- a/0005-Port-to-maven-resolver-1.7.2.patch
+++ b/0005-Port-to-maven-resolver-1.7.2.patch
@@ -1,25 +1,25 @@
-From b23d2957440cb4ff06a289b4864f782794b45f52 Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Fri, 17 Dec 2021 13:05:49 +0100
-Subject: [PATCH] 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.31.1
-
+From d7de16c8771c76afad3e635f82372948a98249a2 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.36.0
+
diff --git a/0006-Restore-DefaultModelValidator-compatibility-with-Mav.patch b/0006-Restore-DefaultModelValidator-compatibility-with-Mav.patch
new file mode 100644
index 0000000..5fd8e70
--- /dev/null
+++ b/0006-Restore-DefaultModelValidator-compatibility-with-Mav.patch
@@ -0,0 +1,37 @@
+From c4c50ed5cd3e8de7037818cf6df57abdf75933fa 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.36.0
+
diff --git a/apache-maven-3.8.4-build.tar.xz b/apache-maven-3.8.4-build.tar.xz
deleted file mode 100644
index 8f145b5..0000000
--- a/apache-maven-3.8.4-build.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be20b051f6afd6ecb0fd8127e2f8e1618f1af8eb3d17dfb24f81609fcae62b9a
-size 5120
diff --git a/apache-maven-3.8.4-src.tar.gz b/apache-maven-3.8.4-src.tar.gz
deleted file mode 100644
index 9fcb906..0000000
--- a/apache-maven-3.8.4-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:298bfb6172c134655f4f5608342f9c7bc798918ac165b8ded4af800be184ab9b
-size 2774526
diff --git a/apache-maven-3.8.4-src.tar.gz.asc b/apache-maven-3.8.4-src.tar.gz.asc
deleted file mode 100644
index 2492693..0000000
--- a/apache-maven-3.8.4-src.tar.gz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAABCgAGBQJhkNSDAAoJEBoqHJS96JaIvpsIAKbTcPc3dfJEp7O3oH6PTcvU
-5zeycOGGptm/9k/hCNlzV79YEMDnyZSnEtCBv7/Y3cqEO+WLYeX/0YWxuAIKnBYH
-telpXcXVRauV7+eAxgu3nJuIu56eJtGrwndpdYRwkJ94hRhWMG7RsksX3/GtW12u
-fH/J/0pYrW1uSIMihk0mEV4lShqhC+mnF6LMM1T3Vl5c9FvTEx0OZWlHd9r10wfD
-bX9yXeAt7ckq7EVg0JhW+dpl4Gp5oTwXvNydUMTlOt0NkkC+GHxTDn/BipUt2yau
-Sg/J/BKP7/8W0MhnY0tM7x2s8gzc4z7Y3xuzJ+UNCWbO1LREowre8CPVMXoEuSA=
-=29QL
------END PGP SIGNATURE-----
diff --git a/apache-maven-3.8.5-build.tar.xz b/apache-maven-3.8.5-build.tar.xz
new file mode 100644
index 0000000..8a4af81
--- /dev/null
+++ b/apache-maven-3.8.5-build.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77d9c6b4d81338490a4d9e940142e3503999b3dca1c4d25f0ae02e22a94a1b2b
+size 5132
diff --git a/apache-maven-3.8.5-src.tar.gz b/apache-maven-3.8.5-src.tar.gz
new file mode 100644
index 0000000..c68fe86
--- /dev/null
+++ b/apache-maven-3.8.5-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a60ddbb333f3addb93e063613a9589f47ed805a572c156075dc1bf4db774c007
+size 2783778
diff --git a/apache-maven-3.8.5-src.tar.gz.asc b/apache-maven-3.8.5-src.tar.gz.asc
new file mode 100644
index 0000000..316c459
--- /dev/null
+++ b/apache-maven-3.8.5-src.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAABCgAGBQJiI4SRAAoJEBoqHJS96JaIYX4H/1cyRz6yNJAUhKEBuwZ8A1GC
+9NS8fSQSw7yxYADcaFr2DVPspOqZgk3AvdPFhTcA+0hzf1Wt45A5I/UFL7UQEoDE
+g+vS+czb9hKt45FwnFTzk8sQ1YkoMJ9ZNMYjntMRt3DDCRWwxRuVVnNBzoLSDHd9
+4KZs+ABIGMV+gqJBZum0u0j0SdDgd+3Rm4++zjXiSx2lSbwus8+DNLX6cxvpNG4/
+IswftTmBcu6OS/f0G9wrKlNTDX/e29w4gjoRXUEQ8GjHblbsIIqdJF1qGjYJ0mWL
+4Tr8xkcaF9aKdwNMRYb1jLtrnAdNYX5vRg4fAmzl9H26eEGFNmbjh/Lk9TRkeL8=
+=AU+b
+-----END PGP SIGNATURE-----
diff --git a/maven.keyring b/maven.keyring
index d2216e0..d649bbc 100644
--- a/maven.keyring
+++ b/maven.keyring
@@ -68,9 +68,12 @@ HmizzrWfCbnt2Epa3EGsFv4tIRd1cG5IAa41gvh+pX32symEwrh2wcbDU7YPjrMC
 =vtG4
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub   rsa8192/160788A2 2015-03-04 [SC] [expires: 2021-08-15]
+pub   rsa8192 2015-03-04 [SC] [expires: 2024-08-15]
       AE9E53FC28FF2AB1012273D0BF1518E0160788A2
-uid         [ultimate] Karl Heinz Marbaise (ASF Key) <khmarbaise@apache.org>
+uid           [ultimate] Karl Heinz Marbaise (ASF Key) <khmarbaise@apache.org>
+sig 3        BF1518E0160788A2 2022-03-25  Karl Heinz Marbaise (ASF Key) <khmarbaise@apache.org>
+sig 3        BF1518E0160788A2 2017-08-13  Karl Heinz Marbaise (ASF Key) <khmarbaise@apache.org>
+sig 3        BF1518E0160788A2 2015-03-04  Karl Heinz Marbaise (ASF Key) <khmarbaise@apache.org>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
@@ -96,120 +99,167 @@ rQv/H6GFvjKDcVRYCAWwIRRixDBnSFJuAPVlGUer2GLzimy+RMJx1owXjigW9ZZf
 4ANGScK0LWx9L5dXqlQM1uhrM+SW3Pd4eKmmsVVj1YhAgrJcYPJKEXWftuG2VdcM
 +U2tTuYLAQz1uSUf1ShB60xTdFYu355qQfRFey9GAG20iPNY65ktkxWXbLBqCeCm
 XyWiPPHo53w0GPbbKt1J0ycE/5HB3iKg5UQrABEBAAG0NUthcmwgSGVpbnogTWFy
-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
-=NkUD
+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
+=dagP
 -----END PGP PUBLIC KEY BLOCK-----
 
 pub  1024D/C560DD8B 2005-09-19 Emmanuel Venisse <evenisse@apache.org>
@@ -851,7 +901,6 @@ sig 3        B3A2D3B1 2007-03-28  John Casey (Maven PMC Member) <john@maven.org>
 sub   2048g/D6CD44BD 2007-03-28
 sig          B3A2D3B1 2007-03-28  John Casey (Maven PMC Member) <john@maven.org>
 
-gpg: WARNING: unsafe enclosing directory permissions on configuration file `/home/jdcasey/.gnupg/gpg.conf'
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
@@ -3739,3 +3788,22 @@ kSkTFiY0ACKu0OiXgajQ75g2LVI2uXkezd8cyzD89a/c5QhvLV3fbwh/hpjHNaI2
 fUB7vVlzPnBDQ+imN5uNOymMNiLYjHGN2OXzU0XRDL7u0g==
 =c5jm
 -----END PGP PUBLIC KEY BLOCK-----
+
+pub   ed25519/0x0E593F2ED433A5AD 2020-11-20 [SC] [expires: 2027-11-19]
+      Key fingerprint = 1083 EA11 7629 CBDB F77F  D606 0E59 3F2E D433 A5AD
+uid                   [ultimate] Benjamin Marwell <bmarwell@apache.org>
+sig 3        0x0E593F2ED433A5AD 2020-11-20 never       Benjamin Marwell <bmarwell@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEX7e9phYJKwYBBAHaRw8BAQdAVOaVsM6Zr/optjYaqQZmaoP9iuulWoOFXazU
+YmDAj7G0JkJlbmphbWluIE1hcndlbGwgPGJtYXJ3ZWxsQGFwYWNoZS5vcmc+iJYE
+ExYIAD4CGwMCHgECF4AFCQ0oez4WIQQQg+oRdinL2/d/1gYOWT8u1DOlrQUCX7fQ
+bQULCQgHAgYVCgkICwIEFgIDAQAKCRAOWT8u1DOlrZMaAP9DGTywLXK2pHH8wcr3
+rp9fH03eKBzPo8FEA9z2Fsq7VgD/R8cz/c8X22O14pIlAq54ynki1nOz5SFsNczv
+ombExguIXQQTEQoAHRYhBBHWYbD16CH8YeURqnFcLiH9WAzABQJft83RAAoJEHFc
+LiH9WAzAjMoAnRoGCUPsMllTW+w5X4aNGGRNroKFAJ9oEIJD8jvh1zGpalBdlYJN
+Ub0cvA==
+=NCZf
+-----END PGP PUBLIC KEY BLOCK-----
+
diff --git a/maven.spec b/maven.spec
index 80c539d..e21aeec 100644
--- a/maven.spec
+++ b/maven.spec
@@ -19,14 +19,8 @@
 %global bundled_slf4j_version 1.7.25
 %global homedir %{_datadir}/%{name}%{?maven_version_suffix}
 %global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix}
-%if 0%{?suse_version} > 1500
-%bcond_without libalternatives
-%else
-%bcond_with libalternatives
-%endif
-%bcond_with  logback
 Name:           maven
-Version:        3.8.4
+Version:        3.8.5
 Release:        0
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
@@ -42,11 +36,11 @@ Source4:        https://downloads.apache.org/maven/KEYS#/%{name}.keyring
 Source10:       apache-%{name}-%{version}-build.tar.xz
 Patch1:         0001-Adapt-mvn-script.patch
 # Downstream-specific, avoids dependency on logback
-# Used only when %%without logback is in effect
 Patch2:         0002-Invoke-logback-via-reflection.patch
-Patch3:         qdox-2.0.1.patch
-Patch4:         0004-Use-non-shaded-HTTP-wagon.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
+Patch6:         0006-Restore-DefaultModelValidator-compatibility-with-Mav.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-cli
 BuildRequires:  apache-commons-codec
@@ -105,16 +99,6 @@ Requires(post): aaa_base
 Requires(postun):aaa_base
 # maven-lib cannot be noarch because of the position of jansi-native.jar
 #BuildArch:      noarch
-%if %{with logback}
-BuildRequires:  mvn(ch.qos.logback:logback-classic)
-%endif
-%if %{with libalternatives}
-BuildRequires:  alts
-Requires:       alts
-%else
-Requires(post): update-alternatives
-Requires(postun):update-alternatives
-%endif
 
 %description
 Maven is a software project management and comprehension tool. Based on the
@@ -201,9 +185,11 @@ BuildArch:      noarch
 %setup -q -n apache-%{name}-%{version} -a10
 
 %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
@@ -232,12 +218,9 @@ sed -i "s/distributionId=.*/distributionId=apache-maven/" `find -name build.prop
 sed -i "s/distributionShortName=.*/distributionShortName=Maven/" `find -name build.properties`
 sed -i "s/distributionName=.*/distributionName=Apache\ Maven/" `find -name build.properties`
 
-%{mvn_package} :apache-maven __noinstall
-
-%if %{without logback}
 %pom_remove_dep -r :logback-classic
-%patch2 -p1
-%endif
+
+%{mvn_package} :apache-maven __noinstall
 
 %{mvn_alias} :maven-resolver-provider :maven-aether-provider
 
@@ -303,7 +286,7 @@ for i in \
 done
 
 %install
-%{mvn_install}
+%mvn_install
 %fdupes %{buildroot}%{_javadocdir}
 
 install -d -m 755 %{buildroot}%{homedir}/boot
@@ -376,49 +359,12 @@ ln -sf %{confdir}/settings.xml %{buildroot}%{homedir}/conf/settings.xml
 mv %{buildroot}%{homedir}/conf/logging %{buildroot}%{confdir}/
 ln -sf %{confdir}/logging %{buildroot}%{homedir}/conf
 
-install -d -m 755 %{buildroot}%{_bindir}/
-install -d -m 755 %{buildroot}%{_mandir}/man1/
-
-%if %{with libalternatives}
-ln -sf %{_bindir}/alts %{buildroot}%{_bindir}/mvn
-mkdir -p %{buildroot}%{_datadir}/libalternatives/mvn
-cat > %{buildroot}%{_datadir}/libalternatives/mvn/%{?maven_alternatives_priority}1.conf <<EOF
-binary=%{homedir}/bin/mvn
-group=mvn, mvnDebug
-EOF
-ln -sf %{_bindir}/alts %{buildroot}%{_bindir}/mvnDebug
-mkdir -p %{buildroot}%{_datadir}/libalternatives/mvnDebug
-cat > %{buildroot}%{_datadir}/libalternatives/mvnDebug/%{?maven_alternatives_priority}1.conf <<EOF
-binary=%{homedir}/bin/mvnDebug
-group=mvn, mvnDebug
-man=mvn.1
-EOF
-mv %{buildroot}%{homedir}/bin/mvn.1.gz %{buildroot}%{_mandir}/man1
-%endif
-
-%if ! %{with libalternatives}
 # Ghosts for alternatives
-touch %{buildroot}%{_bindir}/{mvn,mvnDebug}
-touch %{buildroot}%{_mandir}/man1/{mvn,mvnDebug}.1
-
-%post
-update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alternatives_priority}0 \
---slave %{_bindir}/mvnDebug mvnDebug %{homedir}/bin/mvnDebug \
---slave %{_mandir}/man1/mvn.1.gz mvn1 %{homedir}/bin/mvn.1.gz \
---slave %{_mandir}/man1/mvnDebug.1.gz mvnDebug1 %{homedir}/bin/mvn.1.gz \
-
-%postun
-if [ $1 -eq 0 ]; then
-  update-alternatives --remove mvn %{homedir}/bin/mvn
-fi
-%else
-
-%pre
-# removing old update-alternatives entries
-if [ "$1" > 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then
-  update-alternatives --remove mvn %{homedir}/bin/mvn
-fi
-%endif
+install -d -m 0755 %{buildroot}%{_bindir}
+ln -sf %{homedir}/bin/mvn %{buildroot}%{_bindir}/mvn
+ln -sf %{homedir}/bin/mvnDebug %{buildroot}%{_bindir}/mvnDebug
+install -d -m 755 %{buildroot}%{_mandir}/man1/
+ln -sf %{homedir}/bin/mvn.1.gz %{buildroot}%{_mandir}/man1/mvn.1.gz
 
 %files lib -f .mfiles
 %doc README.md
@@ -431,22 +377,10 @@ fi
 %config(noreplace) %{confdir}/logging/simplelogger.properties
 
 %files
-%{_datadir}/bash-completion
-%if ! 0%{with libalternatives}
-%ghost %{_bindir}/mvn
-%ghost %{_bindir}/mvnDebug
-%ghost %{_mandir}/man1/mvn.1.gz
-%ghost %{_mandir}/man1/mvnDebug.1.gz
-%else
-%dir %{_datadir}/libalternatives
-%dir %{_datadir}/libalternatives/mvn
-%dir %{_datadir}/libalternatives/mvnDebug
-%{_datadir}/libalternatives/mvn/%{?maven_alternatives_priority}1.conf
-%{_datadir}/libalternatives/mvnDebug/%{?maven_alternatives_priority}1.conf
 %{_bindir}/mvn
 %{_bindir}/mvnDebug
-%{_mandir}/man1/mvn.1%{?ext_man}
-%endif
+%{_datadir}/bash-completion
+%{_mandir}/man1/mvn.1.gz
 
 %files javadoc -f .mfiles-javadoc
 %license LICENSE NOTICE
diff --git a/qdox-2.0.1.patch b/qdox-2.0.1.patch
index 21bdaa7..0fc88a3 100644
--- a/qdox-2.0.1.patch
+++ b/qdox-2.0.1.patch
@@ -1,120 +1,120 @@
 --- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java	2022-01-13 07:07:32.298798428 +0100
 +++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java	2022-01-13 07:08:06.182993103 +0100
 @@ -157,7 +157,7 @@
-         cache.clear();
-     }
- 
--    public void register( MavenProject project, Key key, CacheRecord record )
-+    public void register( MavenProject project, Key key, CacheRecord record_ )
-     {
-         // default cache does not track extension usage
-     }
+         cache.clear();
+     }
+ 
+-    public void register( MavenProject project, Key key, CacheRecord record )
++    public void register( MavenProject project, Key key, CacheRecord record_ )
+     {
+         // default cache does not track extension usage
+     }
 --- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java	2022-01-13 07:07:32.298798428 +0100
 +++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java	2022-01-13 07:10:30.471820999 +0100
 @@ -198,7 +198,7 @@
-         return CacheUtils.pluginEquals( a, b );
-     }
- 
--    public void register( MavenProject project, Key cacheKey, CacheRecord record )
-+    public void register( MavenProject project, Key cacheKey, CacheRecord record_ )
-     {
-         // default cache does not track record usage
-     }
+         return CacheUtils.pluginEquals( a, b );
+     }
+ 
+-    public void register( MavenProject project, Key cacheKey, CacheRecord record )
++    public void register( MavenProject project, Key cacheKey, CacheRecord record_ )
+     {
+         // default cache does not track record usage
+     }
 --- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java	2022-01-13 07:07:32.298798428 +0100
 +++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java	2022-01-13 07:10:02.863663262 +0100
 @@ -200,7 +200,7 @@
-         return CacheUtils.pluginEquals( a, b );
-     }
- 
--    public void register( MavenProject project, Key key, CacheRecord record )
-+    public void register( MavenProject project, Key key, CacheRecord record_ )
-     {
-         // default cache does not track plugin usage
-     }
+         return CacheUtils.pluginEquals( a, b );
+     }
+ 
+-    public void register( MavenProject project, Key key, CacheRecord record )
++    public void register( MavenProject project, Key key, CacheRecord record_ )
+     {
+         // default cache does not track plugin usage
+     }
 --- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java	2022-01-13 07:07:32.298798428 +0100
 +++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java	2022-01-13 07:11:56.088310105 +0100
 @@ -94,8 +94,8 @@
-      * cache.
-      *
-      * @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}.
-      */
--    void register( MavenProject project, Key key, CacheRecord record );
-+    void register( MavenProject project, Key key, CacheRecord record_ );
- 
- }
+      * cache.
+      *
+      * @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}.
+      */
+-    void register( MavenProject project, Key key, CacheRecord record );
++    void register( MavenProject project, Key key, CacheRecord record_ );
+ 
+ }
 --- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java	2022-01-13 07:07:32.298798428 +0100
 +++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java	2022-01-13 08:09:14.744957009 +0100
 @@ -97,8 +97,8 @@
-      * cache.
-      *
-      * @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}.
-      */
--    void register( MavenProject project, Key cacheKey, CacheRecord record );
-+    void register( MavenProject project, Key cacheKey, CacheRecord record_ );
- 
- }
+      * cache.
+      *
+      * @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}.
+      */
+-    void register( MavenProject project, Key cacheKey, CacheRecord record );
++    void register( MavenProject project, Key cacheKey, CacheRecord record_ );
+ 
+ }
 --- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java	2022-01-13 07:07:32.298798428 +0100
 +++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java	2022-01-13 07:36:03.136896661 +0100
 @@ -90,8 +90,8 @@
-      * cache.
-      *
-      * @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}.
-      */
--    void register( MavenProject project, Key key, CacheRecord record );
-+    void register( MavenProject project, Key key, CacheRecord record_ );
- 
- }
+      * cache.
+      *
+      * @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}.
+      */
+-    void register( MavenProject project, Key key, CacheRecord record );
++    void register( MavenProject project, Key key, CacheRecord record_ );
+ 
+ }
 --- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java	2022-01-13 07:07:32.298798428 +0100
 +++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java	2022-01-13 07:12:29.108498755 +0100
 @@ -240,7 +240,7 @@
-     }
- 
-     @Override
--    public void register( MavenProject project, Key cacheKey, CacheRecord record )
-+    public void register( MavenProject project, Key cacheKey, CacheRecord record_ )
-     {
-         // default cache does not track record usage
-     }
+     }
+ 
+     @Override
+-    public void register( MavenProject project, Key cacheKey, CacheRecord record )
++    public void register( MavenProject project, Key cacheKey, CacheRecord record_ )
+     {
+         // default cache does not track record usage
+     }
 --- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java	2022-01-13 07:07:32.302798450 +0100
 +++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java	2022-01-13 07:12:55.192647787 +0100
 @@ -96,8 +96,8 @@
-      * cache.
-      *
-      * @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}.
-      */
--    void register( MavenProject project, Key cacheKey, CacheRecord record );
-+    void register( MavenProject project, Key cacheKey, CacheRecord record_ );
- 
- }
+      * cache.
+      *
+      * @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}.
+      */
+-    void register( MavenProject project, Key cacheKey, CacheRecord record );
++    void register( MavenProject project, Key cacheKey, CacheRecord record_ );
+ 
+ }
 --- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java	2022-01-13 07:07:32.298798428 +0100
 +++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java	2022-01-13 07:11:14.312071457 +0100
 @@ -135,7 +135,7 @@
-         cache.clear();
-     }
- 
--    public void register( MavenProject project, Key key, CacheRecord record )
-+    public void register( MavenProject project, Key key, CacheRecord record_ )
-     {
-         // default cache does not track record usage
-     }
+         cache.clear();
+     }
+ 
+-    public void register( MavenProject project, Key key, CacheRecord record )
++    public void register( MavenProject project, Key key, CacheRecord record_ )
+     {
+         // default cache does not track record usage
+     }
 --- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java	2022-01-13 07:07:32.298798428 +0100
 +++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java	2022-01-13 07:11:45.096247306 +0100
 @@ -85,8 +85,8 @@
-      * cache.
-      *
-      * @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}.
-      */
--    void register( MavenProject project, Key key, CacheRecord record );
-+    void register( MavenProject project, Key key, CacheRecord record_ );
- 
- }
+      * cache.
+      *
+      * @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}.
+      */
+-    void register( MavenProject project, Key key, CacheRecord record );
++    void register( MavenProject project, Key key, CacheRecord record_ );
+ 
+ }