Skip to content

Commit d78b8da

Browse files
committed
Expand and update CI for Maven 3.2.5 and newer
1 parent 32c6b6a commit d78b8da

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
* under the License.
1818
*/
1919

20-
asfMavenTlpPlgnBuild(jdk:['8','11','14'], maven:['3.3.x', '3.5.x', '3.8.x'])
20+
asfMavenTlpPlgnBuild(jdk:['8','11','17'], maven:['3.2.x', '3.5.x', '3.6.x', '3.8.x', '3.9.x'])

pom.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ under the License.
194194

195195
<properties>
196196
<mavenVersion>3.2.5</mavenVersion>
197+
<minimalMavenBuildVersion>${mavenVersion}</minimalMavenBuildVersion>
197198
<javaVersion>8</javaVersion>
198199
<!-- for dependencies -->
199200
<jettyVersion>9.4.53.v20231009</jettyVersion>
@@ -602,12 +603,10 @@ under the License.
602603
<plugin>
603604
<groupId>org.codehaus.mojo</groupId>
604605
<artifactId>mrm-maven-plugin</artifactId>
605-
<version>1.6.0</version>
606+
<!-- Do not upgrade since 1.6.0 requires Maven 3.6.3+ to run -->
607+
<version>1.5.0</version>
606608
<configuration>
607609
<repositories>
608-
<mockRepo>
609-
<source>src/it/mrm/repository</source>
610-
</mockRepo>
611610
<proxyRepo />
612611
</repositories>
613612
</configuration>

0 commit comments

Comments
 (0)