From 52e49fe46379b081c4741970d322131391621240 Mon Sep 17 00:00:00 2001
From: Dirk Mahler <dirk.mahler@buschmais.com>
Date: Thu, 8 Aug 2024 14:31:11 +0200
Subject: [PATCH] #580 raise minimum maven compatibility requirement to 363
 (#581)

---
 cli/application/pom.xml                       |  9 ++-----
 maven/pom.xml                                 | 14 +++++++----
 .../jqassistant/scm/maven/AbstractMojo.java   |  4 ++--
 plugin/maven/pom.xml                          | 24 +++++++++----------
 .../MavenProjectScannerPluginTest.java        |  2 ++
 pom.xml                                       |  6 ++---
 6 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/cli/application/pom.xml b/cli/application/pom.xml
index f5a88617c6..e7354821bd 100644
--- a/cli/application/pom.xml
+++ b/cli/application/pom.xml
@@ -11,11 +11,6 @@
 
     <name>jQAssistant Commandline Application</name>
 
-    <properties>
-        <maven-resolver-provider.version>3.5.0</maven-resolver-provider.version>
-        <maven-settings-builder.version>3.5.0</maven-settings-builder.version>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
@@ -49,7 +44,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-settings-builder</artifactId>
-            <version>${maven-settings-builder.version}</version>
+            <version>${maven.version}</version>
         </dependency>
         <!-- Maven Resolver -->
         <dependency>
@@ -71,7 +66,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-resolver-provider</artifactId>
-            <version>${maven-resolver-provider.version}</version>
+            <version>${maven.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.maven.resolver</groupId>
diff --git a/maven/pom.xml b/maven/pom.xml
index c5950f1579..91f95d7bcc 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -18,7 +18,6 @@
     </description>
 
     <properties>
-        <org.apache.maven.version>3.5.0</org.apache.maven.version>
         <org.apache.maven_project_version>2.2.1</org.apache.maven_project_version>
         <org.apache.maven.reporting_version>3.2.0</org.apache.maven.reporting_version>
 
@@ -185,7 +184,8 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>${org.apache.maven.version}</version>
+            <version>${maven.version}</version>
+            <scope>provided</scope>
             <exclusions>
                 <exclusion>
                     <!-- Contains outdated Google Guice/Guava APIs -->
@@ -194,6 +194,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+            <version>${maven.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
@@ -201,7 +207,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>${org.apache.maven.version}</version>
+            <version>${maven.version}</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -213,7 +219,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
-            <version>${org.apache.maven.version}</version>
+            <version>${maven.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/maven/src/main/java/com/buschmais/jqassistant/scm/maven/AbstractMojo.java b/maven/src/main/java/com/buschmais/jqassistant/scm/maven/AbstractMojo.java
index c81a0cdb11..8634b5abe9 100644
--- a/maven/src/main/java/com/buschmais/jqassistant/scm/maven/AbstractMojo.java
+++ b/maven/src/main/java/com/buschmais/jqassistant/scm/maven/AbstractMojo.java
@@ -106,8 +106,8 @@ private static String createExecutionKey(MojoExecution mojoExecution) {
 
     @Override
     public final void execute() throws MojoExecutionException, MojoFailureException {
-        if (!runtimeInformation.isMavenVersion("[3.5,)")) {
-            throw new MojoExecutionException("jQAssistant requires Maven 3.5.x or above.");
+        if (!runtimeInformation.isMavenVersion("[3.6.3,)")) {
+            throw new MojoExecutionException("jQAssistant requires Maven 3.6.3 or above.");
         }
         // Synchronize on this class as multiple instances of the plugin may exist in parallel builds
         synchronized (AbstractMojo.class) {
diff --git a/plugin/maven/pom.xml b/plugin/maven/pom.xml
index 615845f96d..b4501c75bf 100644
--- a/plugin/maven/pom.xml
+++ b/plugin/maven/pom.xml
@@ -17,8 +17,7 @@
     </description>
 
     <properties>
-        <org.apache.maven.version>3.5.0</org.apache.maven.version>
-        <org.apache.maven_dependency-tree.version>3.1.0</org.apache.maven_dependency-tree.version>
+        <org.apache.maven_dependency-tree.version>3.3.0</org.apache.maven_dependency-tree.version>
     </properties>
 
     <build>
@@ -85,17 +84,6 @@
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-core</artifactId>
-            <version>${org.apache.maven.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>${org.apache.maven.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-dependency-tree</artifactId>
@@ -107,6 +95,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>${maven.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-api</artifactId>
+            <version>${maven.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-common-artifact-filters</artifactId>
diff --git a/plugin/maven/src/test/java/com/buschmais/jqassistant/plugin/maven3/impl/scanner/MavenProjectScannerPluginTest.java b/plugin/maven/src/test/java/com/buschmais/jqassistant/plugin/maven3/impl/scanner/MavenProjectScannerPluginTest.java
index 6ecb6a5e06..0d98beb403 100644
--- a/plugin/maven/src/test/java/com/buschmais/jqassistant/plugin/maven3/impl/scanner/MavenProjectScannerPluginTest.java
+++ b/plugin/maven/src/test/java/com/buschmais/jqassistant/plugin/maven3/impl/scanner/MavenProjectScannerPluginTest.java
@@ -228,6 +228,8 @@ private void scanAndVerify(Map<String, Object> properties, boolean expectedDepen
             .getLocalRepository();
         doReturn(localRepository).when(mavenSession)
             .getLocalRepository();
+        doReturn(ProjectBuildingRequest.RepositoryMerging.POM_DOMINANT).when(projectBuildingRequest)
+            .getRepositoryMerging();
 
         doReturn(mavenSession).when(scannerContext)
             .peek(MavenSession.class);
diff --git a/pom.xml b/pom.xml
index 9e875fc9f3..a917f1ccff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
     </scm>
 
     <prerequisites>
-        <maven>3.6</maven>
+        <maven>${maven.version}</maven>
     </prerequisites>
 
     <distributionManagement>
@@ -96,6 +96,7 @@
         <junit-pioneer.version>2.2.0</junit-pioneer.version>
         <lombok.version>1.18.34</lombok.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
+        <maven.version>3.6.3</maven.version>
         <mockito.version>5.12.0</mockito.version>
         <neo4j_4x.version>4.4.36</neo4j_4x.version>
         <neo4j_4x_apoc.version>4.4.0.29</neo4j_4x_apoc.version>
@@ -145,7 +146,6 @@
         <nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
         <maven.sonar.version>4.0.0.4121</maven.sonar.version>
         <!-- Maven config -->
-        <maven.min.version>3.5.0</maven.min.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <!-- integration tests -->
@@ -511,7 +511,7 @@
                             <configuration>
                                 <rules>
                                     <requireMavenVersion>
-                                        <version>[${maven.min.version},)</version>
+                                        <version>[${maven.version},)</version>
                                     </requireMavenVersion>
                                     <requireSameVersions>
                                         <plugins>