diff --git a/mbi/dist/metadata.txt b/mbi/dist/metadata.txt index 7fe97213..6d00d004 100644 --- a/mbi/dist/metadata.txt +++ b/mbi/dist/metadata.txt @@ -1436,23 +1436,22 @@ MOD servlet-api ALIAS org.eclipse.jetty.orbit javax.servlet MOD sisu-inject ART org.eclipse.sisu org.eclipse.sisu.inject - ALIAS org.eclipse.sisu org.eclipse.sisu.inject no_asm + DEP org.ow2.asm asm MOD sisu-maven-plugin ART org.eclipse.sisu sisu-maven-plugin ALIAS org.sonatype.plugins sisu-maven-plugin DEP org.eclipse.sisu org.eclipse.sisu.inject DEP org.slf4j slf4j-nop - DEP org.apache.maven maven-plugin-api DEP org.apache.maven.shared maven-common-artifact-filters DEP org.codehaus.plexus plexus-utils - DEP org.sonatype.plexus plexus-build-api + DEP org.codehaus.plexus plexus-build-api MOD sisu-plexus ART org.eclipse.sisu org.eclipse.sisu.plexus ALIAS org.sonatype.sisu sisu-inject-plexus ALIAS org.codehaus.plexus plexus-container-default DEP org.eclipse.sisu org.eclipse.sisu.inject - DEP org.codehaus.plexus plexus-classworlds DEP org.codehaus.plexus plexus-component-annotations + DEP org.codehaus.plexus plexus-classworlds DEP org.codehaus.plexus plexus-utils MOD slf4j ART org.slf4j slf4j-api diff --git a/patches/sisu/0001-Add-ASM-support-for-Java-24-and-25.patch b/patches/sisu/0001-Add-ASM-support-for-Java-24-and-25.patch deleted file mode 100644 index 38c98a6e..00000000 --- a/patches/sisu/0001-Add-ASM-support-for-Java-24-and-25.patch +++ /dev/null @@ -1,40 +0,0 @@ -From bbc2de433c54c7a8b7114b2315812ad552ecd676 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Tue, 18 Feb 2025 16:29:04 +0100 -Subject: [PATCH] Add ASM support for Java 24 and 25 - -Forwarded: no ---- - .../src/main/java/org/eclipse/sisu/space/asm/ClassReader.java | 2 +- - .../src/main/java/org/eclipse/sisu/space/asm/Opcodes.java | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/space/asm/ClassReader.java b/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/space/asm/ClassReader.java -index 0fd9e81..f885a2a 100644 ---- a/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/space/asm/ClassReader.java -+++ b/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/space/asm/ClassReader.java -@@ -205,7 +205,7 @@ public class ClassReader { - this.b = classFileBuffer; - // Check the class' major_version. This field is after the magic and minor_version fields, which - // use 4 and 2 bytes respectively. -- if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V23) { -+ if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V25) { - throw new IllegalArgumentException( - "Unsupported class file major version " + readShort(classFileOffset + 6)); - } -diff --git a/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/space/asm/Opcodes.java b/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/space/asm/Opcodes.java -index 1a0128f..968ae41 100644 ---- a/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/space/asm/Opcodes.java -+++ b/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/space/asm/Opcodes.java -@@ -299,6 +299,8 @@ public interface Opcodes { - int V21 = 0 << 16 | 65; - int V22 = 0 << 16 | 66; - int V23 = 0 << 16 | 67; -+ int V24 = 0 << 16 | 68; -+ int V25 = 0 << 16 | 69; - - /** - * Version flag indicating that the class is using 'preview' features. --- -2.48.1 - diff --git a/project/mbi.xml b/project/mbi.xml index 5a59dc32..a20de0e5 100644 --- a/project/mbi.xml +++ b/project/mbi.xml @@ -88,6 +88,7 @@ velocity-engine commons-lang commons-io + asm src diff --git a/project/sisu.properties b/project/sisu.properties index 390b7a50..1110d3d8 100644 --- a/project/sisu.properties +++ b/project/sisu.properties @@ -1,3 +1,3 @@ url=https://github.com/eclipse-sisu/sisu-project.git -ref=milestones/@.@.@.@@ -version=0.9.0~M3 +ref=releases/@.@.@ +version=1.0.0 diff --git a/project/sisu.xml b/project/sisu.xml index f85b820b..18b7f7bb 100644 --- a/project/sisu.xml +++ b/project/sisu.xml @@ -16,6 +16,7 @@ common-annotations-api servlet-api cdi + asm src/main/java @@ -52,7 +53,7 @@ maven-artifact maven-model maven-common-artifact-filters - plexus-build-api0 + plexus-build-api src/main/java