Merge branch 'master' into debug-javac-output

Author: jaredstehler

Diff for: .github/workflows/codeql.yml

@@ -0,0 +1,93 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  schedule:
+    - cron: '33 4 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: java-kotlin
+          build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too.
+        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # 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
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

Diff for: .github/workflows/maven.yml

@@ -16,19 +16,20 @@
 # under the License.
 
 name: GitHub CI
-on:
-  push:
-  pull_request:
 
-jobs:
+on: [push, pull_request]
 
+jobs:
   build:
     name: Build it
     uses: codehaus-plexus/.github/.github/workflows/maven.yml@master
     with:
-      jdk-fast-fail-build: '21'
-      jdk-matrix: '["11", "17", "21"]'
+      matrix-exclude: '[ {"jdk": "8"}, {"jdk": "11"} ]'
       jdk-distribution-matrix: '["zulu", "temurin", "microsoft", "liberica", "corretto"]'
-      os-matrix: '["ubuntu-latest","windows-latest", "macOS-latest"]'
-      maven_args: 'install javadoc:javadoc -e -B -V -fae -Pno-tests-if-not-on-osx'
+      maven_args: 'verify javadoc:javadoc -e -B -V -fae'
 
+  deploy:
+    name: Deploy
+    needs: build
+    uses: codehaus-plexus/.github/.github/workflows/maven-deploy.yml@master
+    secrets: inherit

Diff for: README.md

@@ -4,6 +4,7 @@ Plexus-Compiler
 [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/codehaus-plexus/plexus-compiler.svg?label=License)](http://www.apache.org/licenses/)
 [![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-compiler.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.codehaus.plexus/plexus-compiler)
 [![CI](https://github.com/codehaus-plexus/plexus-compiler/actions/workflows/maven.yml/badge.svg)](https://github.com/codehaus-plexus/plexus-compiler/actions/workflows/maven.yml)
+[![Reproducible Builds](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/jvm-repo-rebuild/reproducible-central/master/content/org/codehaus/plexus/plexus-compiler/badge.json)](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/codehaus/plexus/plexus-compiler/README.md)
 
 This component is an Compilation API used by Apache Maven Compiler plugin on the top of different Compiler Engines: Javac, Eclipse Compiler, etc..
 
@@ -12,7 +13,3 @@ This component is an Compilation API used by Apache Maven Compiler plugin on the
 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)
-
-### J2ObjC OSX
-
-To compile this project on OSX, you need to have J2ObjC installed: [J2ObjC Requirements](https://developers.google.com/j2objc#requirements).

Diff for: plexus-compiler-api/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus-compiler</artifactId>
-    <version>2.13.1-SNAPSHOT</version>
+    <version>2.15.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>plexus-compiler-api</artifactId>
@@ -18,6 +18,11 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.sisu</groupId>
+      <artifactId>org.eclipse.sisu.plexus</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>

Diff for: plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java

@@ -25,9 +25,10 @@
  */
 import java.io.File;
 import java.io.IOException;
-import java.util.HashSet;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.slf4j.Logger;
@@ -39,7 +40,10 @@
  * @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
  */
 public abstract class AbstractCompiler implements Compiler {
-    protected Logger log = LoggerFactory.getLogger(getClass());
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
+    private final org.codehaus.plexus.logging.Logger plexusLogger;
+
     protected static final String EOL = System.lineSeparator();
 
     protected static final String PS = System.getProperty("path.separator");
@@ -68,6 +72,25 @@ protected AbstractCompiler(
         this.outputFileEnding = outputFileEnding;
 
         this.outputFile = outputFile;
+
+        this.plexusLogger = new PlexusLoggerWrapper(log);
+    }
+
+    /**
+     *
+     * @return a Logger
+     */
+    protected Logger getLog() {
+        return log;
+    }
+
+    /**
+     * @return a plexus Logger
+     * @deprecated please use {@link #getLog()}
+     */
+    @Deprecated
+    protected org.codehaus.plexus.logging.Logger getLogger() {
+        return plexusLogger;
     }
 
     // ----------------------------------------------------------------------
@@ -76,18 +99,22 @@ protected AbstractCompiler(
 
     public abstract String getCompilerId();
 
+    @Override
     public CompilerResult performCompile(CompilerConfiguration configuration) throws CompilerException {
         throw new CompilerNotImplementedException("The performCompile method has not been implemented.");
     }
 
+    @Override
     public CompilerOutputStyle getCompilerOutputStyle() {
         return compilerOutputStyle;
     }
 
+    @Override
     public String getInputFileEnding(CompilerConfiguration configuration) throws CompilerException {
         return inputFileEnding;
     }
 
+    @Override
     public String getOutputFileEnding(CompilerConfiguration configuration) throws CompilerException {
         if (compilerOutputStyle != CompilerOutputStyle.ONE_OUTPUT_FILE_PER_INPUT_FILE) {
             throw new RuntimeException("This compiler implementation doesn't have one output file per input file.");
@@ -96,6 +123,7 @@ public String getOutputFileEnding(CompilerConfiguration configuration) throws Co
         return outputFileEnding;
     }
 
+    @Override
     public String getOutputFile(CompilerConfiguration configuration) throws CompilerException {
         if (compilerOutputStyle != CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES) {
             throw new RuntimeException("This compiler implementation doesn't have one output file for all files.");
@@ -104,6 +132,7 @@ public String getOutputFile(CompilerConfiguration configuration) throws Compiler
         return outputFile;
     }
 
+    @Override
     public boolean canUpdateTarget(CompilerConfiguration configuration) throws CompilerException {
         return true;
     }
@@ -123,10 +152,14 @@ public static String getPathString(List<String> pathElements) {
     }
 
     protected static Set<String> getSourceFilesForSourceRoot(CompilerConfiguration config, String sourceLocation) {
-        DirectoryScanner scanner = new DirectoryScanner();
 
+        DirectoryScanner scanner = new DirectoryScanner();
         scanner.setBasedir(sourceLocation);
 
+        if (!scanner.getBasedir().exists()) {
+            return Collections.emptySet();
+        }
+
         Set<String> includes = config.getIncludes();
 
         if (includes != null && !includes.isEmpty()) {
@@ -147,7 +180,7 @@ protected static Set<String> getSourceFilesForSourceRoot(CompilerConfiguration c
 
         String[] sourceDirectorySources = scanner.getIncludedFiles();
 
-        Set<String> sources = new HashSet<>();
+        Set<String> sources = new TreeSet<>();
 
         for (String sourceDirectorySource : sourceDirectorySources) {
             File f = new File(sourceLocation, sourceDirectorySource);
@@ -159,7 +192,7 @@ protected static Set<String> getSourceFilesForSourceRoot(CompilerConfiguration c
     }
 
     protected static String[] getSourceFiles(CompilerConfiguration config) {
-        Set<String> sources = new HashSet<>();
+        Set<String> sources = new TreeSet<>();
 
         Set<File> sourceFiles = config.getSourceFiles();
 
@@ -235,19 +268,31 @@ private static String getCanonicalPath(File origFile) throws CompilerException {
 
     protected void logCompiling(String[] sourceFiles, CompilerConfiguration config) {
         if (log.isInfoEnabled()) {
-            String to = (config.getWorkingDirectory() == null)
-                    ? config.getOutputLocation()
-                    : config.getWorkingDirectory()
-                            .toPath()
-                            .relativize(new File(config.getOutputLocation()).toPath())
-                            .toString();
             log.info("Compiling "
                     + (sourceFiles == null
                             ? ""
                             : (sourceFiles.length + " source file" + (sourceFiles.length == 1 ? " " : "s ")))
                     + "with "
                     + getCompilerId() + " [" + config.describe() + "]" + " to "
-                    + to);
+                    + getRelativeWorkingDirectory(config));
+        }
+    }
+
+    private static String getRelativeWorkingDirectory(CompilerConfiguration config) {
+        String to;
+        if (config.getWorkingDirectory() == null) {
+            to = config.getOutputLocation();
+        } else {
+            try {
+                to = config.getWorkingDirectory()
+                        .toPath()
+                        .relativize(new File(config.getOutputLocation()).toPath())
+                        .toString();
+            } catch (IllegalArgumentException e) {
+                // may happen on Windows if the working directory is on a different drive
+                to = config.getOutputLocation();
+            }
         }
+        return to;
     }
 }

Diff for: plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java

@@ -500,10 +500,20 @@ public void setOptimize(boolean optimize) {
         this.optimize = optimize;
     }
 
+    /**
+     * @deprecated Don't use any longer because this is just the configured version which does not necessarily match the version
+     * of the actually executed compiler binary
+     */
+    @Deprecated
     public String getCompilerVersion() {
         return compilerVersion;
     }
 
+    /**
+     * @deprecated Don't use any longer because this is just the configured version which does not necessarily match the version
+     * of the actually executed compiler binary
+     */
+    @Deprecated
     public void setCompilerVersion(String compilerVersion) {
         this.compilerVersion = compilerVersion;
     }
@@ -688,15 +698,18 @@ public String describe() {
                 params.add("debug");
             }
         }
-        if (isOptimize()) {
-            params.add("optimize");
-        }
         if (isVerbose()) {
             params.add("verbose");
         }
         if (isShowDeprecation()) {
             params.add("deprecation");
         }
+        if (isParameters()) {
+            params.add("parameters");
+        }
+        if (isEnablePreview()) {
+            params.add("preview");
+        }
 
         // target bytecode options: release or target, module-path
         if (!StringUtils.isEmpty(getReleaseVersion())) {