You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2025/05/20 13:00:08 UTC
(maven) branch master updated: [MNG-8728] Update Eclipse Sisu to 0.9.0.M4 (#2358)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 96efadee47 [MNG-8728] Update Eclipse Sisu to 0.9.0.M4 (#2358)
96efadee47 is described below
commit 96efadee470ff1d39f51848e3d23f338f67b17d6
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Tue May 20 15:00:02 2025 +0200
[MNG-8728] Update Eclipse Sisu to 0.9.0.M4 (#2358)
This now makes possible to add Java 24 to CI as well.
The PR not only updates to Sisu 0.9.0.M4, but also
aligns the `sisu-maven-plugin` version and plugin
ASM with the Maven ASM dependency.
---
https://issues.apache.org/jira/browse/MNG-8728
---
.github/workflows/maven.yml | 4 ++--
apache-maven/pom.xml | 1 -
pom.xml | 20 +++++++++++++-------
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 75f0a243b2..0915790993 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -84,7 +84,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
- java: ['17', '21']
+ java: ['17', '21', '24']
steps:
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
@@ -179,7 +179,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
- java: ['17', '21']
+ java: ['17', '21', '24']
steps:
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index d0acee6246..c072e27e67 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -128,7 +128,6 @@ under the License.
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject</artifactId>
- <classifier>no_asm</classifier>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
diff --git a/pom.xml b/pom.xml
index 59cfb17eed..b59ee883bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,7 +164,7 @@ under the License.
<plexusXmlVersion>4.1.0</plexusXmlVersion>
<resolverVersion>2.0.9</resolverVersion>
<securityDispatcherVersion>4.1.0</securityDispatcherVersion>
- <sisuVersion>0.9.0.M3</sisuVersion>
+ <sisuVersion>0.9.0.M4</sisuVersion>
<slf4jVersion>2.0.17</slf4jVersion>
<stax2ApiVersion>4.2.2</stax2ApiVersion>
<wagonVersion>3.5.3</wagonVersion>
@@ -411,12 +411,6 @@ under the License.
<artifactId>org.eclipse.sisu.inject</artifactId>
<version>${sisuVersion}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.sisu</groupId>
- <artifactId>org.eclipse.sisu.inject</artifactId>
- <version>${sisuVersion}</version>
- <classifier>no_asm</classifier>
- </dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
@@ -807,6 +801,18 @@ under the License.</licenseText>
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>sisu-maven-plugin</artifactId>
+ <version>${sisuVersion}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asmVersion}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>