From ae46e658cea85c48ef7ed3758dc9bf81b45dd833 Mon Sep 17 00:00:00 2001
From: Falko Modler <famod@users.noreply.github.com>
Date: Wed, 14 Apr 2021 22:21:39 +0200
Subject: [PATCH] Update to Maven 3.8.1

---
 .mvn/wrapper/MavenWrapperDownloader.java       |  2 +-
 .mvn/wrapper/maven-wrapper.properties          |  2 +-
 bom/application/pom.xml                        |  4 ++--
 build-parent/pom.xml                           |  4 ++--
 independent-projects/arc/pom.xml               |  2 +-
 independent-projects/bootstrap/pom.xml         | 12 +++++++++---
 independent-projects/enforcer-rules/pom.xml    |  2 +-
 independent-projects/resteasy-reactive/pom.xml |  2 +-
 independent-projects/tools/pom.xml             |  4 ++--
 mvnw                                           |  2 +-
 mvnw.cmd                                       |  2 +-
 pom.xml                                        |  2 +-
 12 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
index e76d1f3241d38..b901097f2db6e 100644
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 642d572ce90e5..ffdc10e59f878 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 05cc61ea7ad27..b548beb59c47b 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -78,8 +78,8 @@
         <asm.version>9.1</asm.version>
         <commons-io.version>2.8.0</commons-io.version>
         <jboss-metadata-web.version>11.0.0.Final</jboss-metadata-web.version>
-        <maven-core.version>3.6.3</maven-core.version>
-        <maven-resolver.version>1.4.1</maven-resolver.version>
+        <maven-core.version>3.8.1</maven-core.version>
+        <maven-resolver.version>1.6.2</maven-resolver.version>
         <maven-toolchain.version>3.0-alpha-2</maven-toolchain.version>
         <guava.version>30.1.1-jre</guava.version>
         <plexus-utils.version>3.2.1</plexus-utils.version>
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index dd178b9c0a438..3cab456468ace 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -55,7 +55,7 @@
         <supported-maven-versions>[3.6.2,)</supported-maven-versions>
 
         <!-- These 2 properties are used by CreateProjectMojo to add the Maven Wrapper -->
-        <proposed-maven-version>3.6.3</proposed-maven-version>
+        <proposed-maven-version>3.8.1</proposed-maven-version>
         <maven-wrapper.version>0.7.7</maven-wrapper.version>
         <gradle-wrapper.version>6.8.3</gradle-wrapper.version>
 
@@ -83,7 +83,7 @@
         <!-- Align various dependencies that are not really part of the bom-->
         <findbugs.version>3.0.2</findbugs.version>
         <jsoup.version>1.11.3</jsoup.version>
-        <wagon-provider-api.version>3.3.3</wagon-provider-api.version>
+        <wagon-provider-api.version>3.4.3</wagon-provider-api.version>
 
         <!-- The image to use for tests that run Keycloak -->
         <!-- IMPORTANT: If this is changed you must also update bom/application/pom.xml to match the version -->
diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml
index 70bfb846dcd39..48ae62be073ca 100644
--- a/independent-projects/arc/pom.xml
+++ b/independent-projects/arc/pom.xml
@@ -40,7 +40,7 @@
         <version.jta>1.3.3</version.jta>
         <version.jandex>2.2.3.Final</version.jandex>
         <version.junit5>5.7.1</version.junit5>
-        <version.maven>3.6.3</version.maven>
+        <version.maven>3.8.1</version.maven>
         <version.assertj>3.19.0</version.assertj>
         <version.jboss-logging>3.4.1.Final</version.jboss-logging>
         <version.jakarta-annotation>1.3.5</version.jakarta-annotation>
diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml
index d9696a7f141ca..8a449f9474331 100644
--- a/independent-projects/bootstrap/pom.xml
+++ b/independent-projects/bootstrap/pom.xml
@@ -28,11 +28,12 @@
         <eclipse-minimal-json.version>0.9.5</eclipse-minimal-json.version>
         <jboss-logging.version>3.4.1.Final</jboss-logging.version>
         <junit.jupiter.version>5.7.1</junit.jupiter.version>
-        <maven-core.version>3.6.3</maven-core.version><!-- Keep in sync with sisu.version -->
+        <maven-core.version>3.8.1</maven-core.version><!-- Keep in sync with sisu.version -->
         <sisu.version>0.3.4</sisu.version><!-- Keep in sync with maven-core.version -->
         <maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version>
-        <maven-resolver.version>1.4.1</maven-resolver.version>
-        <maven-wagon.version>3.3.4</maven-wagon.version>
+        <maven-resolver.version>1.6.2</maven-resolver.version>
+        <maven-wagon.version>3.4.3</maven-wagon.version>
+        <httpcore.version>4.4.14</httpcore.version><!-- Keep in sync with maven-wagon.version (wagon-http 3.4.3 brings in 4.4.13 and 4.4.14) -->
         <plexus-cypher.version>1.7</plexus-cypher.version>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
@@ -293,6 +294,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>${httpcore.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.sisu</groupId>
                 <artifactId>org.eclipse.sisu.plexus</artifactId>
diff --git a/independent-projects/enforcer-rules/pom.xml b/independent-projects/enforcer-rules/pom.xml
index a4e4ed82c33d9..b07e087a1c2f9 100644
--- a/independent-projects/enforcer-rules/pom.xml
+++ b/independent-projects/enforcer-rules/pom.xml
@@ -28,7 +28,7 @@
 
         <enforcer-api.version>3.0.0-M3</enforcer-api.version>
         <maven-invoker-plugin.version>3.2.1</maven-invoker-plugin.version>
-        <maven-core.version>3.6.3</maven-core.version>
+        <maven-core.version>3.8.1</maven-core.version>
 
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
     </properties>
diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
index 7f2784b957078..8b4f2e842aa9f 100644
--- a/independent-projects/resteasy-reactive/pom.xml
+++ b/independent-projects/resteasy-reactive/pom.xml
@@ -39,7 +39,7 @@
         <version.cdi>2.0.2</version.cdi>
         <version.jandex>2.2.3.Final</version.jandex>
         <version.junit5>5.7.1</version.junit5>
-        <version.maven>3.6.3</version.maven>
+        <version.maven>3.8.1</version.maven>
         <version.assertj>3.19.0</version.assertj>
         <version.jboss-logging>3.4.1.Final</version.jboss-logging>
         <version.jakarta-annotation>1.3.5</version.jakarta-annotation>
diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml
index 13b765299bcd0..7386a71c6addd 100644
--- a/independent-projects/tools/pom.xml
+++ b/independent-projects/tools/pom.xml
@@ -26,7 +26,7 @@
         <maven.compiler.release>11</maven.compiler.release>
 
         <!-- These properties are used by CreateProjectMojo to add the Maven Wrapper -->
-        <proposed-maven-version>3.6.3</proposed-maven-version>
+        <proposed-maven-version>3.8.1</proposed-maven-version>
         <maven-wrapper.version>0.7.7</maven-wrapper.version>
         <gradle-wrapper.version>6.8.3</gradle-wrapper.version>
 
@@ -47,7 +47,7 @@
         <junit.version>5.7.1</junit.version>
         <commons-compress.version>1.20</commons-compress.version>
         <jboss-logging.version>3.4.1.Final</jboss-logging.version>
-        <maven-core.version>3.6.3</maven-core.version>
+        <maven-core.version>3.8.1</maven-core.version>
         <mockito.version>3.9.0</mockito.version>
         <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
diff --git a/mvnw b/mvnw
index a16b5431b4c3c..41c0f0c23db5d 100755
--- a/mvnw
+++ b/mvnw
@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#    https://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
diff --git a/mvnw.cmd b/mvnw.cmd
index c8d43372c986d..86115719e5383 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -7,7 +7,7 @@
 @REM "License"); you may not use this file except in compliance
 @REM with the License.  You may obtain a copy of the License at
 @REM
-@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM    http://www.apache.org/licenses/LICENSE-2.0
 @REM
 @REM Unless required by applicable law or agreed to in writing,
 @REM software distributed under the License is distributed on an
diff --git a/pom.xml b/pom.xml
index ef12af18f87d9..a7de673a2ab14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
         <postgres.url>jdbc:postgresql:hibernate_orm_test</postgres.url>
 
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
-        <gitflow-incremental-builder.version>3.14.0</gitflow-incremental-builder.version>
+        <gitflow-incremental-builder.version>3.14.1</gitflow-incremental-builder.version>
         <quarkus-platform-bom-plugin.version>0.0.10</quarkus-platform-bom-plugin.version>
 
         <skipDocs>false</skipDocs>