Skip to content

Commit e0d980f

Browse files
authored
Upgrade dependency to Maven 4.0.0-rc-2. (#276)
Remove version properties for dependencies that are not used. Revert "Temporarily disable the MCOMPILER-346 integration test."
1 parent f259d76 commit e0d980f

File tree

3 files changed

+8
-19
lines changed

3 files changed

+8
-19
lines changed

.github/workflows/maven-verify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
2828
with:
2929
# maven-args: "-Dinvoker.parallelThreads=2" cannot do this as this generate some concurrent download issues
30-
ff-maven: "4.0.0-beta-5" # Maven version for fail-fast-build
30+
ff-maven: "4.0.0-rc-2" # Maven version for fail-fast-build
3131
jdk-distribution-matrix: '[ "temurin", "zulu", "microsoft", "adopt-openj9" ]'
3232
jdk-matrix: '[ "17", "21" ]'
33-
maven-matrix: '[ "4.0.0-beta-5" ]' # Maven versions matrix for verify builds
33+
maven-matrix: '[ "4.0.0-rc-2" ]' # Maven versions matrix for verify builds

pom.xml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ under the License.
6262
<scm>
6363
<connection>scm:git:https://github.com/apache/maven-compiler-plugin.git</connection>
6464
<developerConnection>scm:git:https://github.com/apache/maven-compiler-plugin.git</developerConnection>
65-
<tag>maven-compiler-plugin-3.10.0</tag>
65+
<tag>HEAD</tag>
6666
<url>https://github.com/apache/maven-compiler-plugin/tree/${project.scm.tag}</url>
6767
</scm>
6868
<issueManagement>
@@ -82,22 +82,14 @@ under the License.
8282

8383
<properties>
8484
<javaVersion>17</javaVersion>
85-
<mavenVersion>4.0.0-beta-5</mavenVersion>
85+
<mavenVersion>4.0.0-rc-2</mavenVersion>
8686

8787
<asmVersion>9.7.1</asmVersion>
88-
<groovyVersion>2.4.21</groovyVersion>
89-
<groovyEclipseCompilerVersion>3.7.0</groovyEclipseCompilerVersion>
90-
<groovy-eclipse-batch>2.5.14-02</groovy-eclipse-batch>
9188
<guiceVersion>6.0.0</guiceVersion>
92-
<junit4Version>4.13.2</junit4Version>
93-
<junitVersion>5.10.1</junitVersion>
94-
<mockitoVersion>5.12.0</mockitoVersion>
95-
<mavenPluginTestingHarnessVersion>4.0.0-beta-2</mavenPluginTestingHarnessVersion>
89+
<mockitoVersion>5.14.2</mockitoVersion>
90+
<mavenPluginTestingHarnessVersion>4.0.0-beta-3</mavenPluginTestingHarnessVersion>
9691
<plexusCompilerVersion>2.15.0</plexusCompilerVersion>
97-
<plexusJavaVersion>1.2.0</plexusJavaVersion>
9892
<sisuPlexusVersion>0.9.0.M2</sisuPlexusVersion>
99-
<surefire.version>3.2.1</surefire.version>
100-
<version.maven-invoker-plugin>3.7.0</version.maven-invoker-plugin>
10193
<version.maven-plugin-tools-3.x>3.13.1</version.maven-plugin-tools-3.x>
10294
<version.maven-plugin-tools>4.0.0-beta-1</version.maven-plugin-tools>
10395

@@ -129,13 +121,13 @@ under the License.
129121
</dependency>
130122
<dependency>
131123
<groupId>org.apache.maven</groupId>
132-
<artifactId>maven-api-impl</artifactId>
124+
<artifactId>maven-impl</artifactId>
133125
<version>${mavenVersion}</version>
134126
<scope>test</scope>
135127
</dependency>
136128
<dependency>
137129
<groupId>org.apache.maven</groupId>
138-
<artifactId>maven-xml-impl</artifactId>
130+
<artifactId>maven-xml</artifactId>
139131
<version>${mavenVersion}</version>
140132
<scope>test</scope>
141133
</dependency>

src/it/MCOMPILER-346/verify.groovy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,9 @@
1717
* under the License.
1818
*/
1919

20-
/*
21-
* Temporarily disabled, pending fix in Maven 4.0.0-beta-6.
2220
def logFile = new File( basedir, 'build.log' )
2321
assert logFile.exists()
2422
content = logFile.text
2523

2624
assert content.contains( 'package org.jenkinsci.test.acceptance.controller does not exist' )
2725
assert content.contains( 'package org.jenkinsci.test.acceptance.log does not exist' )
28-
*/

0 commit comments

Comments
 (0)