From 6950ab960392d34e065430a9ab74a99b78987e1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Dec 2024 16:40:07 +0100 Subject: [PATCH 01/21] Bump org.eclipse.jdt:ecj from 3.38.0 to 3.40.0 (#422) Bumps [org.eclipse.jdt:ecj](https://github.com/eclipse-jdt/eclipse.jdt.core) from 3.38.0 to 3.40.0. - [Commits](https://github.com/eclipse-jdt/eclipse.jdt.core/commits) --- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sylwester Lachiewicz --- .../plexus-compiler-eclipse/pom.xml | 2 +- .../compiler/eclipse/EclipseJavaCompiler.java | 6 +++--- .../EclipseCompilerErrorsAsWarningsTest.java | 18 ++++++++++++------ .../EclipseCompilerFailOnWarningsTest.java | 15 +++++++++++++-- .../compiler/eclipse/EclipseCompilerTest.java | 15 +++++++++++++-- 5 files changed, 42 insertions(+), 14 deletions(-) diff --git a/plexus-compilers/plexus-compiler-eclipse/pom.xml b/plexus-compilers/plexus-compiler-eclipse/pom.xml index e2d1d344..90e32eff 100644 --- a/plexus-compilers/plexus-compiler-eclipse/pom.xml +++ b/plexus-compilers/plexus-compiler-eclipse/pom.xml @@ -25,7 +25,7 @@ org.eclipse.jdt ecj - 3.38.0 + 3.40.0 javax.inject diff --git a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java index f14db674..3c7f4f4c 100644 --- a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java +++ b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java @@ -234,11 +234,11 @@ public CompilerResult performCompile(CompilerConfiguration config) throws Compil getLog().debug("Using JSR-199 EclipseCompiler"); // ECJ JSR-199 compiles against the latest Java version it supports if no source // version is given explicitly. BatchCompiler uses 1.3 as default. So check - // whether a source version is specified, and if not supply 1.3 explicitly. + // whether a source version is specified, and if not supply 8 explicitly. if (!haveSourceOrReleaseArgument(args)) { - getLog().debug("ecj: no source level nor release specified, defaulting to Java 1.3"); + getLog().debug("ecj: no source level nor release specified, defaulting to Java 8"); args.add("-source"); - args.add("1.3"); + args.add("8"); } // Also check for the encoding. Could have been set via the CompilerConfig diff --git a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerErrorsAsWarningsTest.java b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerErrorsAsWarningsTest.java index 91580922..75c5279a 100644 --- a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerErrorsAsWarningsTest.java +++ b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerErrorsAsWarningsTest.java @@ -36,15 +36,21 @@ protected int expectedWarnings() { @Override protected Collection expectedOutputFiles() { + String javaVersion = getJavaVersion(); + if (javaVersion.contains("9.0") + || javaVersion.contains("11") + || javaVersion.contains("17") + || javaVersion.contains("21") + || javaVersion.contains("23")) { + return Arrays.asList( + "org/codehaus/foo/Deprecation.class", + "org/codehaus/foo/ExternalDeps.class", + "org/codehaus/foo/Person.class"); + } return Arrays.asList( "org/codehaus/foo/Deprecation.class", "org/codehaus/foo/ExternalDeps.class", "org/codehaus/foo/Person.class", - "org/codehaus/foo/ReservedWord.class" - // "org/codehaus/foo/Bad.class", // This one has no class file generated as it's one big - // issue - // "org/codehaus/foo/UnknownSymbol.class", - // "org/codehaus/foo/RightClassname.class" - ); + "org/codehaus/foo/ReservedWord.class"); } } diff --git a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerFailOnWarningsTest.java b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerFailOnWarningsTest.java index c5a94b3d..bf87e8e8 100644 --- a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerFailOnWarningsTest.java +++ b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerFailOnWarningsTest.java @@ -19,16 +19,27 @@ protected String getRoleHint() { @Override protected int expectedErrors() { - return 6; + return 5; } @Override protected int expectedWarnings() { - return 1; + return 0; } @Override protected Collection expectedOutputFiles() { + String javaVersion = getJavaVersion(); + if (javaVersion.contains("9.0") + || javaVersion.contains("11") + || javaVersion.contains("17") + || javaVersion.contains("21") + || javaVersion.contains("23")) { + return Arrays.asList( + "org/codehaus/foo/Deprecation.class", + "org/codehaus/foo/ExternalDeps.class", + "org/codehaus/foo/Person.class"); + } return Arrays.asList( "org/codehaus/foo/Deprecation.class", "org/codehaus/foo/ExternalDeps.class", diff --git a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerTest.java b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerTest.java index de72e6b4..042bddb2 100644 --- a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerTest.java +++ b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerTest.java @@ -53,16 +53,27 @@ protected String getRoleHint() { @Override protected int expectedErrors() { - return 4; + return 5; } @Override protected int expectedWarnings() { - return 2; + return 1; } @Override protected Collection expectedOutputFiles() { + String javaVersion = getJavaVersion(); + if (javaVersion.contains("9.0") + || javaVersion.contains("11") + || javaVersion.contains("17") + || javaVersion.contains("21") + || javaVersion.contains("23")) { + return Arrays.asList( + "org/codehaus/foo/Deprecation.class", + "org/codehaus/foo/ExternalDeps.class", + "org/codehaus/foo/Person.class"); + } return Arrays.asList( "org/codehaus/foo/Deprecation.class", "org/codehaus/foo/ExternalDeps.class", From 3fa2999f6f96c84c54480bf1ca1a1a5d47e382b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Feb 2025 21:11:10 +0000 Subject: [PATCH 02/21] Bump org.codehaus.plexus:plexus from 19 to 20 Bumps [org.codehaus.plexus:plexus](https://github.com/codehaus-plexus/plexus-pom) from 19 to 20. - [Release notes](https://github.com/codehaus-plexus/plexus-pom/releases) - [Commits](https://github.com/codehaus-plexus/plexus-pom/commits) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 66d777cf..702b1be7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus - 19 + 20 plexus-compiler From d12c9960e3d048169d2349e09894b407aa061bca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Feb 2025 21:22:21 +0000 Subject: [PATCH 03/21] Bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.13.0 to 3.14.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.13.0...maven-compiler-plugin-3.14.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 702b1be7..eb5ea7a0 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ ${eclipse.sisu.version} false clean install - 3.13.0 + 3.14.0 From 842221859c154adebba224af44bfe3652e5dd99b Mon Sep 17 00:00:00 2001 From: Gerd Aschemann Date: Fri, 14 Mar 2025 14:39:00 +0100 Subject: [PATCH 04/21] Apply spotless re-formatting Detected in the course of support-and-care/maven-support-and-care#77. --- README.md | 4 ++-- .../plexus-compiler-aspectj/src/site/markdown/index.md | 2 +- .../plexus-compiler-csharp/src/site/markdown/index.md | 2 +- .../plexus-compiler-eclipse/src/site/markdown/index.md | 2 +- .../src/site/markdown/index.md | 2 +- .../plexus-compiler-javac/src/site/markdown/index.md | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 653c65cc..8ced823f 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ Plexus-Compiler This component is an Compilation API used by Apache Maven Compiler plugin on the top of different Compiler Engines: Javac, Eclipse Compiler, etc.. -### Error Prone usage +### Error Prone usage -Please refer to [documentation](https://errorprone.info/docs/installation#maven) +Please refer to [documentation](https://errorprone.info/docs/installation#maven) Or the project [it test](plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml) diff --git a/plexus-compilers/plexus-compiler-aspectj/src/site/markdown/index.md b/plexus-compilers/plexus-compiler-aspectj/src/site/markdown/index.md index f3e77352..aae4a0ed 100644 --- a/plexus-compilers/plexus-compiler-aspectj/src/site/markdown/index.md +++ b/plexus-compilers/plexus-compiler-aspectj/src/site/markdown/index.md @@ -3,4 +3,4 @@ Plexus AspectJ Compiler AspectJ Compiler support for Plexus Compiler component. -**Requires** `JDK 17+` and `Maven 3.9.6+` \ No newline at end of file +**Requires** `JDK 17+` and `Maven 3.9.6+` diff --git a/plexus-compilers/plexus-compiler-csharp/src/site/markdown/index.md b/plexus-compilers/plexus-compiler-csharp/src/site/markdown/index.md index c531cbe0..7f05cdef 100644 --- a/plexus-compilers/plexus-compiler-csharp/src/site/markdown/index.md +++ b/plexus-compilers/plexus-compiler-csharp/src/site/markdown/index.md @@ -3,4 +3,4 @@ Plexus C# Compiler C# Compiler support for Plexus Compiler component. -**Requires** `JDK 8+` \ No newline at end of file +**Requires** `JDK 8+` diff --git a/plexus-compilers/plexus-compiler-eclipse/src/site/markdown/index.md b/plexus-compilers/plexus-compiler-eclipse/src/site/markdown/index.md index 50e4ee1c..2d4dc146 100644 --- a/plexus-compilers/plexus-compiler-eclipse/src/site/markdown/index.md +++ b/plexus-compilers/plexus-compiler-eclipse/src/site/markdown/index.md @@ -3,4 +3,4 @@ Plexus Eclipse Compiler Eclipse Compiler support for Plexus Compiler component. -**Requires** `JDK 17+` and `Maven 3.9.6+` \ No newline at end of file +**Requires** `JDK 17+` and `Maven 3.9.6+` diff --git a/plexus-compilers/plexus-compiler-javac-errorprone/src/site/markdown/index.md b/plexus-compilers/plexus-compiler-javac-errorprone/src/site/markdown/index.md index 620884f1..d02bf158 100644 --- a/plexus-compilers/plexus-compiler-javac-errorprone/src/site/markdown/index.md +++ b/plexus-compilers/plexus-compiler-javac-errorprone/src/site/markdown/index.md @@ -6,4 +6,4 @@ with error-prone static analysis checks enabled. See https://errorprone.info -**Requires** `JDK 11+` \ No newline at end of file +**Requires** `JDK 11+` diff --git a/plexus-compilers/plexus-compiler-javac/src/site/markdown/index.md b/plexus-compilers/plexus-compiler-javac/src/site/markdown/index.md index 6d103e3e..cde88620 100644 --- a/plexus-compilers/plexus-compiler-javac/src/site/markdown/index.md +++ b/plexus-compilers/plexus-compiler-javac/src/site/markdown/index.md @@ -3,4 +3,4 @@ Plexus Javac Component Javac Compiler support for Plexus Compiler component. -**Requires** `JDK 8+` \ No newline at end of file +**Requires** `JDK 8+` From 29cb9bb1765008afbeaa7f110ed594cb0157c78a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Mar 2025 21:32:18 +0000 Subject: [PATCH 05/21] Bump com.google.guava:guava from 33.4.0-jre to 33.4.6-jre Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.4.0-jre to 33.4.6-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb5ea7a0..0566eb1a 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ com.google.guava guava - 33.4.0-jre + 33.4.6-jre org.eclipse.sisu From c4a7febfafa533afdd131c9191e96b52431bda00 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sat, 5 Apr 2025 16:26:03 +0200 Subject: [PATCH 06/21] Exclude Microsoft JDK 24 - not available yet --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 018903b5..88376ce6 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -24,7 +24,7 @@ jobs: name: Build it uses: codehaus-plexus/.github/.github/workflows/maven.yml@master with: - matrix-exclude: '[ {"jdk": "8"}, {"jdk": "11"}, {"jdk": "23", distribution: "microsoft" } ]' + matrix-exclude: '[ {"jdk": "8"}, {"jdk": "11"}, {"jdk": "24", distribution: "microsoft" } ]' jdk-distribution-matrix: '["zulu", "temurin", "microsoft", "liberica", "corretto"]' maven_args: 'verify javadoc:javadoc -e -B -V -fae' From 8c28c45740106aa29f2c877cbcda583696589a4f Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sat, 5 Apr 2025 16:51:09 +0200 Subject: [PATCH 07/21] Bump ErrorProne to 2.37.0 - requires Java 17 --- plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml | 2 ++ plexus-compilers/plexus-compiler-javac-errorprone/pom.xml | 2 +- .../plexus-compiler-javac-errorprone/src/site/markdown/index.md | 2 +- pom.xml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml b/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml index 87f7947f..c99b030f 100644 --- a/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml +++ b/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml @@ -53,11 +53,13 @@ 11 11 + 11 UTF-8 true -XDcompilePolicy=simple -Xplugin:ErrorProne + --should-stop=ifError=FLOW -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED diff --git a/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml b/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml index c9119e45..e4d1f97e 100644 --- a/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml +++ b/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml @@ -16,7 +16,7 @@ See https://errorprone.info - 11 + 17 diff --git a/plexus-compilers/plexus-compiler-javac-errorprone/src/site/markdown/index.md b/plexus-compilers/plexus-compiler-javac-errorprone/src/site/markdown/index.md index d02bf158..aa7f2765 100644 --- a/plexus-compilers/plexus-compiler-javac-errorprone/src/site/markdown/index.md +++ b/plexus-compilers/plexus-compiler-javac-errorprone/src/site/markdown/index.md @@ -6,4 +6,4 @@ with error-prone static analysis checks enabled. See https://errorprone.info -**Requires** `JDK 11+` +**Requires** `JDK 17+` diff --git a/pom.xml b/pom.xml index 0566eb1a..68ee7264 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 1.9.21 3.6.3 ${mavenVersion} - 2.31.0 + 2.37.0 0.9.0.M3 ${eclipse.sisu.version} false From 3718178f8f7a1ef7973b0d1095a244fe9d80ed06 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Wed, 25 Dec 2024 21:13:09 +0100 Subject: [PATCH 08/21] Include JDK 24 in CI --- .../error-prone-compiler/invoker.properties | 4 +- .../plexus/compiler/AbstractCompilerTest.java | 1 - .../EclipseCompilerErrorsAsWarningsTest.java | 2 +- .../EclipseCompilerFailOnWarningsTest.java | 2 +- .../compiler/eclipse/EclipseCompilerTest.java | 2 +- .../javac/JavacErrorProneCompilerTest.java | 3 +- .../javac/AbstractJavacCompilerTest.java | 88 +++++++------------ .../javac/JavaxToolsCompilerTest.java | 3 +- 8 files changed, 41 insertions(+), 64 deletions(-) diff --git a/plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties b/plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties index e3646a42..90326243 100644 --- a/plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties +++ b/plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java b/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java index 09ab0b6b..3fab07e6 100644 --- a/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java +++ b/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java @@ -305,7 +305,6 @@ protected File getLocalArtifactPath(String groupId, String artifactId, String ve } protected String getJavaVersion() { - String javaVersion = System.getProperty("java.version"); String realJavaVersion = javaVersion; diff --git a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerErrorsAsWarningsTest.java b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerErrorsAsWarningsTest.java index 75c5279a..1ed824cd 100644 --- a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerErrorsAsWarningsTest.java +++ b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerErrorsAsWarningsTest.java @@ -41,7 +41,7 @@ protected Collection expectedOutputFiles() { || javaVersion.contains("11") || javaVersion.contains("17") || javaVersion.contains("21") - || javaVersion.contains("23")) { + || javaVersion.contains("24")) { return Arrays.asList( "org/codehaus/foo/Deprecation.class", "org/codehaus/foo/ExternalDeps.class", diff --git a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerFailOnWarningsTest.java b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerFailOnWarningsTest.java index bf87e8e8..2312f693 100644 --- a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerFailOnWarningsTest.java +++ b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerFailOnWarningsTest.java @@ -34,7 +34,7 @@ protected Collection expectedOutputFiles() { || javaVersion.contains("11") || javaVersion.contains("17") || javaVersion.contains("21") - || javaVersion.contains("23")) { + || javaVersion.contains("24")) { return Arrays.asList( "org/codehaus/foo/Deprecation.class", "org/codehaus/foo/ExternalDeps.class", diff --git a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerTest.java b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerTest.java index 042bddb2..1cca0c30 100644 --- a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerTest.java +++ b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerTest.java @@ -68,7 +68,7 @@ protected Collection expectedOutputFiles() { || javaVersion.contains("11") || javaVersion.contains("17") || javaVersion.contains("21") - || javaVersion.contains("23")) { + || javaVersion.contains("24")) { return Arrays.asList( "org/codehaus/foo/Deprecation.class", "org/codehaus/foo/ExternalDeps.class", diff --git a/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java b/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java index c648bc4b..3e0900ee 100644 --- a/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java +++ b/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java @@ -22,7 +22,8 @@ protected int expectedWarnings() { || javaVersion.contains("20") || javaVersion.contains("21") || javaVersion.contains("22") - || javaVersion.contains("23")) { + || javaVersion.contains("23") + || javaVersion.contains("24")) { return 5; } return 2; diff --git a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java index 88babc93..895b53e8 100644 --- a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java +++ b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java @@ -59,18 +59,10 @@ protected String getRoleHint() { @Override protected int expectedErrors() { String javaVersion = getJavaVersion(); - if (javaVersion.contains("9.0") - || javaVersion.contains("11") - || javaVersion.contains("14") - || javaVersion.contains("15") - || javaVersion.contains("16") + if (javaVersion.contains("11") || javaVersion.contains("17") - || javaVersion.contains("18") - || javaVersion.contains("19") - || javaVersion.contains("20") || javaVersion.contains("21") - || javaVersion.contains("22") - || javaVersion.contains("23")) { + || javaVersion.contains("24")) { return 5; } // javac output changed for misspelled modifiers starting in 1.6...they now generate 2 errors per occurrence, @@ -96,7 +88,8 @@ protected int expectedWarnings() { || javaVersion.contains("20") || javaVersion.contains("21") || javaVersion.contains("22") - || javaVersion.contains("23")) { + || javaVersion.contains("23") + || javaVersion.contains("24")) { return 1; } if (javaVersion.contains("1.8")) { @@ -117,39 +110,30 @@ public String getTargetVersion() { String javaVersion = getJavaVersion(); if (javaVersion.contains("9.0")) { return "1.7"; - } - if (javaVersion.contains("11")) { + } else if (javaVersion.contains("11")) { return "11"; - } - if (javaVersion.contains("14")) { + } else if (javaVersion.contains("14")) { return "14"; - } - if (javaVersion.contains("15")) { + } else if (javaVersion.contains("15")) { return "15"; - } - if (javaVersion.contains("16")) { + } else if (javaVersion.contains("16")) { return "16"; - } - if (javaVersion.contains("17")) { + } else if (javaVersion.contains("17")) { return "17"; - } - if (javaVersion.contains("18")) { + } else if (javaVersion.contains("18")) { return "18"; - } - if (javaVersion.contains("19")) { + } else if (javaVersion.contains("19")) { return "19"; - } - if (javaVersion.contains("20")) { + } else if (javaVersion.contains("20")) { return "20"; - } - if (javaVersion.contains("21")) { + } else if (javaVersion.contains("21")) { return "21"; - } - if (javaVersion.contains("22")) { + } else if (javaVersion.contains("22")) { return "22"; - } - if (javaVersion.contains("23")) { + } else if (javaVersion.contains("23")) { return "23"; + } else if (javaVersion.contains("24")) { + return "24"; } return super.getTargetVersion(); } @@ -159,39 +143,30 @@ public String getSourceVersion() { String javaVersion = getJavaVersion(); if (javaVersion.contains("9.0")) { return "1.7"; - } - if (javaVersion.contains("11")) { + } else if (javaVersion.contains("11")) { return "11"; - } - if (javaVersion.contains("14")) { + } else if (javaVersion.contains("14")) { return "14"; - } - if (javaVersion.contains("15")) { + } else if (javaVersion.contains("15")) { return "15"; - } - if (javaVersion.contains("16")) { + } else if (javaVersion.contains("16")) { return "16"; - } - if (javaVersion.contains("17")) { + } else if (javaVersion.contains("17")) { return "17"; - } - if (javaVersion.contains("18")) { + } else if (javaVersion.contains("18")) { return "18"; - } - if (javaVersion.contains("19")) { + } else if (javaVersion.contains("19")) { return "19"; - } - if (javaVersion.contains("20")) { + } else if (javaVersion.contains("20")) { return "20"; - } - if (javaVersion.contains("21")) { + } else if (javaVersion.contains("21")) { return "21"; - } - if (javaVersion.contains("22")) { + } else if (javaVersion.contains("22")) { return "22"; - } - if (javaVersion.contains("23")) { + } else if (javaVersion.contains("23")) { return "23"; + } else if (javaVersion.contains("24")) { + return "24"; } return super.getTargetVersion(); } @@ -210,7 +185,8 @@ protected Collection expectedOutputFiles() { || javaVersion.contains("20") || javaVersion.contains("21") || javaVersion.contains("22") - || javaVersion.contains("23")) { + || javaVersion.contains("23") + || javaVersion.contains("24")) { return Arrays.asList( "org/codehaus/foo/Deprecation.class", "org/codehaus/foo/ExternalDeps.class", diff --git a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java index d1e89f1b..d0221859 100644 --- a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java +++ b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java @@ -27,7 +27,8 @@ public class JavaxToolsCompilerTest extends AbstractJavacCompilerTest { @Override protected int expectedWarnings() { String javaVersion = getJavaVersion(); - if (javaVersion.contains("21") || javaVersion.contains("22") || javaVersion.contains("23")) { + if (javaVersion.contains("21") + || javaVersion.contains("24")) { return 1; } else { return super.expectedWarnings(); From 0bb297c4b1c0059a43da8ace0cc7f3482302f3ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 5 Apr 2025 15:29:34 +0000 Subject: [PATCH 09/21] Bump org.eclipse.jdt:ecj from 3.40.0 to 3.41.0 Bumps [org.eclipse.jdt:ecj](https://github.com/eclipse-jdt/eclipse.jdt.core) from 3.40.0 to 3.41.0. - [Commits](https://github.com/eclipse-jdt/eclipse.jdt.core/commits) --- updated-dependencies: - dependency-name: org.eclipse.jdt:ecj dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- plexus-compilers/plexus-compiler-eclipse/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-compilers/plexus-compiler-eclipse/pom.xml b/plexus-compilers/plexus-compiler-eclipse/pom.xml index 90e32eff..24e40230 100644 --- a/plexus-compilers/plexus-compiler-eclipse/pom.xml +++ b/plexus-compilers/plexus-compiler-eclipse/pom.xml @@ -25,7 +25,7 @@ org.eclipse.jdt ecj - 3.40.0 + 3.41.0 javax.inject From d9c508b887c9fba4cc71a8e1e69c6d2f60f5ff6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Apr 2025 22:17:56 +0000 Subject: [PATCH 10/21] Bump org.codehaus.plexus:plexus-testing from 1.4.0 to 1.5.0 Bumps [org.codehaus.plexus:plexus-testing](https://github.com/codehaus-plexus/plexus-testing) from 1.4.0 to 1.5.0. - [Release notes](https://github.com/codehaus-plexus/plexus-testing/releases) - [Commits](https://github.com/codehaus-plexus/plexus-testing/compare/plexus-testing-1.4.0...plexus-testing-1.5.0) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-testing dependency-version: 1.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68ee7264..161573d6 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ org.codehaus.plexus plexus-testing - 1.4.0 + 1.5.0 com.google.guava From 51840efd56c68c239d58ca011450dc01540a6fd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 21:13:34 +0000 Subject: [PATCH 11/21] Bump com.google.guava:guava from 33.4.6-jre to 33.4.8-jre Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.4.6-jre to 33.4.8-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-version: 33.4.8-jre dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 161573d6..9b1ae532 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ com.google.guava guava - 33.4.6-jre + 33.4.8-jre org.eclipse.sisu From cb0c59a37a1681fd05b85163fb030f7477f3dc4a Mon Sep 17 00:00:00 2001 From: mmazas Date: Fri, 11 Apr 2025 11:18:42 +0200 Subject: [PATCH 12/21] Added 3 compiler options. Signed-off-by: mmazas --- .../compiler/csharp/CSharpCompiler.java | 195 +++++++++++++++++- 1 file changed, 194 insertions(+), 1 deletion(-) diff --git a/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java b/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java index c2b0bd9c..e223ff68 100644 --- a/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java +++ b/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java @@ -56,6 +56,7 @@ * @author Trygve Laugstøl * @author Matthew Pocock * @author Chris Stevenson + * @author Marc Mazas */ @Named("csharp") public class CSharpCompiler extends AbstractCompiler { @@ -219,6 +220,171 @@ private String findExecutable(CompilerConfiguration config) { Options can be of the form -option or /option */ + /* + C:\Program Files\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin\Roslyn>csc -help -preferreduilang:en + Microsoft (R) Visual C# Compiler version 4.11.0-3.24460.3 (5649376e) + Copyright (C) Microsoft Corporation. All rights reserved. + + + Visual C# Compiler Options + + - OUTPUT FILES - + -out: Specify output file name (default: base name of + file with main class or first file) + -target:exe Build a console executable (default) (Short + form: -t:exe) + -target:winexe Build a Windows executable (Short form: + -t:winexe) + -target:library Build a library (Short form: -t:library) + -target:module Build a module that can be added to another + assembly (Short form: -t:module) + -target:appcontainerexe Build an Appcontainer executable (Short form: + -t:appcontainerexe) + -target:winmdobj Build a Windows Runtime intermediate file that + is consumed by WinMDExp (Short form: -t:winmdobj) + -doc: XML Documentation file to generate + -refout: Reference assembly output to generate + -platform: Limit which platforms this code can run on: x86, + Itanium, x64, arm, arm64, anycpu32bitpreferred, or + anycpu. The default is anycpu. + + - INPUT FILES - + -recurse: Include all files in the current directory and + subdirectories according to the wildcard + specifications + -reference:= Reference metadata from the specified assembly + file using the given alias (Short form: -r) + -reference: Reference metadata from the specified assembly + files (Short form: -r) + -addmodule: Link the specified modules into this assembly + -link: Embed metadata from the specified interop + assembly files (Short form: -l) + -analyzer: Run the analyzers from this assembly + (Short form: -a) + -additionalfile: Additional files that don't directly affect code + generation but may be used by analyzers for producing + errors or warnings. + -embed Embed all source files in the PDB. + -embed: Embed specific files in the PDB. + + - RESOURCES - + -win32res: Specify a Win32 resource file (.res) + -win32icon: Use this icon for the output + -win32manifest: Specify a Win32 manifest file (.xml) + -nowin32manifest Do not include the default Win32 manifest + -resource: Embed the specified resource (Short form: -res) + -linkresource: Link the specified resource to this assembly + (Short form: -linkres) Where the resinfo format + is [,[,public|private]] + + - CODE GENERATION - + -debug[+|-] Emit debugging information + -debug:{full|pdbonly|portable|embedded} + Specify debugging type ('full' is default, + 'portable' is a cross-platform format, + 'embedded' is a cross-platform format embedded into + the target .dll or .exe) + -optimize[+|-] Enable optimizations (Short form: -o) + -deterministic Produce a deterministic assembly + (including module version GUID and timestamp) + -refonly Produce a reference assembly in place of the main output + -instrument:TestCoverage Produce an assembly instrumented to collect + coverage information + -sourcelink: Source link info to embed into PDB. + + - ERRORS AND WARNINGS - + -warnaserror[+|-] Report all warnings as errors + -warnaserror[+|-]: Report specific warnings as errors + (use "nullable" for all nullability warnings) + -warn: Set warning level (0 or higher) (Short form: -w) + -nowarn: Disable specific warning messages + (use "nullable" for all nullability warnings) + -ruleset: Specify a ruleset file that disables specific + diagnostics. + -errorlog:[,version=] + Specify a file to log all compiler and analyzer + diagnostics. + sarif_version:{1|2|2.1} Default is 1. 2 and 2.1 + both mean SARIF version 2.1.0. + -reportanalyzer Report additional analyzer information, such as + execution time. + -skipanalyzers[+|-] Skip execution of diagnostic analyzers. + + - LANGUAGE - + -checked[+|-] Generate overflow checks + -unsafe[+|-] Allow 'unsafe' code + -define: Define conditional compilation symbol(s) (Short + form: -d) + -langversion:? Display the allowed values for language version + -langversion: Specify language version such as + `latest` (latest version, including minor versions), + `default` (same as `latest`), + `latestmajor` (latest version, excluding minor versions), + `preview` (latest version, including features in unsupported preview), + or specific versions like `6` or `7.1` + -nullable[+|-] Specify nullable context option enable|disable. + -nullable:{enable|disable|warnings|annotations} + Specify nullable context option enable|disable|warnings|annotations. + + - SECURITY - + -delaysign[+|-] Delay-sign the assembly using only the public + portion of the strong name key + -publicsign[+|-] Public-sign the assembly using only the public + portion of the strong name key + -keyfile: Specify a strong name key file + -keycontainer: Specify a strong name key container + -highentropyva[+|-] Enable high-entropy ASLR + + - MISCELLANEOUS - + @ Read response file for more options + -help Display this usage message (Short form: -?) + -nologo Suppress compiler copyright message + -noconfig Do not auto include CSC.RSP file + -parallel[+|-] Concurrent build. + -version Display the compiler version number and exit. + + - ADVANCED - + -baseaddress:
Base address for the library to be built + -checksumalgorithm: Specify algorithm for calculating source file + checksum stored in PDB. Supported values are: + SHA1 or SHA256 (default). + -codepage: Specify the codepage to use when opening source + files + -utf8output Output compiler messages in UTF-8 encoding + -main: Specify the type that contains the entry point + (ignore all other possible entry points) (Short + form: -m) + -fullpaths Compiler generates fully qualified paths + -filealign: Specify the alignment used for output file + sections + -pathmap:=,=,... + Specify a mapping for source path names output by + the compiler. + -pdb: Specify debug information file name (default: + output file name with .pdb extension) + -errorendlocation Output line and column of the end location of + each error + -preferreduilang Specify the preferred output language name. + -nosdkpath Disable searching the default SDK path for standard library assemblies. + -nostdlib[+|-] Do not reference standard library (mscorlib.dll) + -subsystemversion: Specify subsystem version of this assembly + -lib: Specify additional directories to search in for + references + -errorreport: Specify how to handle internal compiler errors: + prompt, send, queue, or none. The default is + queue. + -appconfig: Specify an application configuration file + containing assembly binding settings + -moduleassemblyname: Name of the assembly which this module will be + a part of + -modulename: Specify the name of the source module + -generatedfilesout: Place files generated during compilation in the + specified directory. + -reportivts[+|-] Output information on all IVTs granted to this + assembly by all dependencies, and annotate foreign assembly + accessibility errors with what assembly they came from. + */ + private String[] buildCompilerArguments(CompilerConfiguration config, String[] sourceFiles) throws CompilerException { List args = new ArrayList<>(); @@ -291,7 +457,7 @@ private String[] buildCompilerArguments(CompilerConfiguration config, String[] s } // ---------------------------------------------------------------------- - // Xml Doc output + // Nowarn option // ---------------------------------------------------------------------- String nowarn = compilerArguments.get("-nowarn"); @@ -343,6 +509,33 @@ private String[] buildCompilerArguments(CompilerConfiguration config, String[] s args.add("/nologo"); } + // ---------------------------------------------------------------------- + // Unsafe option + // ---------------------------------------------------------------------- + String unsafe = compilerArguments.get("-unsafe"); + + if (!StringUtils.isEmpty(unsafe) && unsafe.equals("true")) { + args.add("/unsafe"); + } + + // ---------------------------------------------------------------------- + // PreferredUILang option + // ---------------------------------------------------------------------- + String preferreduilang = compilerArguments.get("-preferreduilang"); + + if (!StringUtils.isEmpty(preferreduilang)) { + args.add("/preferreduilang:" + preferreduilang); + } + + // ---------------------------------------------------------------------- + // Utf8Output option + // ---------------------------------------------------------------------- + String utf8output = compilerArguments.get("-utf8output"); + + if (!StringUtils.isEmpty(utf8output)) { + args.add("/utf8output:"); + } + // ---------------------------------------------------------------------- // add any resource files // ---------------------------------------------------------------------- From d09d7d40a68c62850656c0939fc7cbf74ad049fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 May 2025 21:13:18 +0000 Subject: [PATCH 13/21] Bump eclipse.sisu.version from 0.9.0.M3 to 0.9.0.M4 Bumps `eclipse.sisu.version` from 0.9.0.M3 to 0.9.0.M4. Updates `org.eclipse.sisu:org.eclipse.sisu.plexus` from 0.9.0.M3 to 0.9.0.M4 - [Release notes](https://github.com/eclipse-sisu/sisu-project/releases) - [Changelog](https://github.com/eclipse-sisu/sisu-project/blob/main/RELEASE.md) - [Commits](https://github.com/eclipse-sisu/sisu-project/compare/milestones/0.9.0.M3...milestones/0.9.0.M4) Updates `org.eclipse.sisu:org.eclipse.sisu.inject` from 0.9.0.M3 to 0.9.0.M4 - [Release notes](https://github.com/eclipse-sisu/sisu-project/releases) - [Changelog](https://github.com/eclipse-sisu/sisu-project/blob/main/RELEASE.md) - [Commits](https://github.com/eclipse-sisu/sisu-project/compare/milestones/0.9.0.M3...milestones/0.9.0.M4) --- updated-dependencies: - dependency-name: org.eclipse.sisu:org.eclipse.sisu.plexus dependency-version: 0.9.0.M4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.sisu:org.eclipse.sisu.inject dependency-version: 0.9.0.M4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9b1ae532..770ec994 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 3.6.3 ${mavenVersion} 2.37.0 - 0.9.0.M3 + 0.9.0.M4 ${eclipse.sisu.version} false clean install From a70e09dd46d368e2b4f5e802971c271fd9b38095 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 May 2025 21:05:26 +0000 Subject: [PATCH 14/21] Bump org.codehaus.plexus:plexus from 20 to 21 Bumps [org.codehaus.plexus:plexus](https://github.com/codehaus-plexus/plexus-pom) from 20 to 21. - [Release notes](https://github.com/codehaus-plexus/plexus-pom/releases) - [Commits](https://github.com/codehaus-plexus/plexus-pom/commits) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus dependency-version: '21' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 770ec994..8ecc295f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus - 20 + 21 plexus-compiler From c1ce44f1ebde4eb6e83620538e7ebe55c0380ceb Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Tue, 27 May 2025 20:34:50 +0200 Subject: [PATCH 15/21] fix spotless --- .../org/codehaus/plexus/compiler/ajc/AspectJCompiler.java | 4 ++-- .../plexus/compiler/javac/JavaxToolsCompilerTest.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java b/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java index d3503d8b..35d059e8 100644 --- a/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java +++ b/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java @@ -551,8 +551,8 @@ private static long versionStringToMajorMinor(String version) throws CompilerExc .replaceFirst("[.]0$", ""); switch (version) { - // Java 1.6 as a default source/target seems to make sense. Maven Compiler should set its own default - // anyway, so this probably never needs to be used. But not having a default feels bad, too. + // Java 1.6 as a default source/target seems to make sense. Maven Compiler should set its own default + // anyway, so this probably never needs to be used. But not having a default feels bad, too. case "": return ClassFileConstants.JDK1_6; case "1": diff --git a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java index d0221859..4aa9a88c 100644 --- a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java +++ b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java @@ -27,8 +27,7 @@ public class JavaxToolsCompilerTest extends AbstractJavacCompilerTest { @Override protected int expectedWarnings() { String javaVersion = getJavaVersion(); - if (javaVersion.contains("21") - || javaVersion.contains("24")) { + if (javaVersion.contains("21") || javaVersion.contains("24")) { return 1; } else { return super.expectedWarnings(); From 0fc7a30c00486e9d622b97875dd8374f35957d06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jun 2025 21:17:09 +0000 Subject: [PATCH 16/21] Bump org.codehaus.plexus:plexus from 21 to 22 Bumps [org.codehaus.plexus:plexus](https://github.com/codehaus-plexus/plexus-pom) from 21 to 22. - [Release notes](https://github.com/codehaus-plexus/plexus-pom/releases) - [Commits](https://github.com/codehaus-plexus/plexus-pom/commits) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus dependency-version: '22' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8ecc295f..d2bed8a7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus - 21 + 22 plexus-compiler From afa50bc6c232fc30cd68882eb2fb5177f5a11524 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Jun 2025 21:09:35 +0000 Subject: [PATCH 17/21] Bump org.eclipse.jdt:ecj from 3.41.0 to 3.42.0 Bumps [org.eclipse.jdt:ecj](https://github.com/eclipse-jdt/eclipse.jdt.core) from 3.41.0 to 3.42.0. - [Commits](https://github.com/eclipse-jdt/eclipse.jdt.core/commits) --- updated-dependencies: - dependency-name: org.eclipse.jdt:ecj dependency-version: 3.42.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- plexus-compilers/plexus-compiler-eclipse/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-compilers/plexus-compiler-eclipse/pom.xml b/plexus-compilers/plexus-compiler-eclipse/pom.xml index 24e40230..99da4d08 100644 --- a/plexus-compilers/plexus-compiler-eclipse/pom.xml +++ b/plexus-compilers/plexus-compiler-eclipse/pom.xml @@ -25,7 +25,7 @@ org.eclipse.jdt ecj - 3.41.0 + 3.42.0 javax.inject From 92bff9c21eee464cb35642c645f97a52bccfc921 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Jul 2025 00:43:35 +0000 Subject: [PATCH 18/21] Bump org.apache.maven.plugins:maven-invoker-plugin from 3.9.0 to 3.9.1 --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-invoker-plugin dependency-version: 3.9.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- plexus-compiler-its/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-compiler-its/pom.xml b/plexus-compiler-its/pom.xml index 520d54db..eb10af82 100644 --- a/plexus-compiler-its/pom.xml +++ b/plexus-compiler-its/pom.xml @@ -46,7 +46,7 @@ org.apache.maven.plugins maven-invoker-plugin - 3.9.0 + 3.9.1 integration-tests From 13b268ccef7788d4085faa5daec7d15d9cff85f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20=C5=BBygie=C5=82o?= <11896137+pzygielo@users.noreply.github.com> Date: Wed, 16 Jul 2025 12:09:41 +0200 Subject: [PATCH 19/21] Fixed wrong excludes management (#444) Co-authored-by: mmazas --- .../org/codehaus/plexus/compiler/csharp/CSharpCompiler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java b/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java index e223ff68..2fe06177 100644 --- a/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java +++ b/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java @@ -759,7 +759,7 @@ protected static Set getSourceFilesForSourceRoot(CompilerConfiguration c if (excludes != null && !excludes.isEmpty()) { String[] exclStrs = excludes.toArray(new String[excludes.size()]); - scanner.setIncludes(exclStrs); + scanner.setExcludes(exclStrs); } scanner.scan(); From 2446e930f7f6e740da583b35a52874cf1bfe3500 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Aug 2025 06:57:56 +0000 Subject: [PATCH 20/21] Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 02813453..42af799e 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -56,7 +56,7 @@ jobs: # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL From 258523607b02ef534c261ed582f2ff2663d15dde Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 08:19:10 +0000 Subject: [PATCH 21/21] Bump org.codehaus.plexus:plexus-testing from 1.5.0 to 1.6.0 Bumps [org.codehaus.plexus:plexus-testing](https://github.com/codehaus-plexus/plexus-testing) from 1.5.0 to 1.6.0. - [Release notes](https://github.com/codehaus-plexus/plexus-testing/releases) - [Commits](https://github.com/codehaus-plexus/plexus-testing/compare/plexus-testing-1.5.0...plexus-testing-1.6.0) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-testing dependency-version: 1.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d2bed8a7..3d5c0a0e 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ org.codehaus.plexus plexus-testing - 1.5.0 + 1.6.0 com.google.guava