Expand and update CI for Maven 3.2.5 and newer

apache · Dec 25, 2023 · d78b8da · d78b8da
1 parent 32c6b6a
commit d78b8da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-asfMavenTlpPlgnBuild(jdk:['8','11','14'], maven:['3.3.x', '3.5.x', '3.8.x'])
+asfMavenTlpPlgnBuild(jdk:['8','11','17'], maven:['3.2.x', '3.5.x', '3.6.x', '3.8.x', '3.9.x'])
diff --git a/pom.xml b/pom.xml
@@ -194,6 +194,7 @@ under the License.
 
   <properties>
     <mavenVersion>3.2.5</mavenVersion>
+    <minimalMavenBuildVersion>${mavenVersion}</minimalMavenBuildVersion>
     <javaVersion>8</javaVersion>
     <!-- for dependencies -->
     <jettyVersion>9.4.53.v20231009</jettyVersion>
@@ -602,12 +603,10 @@ under the License.
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>mrm-maven-plugin</artifactId>
-            <version>1.6.0</version>
+            <!-- Do not upgrade since 1.6.0 requires Maven 3.6.3+ to run -->
+            <version>1.5.0</version>
             <configuration>
               <repositories>
-                <mockRepo>
-                  <source>src/it/mrm/repository</source>
-                </mockRepo>
                 <proxyRepo />
               </repositories>
             </configuration>