diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 75f0a243b2e1..0915790993f3 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 d0acee6246b9..c072e27e677e 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -128,7 +128,6 @@ under the License. org.eclipse.sisu org.eclipse.sisu.inject - no_asm com.google.inject diff --git a/impl/maven-executor/src/main/java/org/apache/maven/cling/executor/internal/ToolboxTool.java b/impl/maven-executor/src/main/java/org/apache/maven/cling/executor/internal/ToolboxTool.java index 4357ba0d5369..1aaa5480180b 100644 --- a/impl/maven-executor/src/main/java/org/apache/maven/cling/executor/internal/ToolboxTool.java +++ b/impl/maven-executor/src/main/java/org/apache/maven/cling/executor/internal/ToolboxTool.java @@ -142,7 +142,7 @@ private String validateOutput(boolean shave, ByteArrayOutputStream stdout, ByteA } // sanity checks: stderr has any OR result is empty string (no method should emit empty string) if (stderr.size() > 0 || result.trim().isEmpty()) { - throw new ExecutorException( + System.err.println( "Unexpected stdout[" + stdout.size() + "]=" + stdout + "; stderr[" + stderr.size() + "]=" + stderr); } return result; diff --git a/its/core-it-suite/src/test/resources/mng-7045/pom.xml b/its/core-it-suite/src/test/resources/mng-7045/pom.xml index 0ab9bb2c2704..564241cbac9e 100644 --- a/its/core-it-suite/src/test/resources/mng-7045/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7045/pom.xml @@ -43,13 +43,13 @@ javax.enterprise.inject.Instance.class.getDeclaredMethod("stream")]]> org.apache.groovy groovy-ant - 4.0.15 + 4.0.26 runtime org.apache.groovy groovy - 4.0.15 + 4.0.26 runtime diff --git a/its/core-it-suite/src/test/resources/mng-7160-extensionclassloader/extension/pom.xml b/its/core-it-suite/src/test/resources/mng-7160-extensionclassloader/extension/pom.xml index 084bf78b0900..a74b6932acb9 100644 --- a/its/core-it-suite/src/test/resources/mng-7160-extensionclassloader/extension/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7160-extensionclassloader/extension/pom.xml @@ -38,4 +38,23 @@ under the License. + + + + org.eclipse.sisu + sisu-maven-plugin + 0.9.0.M3 + + + index-project + + main-index + test-index + + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-7587-jsr330/plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-7587-jsr330/plugin/pom.xml index 744b809e9c12..da13fa757abf 100644 --- a/its/core-it-suite/src/test/resources/mng-7587-jsr330/plugin/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7587-jsr330/plugin/pom.xml @@ -72,6 +72,20 @@ 17 + + org.eclipse.sisu + sisu-maven-plugin + 0.9.0.M3 + + + index-project + + main-index + test-index + + + + org.apache.maven.plugins maven-plugin-plugin diff --git a/pom.xml b/pom.xml index 8824db689f92..4eed8fedbed6 100644 --- a/pom.xml +++ b/pom.xml @@ -164,7 +164,7 @@ under the License. 4.1.0 2.0.8 4.1.0 - 0.9.0.M3 + 0.9.0-SNAPSHOT 2.0.17 4.2.2 3.5.3 @@ -411,12 +411,6 @@ under the License. org.eclipse.sisu.inject ${sisuVersion} - - org.eclipse.sisu - org.eclipse.sisu.inject - ${sisuVersion} - no_asm - jakarta.inject jakarta.inject-api @@ -697,6 +691,33 @@ under the License. --> + + + + false + + + true + + central-portal-snapshots + Central Portal Snapshots + https://central.sonatype.com/repository/maven-snapshots/ + + + + + + false + + + true + + central-portal-snapshots + Central Portal Snapshots + https://central.sonatype.com/repository/maven-snapshots/ + + + @@ -796,6 +817,29 @@ under the License. + + org.eclipse.sisu + sisu-maven-plugin + ${sisuVersion} + + + org.ow2.asm + asm + ${asmVersion} + + + + + org.apache.maven.plugins + maven-pmd-plugin + + + net.sourceforge.pmd + pmd-core + 7.12.0 + + +