Skip to content

Commit

Permalink
Upgrade Maven core versions used in for GHA and in pom
Browse files Browse the repository at this point in the history
Signed-off-by: Olivier Lamy <[email protected]>
  • Loading branch information
olamy committed Nov 19, 2023
1 parent 2607538 commit 414f02b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven-verify-3.9.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
with:
maven-args: '-D"maven.test.redirectTestOutputToFile=false -Pmaven3"'
maven-matrix: '[ "3.9.1", "4.0.0-alpha-5" ]'
maven-matrix: '[ "3.9.5", "4.0.0-alpha-8" ]'
matrix-exclude: >
[
{"jdk": "8"}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
with:
maven-args: '-D"maven.test.redirectTestOutputToFile=false"'
maven-matrix: '[ "3.9.1", "4.0.0-alpha-5" ]'
maven-matrix: '[ "3.9.5", "4.0.0-alpha-8" ]'
matrix-exclude: >
[
{"jdk": "8"}
Expand Down
10 changes: 8 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ under the License.
<classWorldsVersion>2.6.0</classWorldsVersion>

<!-- default maven version, will be overridden by maven3 profile -->
<mavenVersion>4.0.0-alpha-5</mavenVersion>
<mavenVersion>4.0.0-alpha-8</mavenVersion>
<maven.dir>maven4</maven.dir>
<maven.basedir>${project.build.directory}/${maven.dir}</maven.basedir>

Expand Down Expand Up @@ -114,6 +114,12 @@ under the License.
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-http</artifactId>
Expand Down Expand Up @@ -450,7 +456,7 @@ under the License.
<profile>
<id>maven3</id>
<properties>
<mavenVersion>3.9.1</mavenVersion>
<mavenVersion>3.9.5</mavenVersion>
<maven.dir>maven3</maven.dir>
<maven.basedir>${project.build.directory}/${maven.dir}</maven.basedir>
</properties>
Expand Down

0 comments on commit 414f02b

Please sign in to comment.