From bac5704560ec03fceb399408a438a3cd61cdb9cd Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Jan 05 2022 18:19:57 +0000
Subject: Update to upstream version 3.8.4


---

diff --git a/.gitignore b/.gitignore
index 692b87a..8ee664a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /apache-maven-3.6.1-src.tar.gz
 /apache-maven-3.6.2-src.tar.gz
 /apache-maven-3.6.3-src.tar.gz
+/apache-maven-3.8.4-src.tar.gz
diff --git a/0003-Use-non-shaded-HTTP-wagon.patch b/0003-Use-non-shaded-HTTP-wagon.patch
index d61abb3..16e7de4 100644
--- a/0003-Use-non-shaded-HTTP-wagon.patch
+++ b/0003-Use-non-shaded-HTTP-wagon.patch
@@ -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 47e74b5..b9ae3de 100644
 --- a/apache-maven/pom.xml
 +++ b/apache-maven/pom.xml
 @@ -63,21 +63,6 @@ under the License.
@@ -32,13 +32,13 @@ index 82e12a3..f02a45e 100644
 -        </exclusion>
 -      </exclusions>
      </dependency>
-     <dependency>
-       <!-- this is included in Wagon Http
+     <!--  This is included in Wagon HTTP.
+           We are just making the dependency explicit
 diff --git a/pom.xml b/pom.xml
-index 44e287a..cdef69c 100644
+index c60fe57..f851370 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -328,7 +328,6 @@ under the License.
+@@ -334,7 +334,6 @@ under the License.
          <groupId>org.apache.maven.wagon</groupId>
          <artifactId>wagon-http</artifactId>
          <version>${wagonVersion}</version>
diff --git a/0005-Port-to-maven-resolver-1.7.2.patch b/0005-Port-to-maven-resolver-1.7.2.patch
new file mode 100644
index 0000000..803cd90
--- /dev/null
+++ b/0005-Port-to-maven-resolver-1.7.2.patch
@@ -0,0 +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
+
diff --git a/maven.spec b/maven.spec
index b0e72b3..188afd4 100644
--- a/maven.spec
+++ b/maven.spec
@@ -6,8 +6,8 @@
 
 Name:           maven
 Epoch:          1
-Version:        3.6.3
-Release:        14%{?dist}
+Version:        3.8.4
+Release:        1%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
 # bundled slf4j is MIT
@@ -25,6 +25,7 @@ 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
 
 BuildRequires:  maven-local-openjdk8
 %if %{with bootstrap}
@@ -150,6 +151,7 @@ find -name 'pom.xml' -exec sed -i 's/\r//' {} +
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # not really used during build, but a precaution
 find -name '*.jar' -not -path '*/test/*' -delete
@@ -291,6 +293,9 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
 %config %{_javaconfdir}/maven.conf-openjdk17
 
 %changelog
+* 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#2020478
diff --git a/sources b/sources
index a9853a0..fc78d96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apache-maven-3.6.3-src.tar.gz) = 14eef64ad13c1f689f2ab0d2b2b66c9273bf336e557d81d5c22ddb001c47cf51f03bb1465d6059ce9fdc2e43180ceb0638ce914af1f53af9c2398f5d429f114c
+SHA512 (apache-maven-3.8.4-src.tar.gz) = ea4b5f2b29be45d22e716099d0ef87367c78766aade094e8d7f295fe3b2c98cba2bf0f214d3ed55e2c17d2f74c82352cf9dc83fa47ddc97a8d2b847315500431