Skip to content

Commit

Permalink
Update Maven and parent (#130)
Browse files Browse the repository at this point in the history
Changes:
* Update Maven to 3.9.8
* pdate parent to 15
* mvnw to 3.9.8
* Update CI
* Align resolver in demo with mima
  • Loading branch information
cstamas authored Jun 19, 2024
1 parent 5be236a commit f3bc35f
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ on:
jobs:
build:
name: Verify
uses: maveniverse/parent/.github/workflows/ci.yml@release-14
uses: maveniverse/parent/.github/workflows/ci.yml@release-15
with:
maven-matrix: '[ "3.6.3", "3.8.8", "3.9.7" ]'
maven-matrix: '[ "3.6.3", "3.8.8", "3.9.8" ]'
jdk-matrix: '[ "21", "8" ]'
jdk-distribution-matrix: '[ "zulu" ]'
maven-test: './mvnw -f demo install -e -B -V'
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# under the License.
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
5 changes: 2 additions & 3 deletions demo/library-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
</prerequisites>

<properties>
<version.maven>3.9.6</version.maven>
<version.maven-plugin-plugin>3.12.0</version.maven-plugin-plugin>
<version.maven>3.9.8</version.maven>
</properties>

<dependencies>
Expand All @@ -51,7 +50,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.12.0</version>
<version>3.13.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions demo/library/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
<version>1.9.18</version>
<version>1.9.20</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-spi</artifactId>
<version>1.9.18</version>
<version>1.9.20</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-impl</artifactId>
<version>1.9.18</version>
<version>1.9.20</version>
<scope>provided</scope>
</dependency>
<!-- runtime dependency (dormant outside of Maven) -->
Expand Down
2 changes: 1 addition & 1 deletion demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>eu.maveniverse.maven.parent</groupId>
<artifactId>parent</artifactId>
<version>13</version>
<version>15</version>
<relativePath />
</parent>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>eu.maveniverse.maven.parent</groupId>
<artifactId>parent</artifactId>
<version>14</version>
<version>15</version>
</parent>

<groupId>eu.maveniverse.maven.mima</groupId>
Expand Down Expand Up @@ -67,7 +67,7 @@

<!-- Dependency versions -->
<version.resolver>1.9.20</version.resolver>
<version.maven>3.9.7</version.maven>
<version.maven>3.9.8</version.maven>
<version.mase>7.1.3</version.mase>
<version.sisu>0.9.0.M3</version.sisu>
<version.slf4j>1.7.36</version.slf4j>
Expand Down

0 comments on commit f3bc35f

Please sign in to comment.