Merge branch 'jenkinsci:main' into BUG-JENKINS-68396

.github/workflows/coverage.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Generate coverage with JaCoCo
         run: mvn -V --color always -ntp clean verify -Pci
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.1.1
+        uses: codecov/codecov-action@v5.1.2
         with:
           file: 'target/site/jacoco/jacoco.xml'
           disable_search: true

SUPPORTED-FORMATS.md

@@ -1,4 +1,4 @@
-<!--- DO NOT EDIT -- Generated at 2024-12-14T15:18:56.537764514 - Run the `main` method of `ParserRegistry` to regenerate after changing parsers -- DO NOT EDIT --->
+<!--- DO NOT EDIT -- Generated at 2025-01-08T18:29:47.436717596 - Run the `main` method of `ParserRegistry` to regenerate after changing parsers -- DO NOT EDIT --->
 # Supported Report Formats
 
 The static analysis model supports the following report formats.
@@ -2178,6 +2178,27 @@ analyze - iccxxxxcompiler_opts cstat2.c</pre></code>For details check the IAR C-
                 -
             </td>
         </tr>
+        <tr>
+            <td>
+                vale
+            </td>
+            <td>
+                -
+            </td>
+            <td>
+                <a href="https://vale.sh/">
+                    Vale
+                </a>
+            </td>
+            <td>
+                **/vale-report.json
+            </td>
+        </tr>
+        <tr>
+            <td colspan="4">
+                :bulb: Reads vale report files. Use the flag --output=JSON
+            </td>
+        </tr>
         <tr>
             <td>
                 valgrind

doc/dependency-graph.puml

@@ -12,7 +12,7 @@ rectangle "commons-io\n\n2.18.0" as commons_io_commons_io_jar
 rectangle "commons-digester3\n\n3.2" as org_apache_commons_commons_digester3_jar
 rectangle "cglib\n\n2.2.2" as cglib_cglib_jar
 rectangle "commons-logging\n\n1.3.4" as commons_logging_commons_logging_jar
-rectangle "commons-beanutils\n\n1.9.4" as commons_beanutils_commons_beanutils_jar
+rectangle "commons-beanutils\n\n1.10.0" as commons_beanutils_commons_beanutils_jar
 rectangle "commons-collections\n\n3.2.2" as commons_collections_commons_collections_jar
 rectangle "commons-text\n\n1.13.0" as org_apache_commons_commons_text_jar
 rectangle "violations-lib\n\n1.157.3" as se_bjurr_violations_violations_lib_jar
@@ -32,19 +32,19 @@ rectangle "gson\n\n2.11.0" as com_google_code_gson_gson_jar
 rectangle "Saxon-HE\n\n12.5" as net_sf_saxon_Saxon_HE_jar
 rectangle "xmlresolver\n\n5.2.2" as org_xmlresolver_xmlresolver_jar
 rectangle "xmlresolver\ndata\n5.2.2" as org_xmlresolver_xmlresolver_jar_data
-rectangle "pmd-core\n\n7.8.0" as net_sourceforge_pmd_pmd_core_jar
+rectangle "pmd-core\n\n7.9.0" as net_sourceforge_pmd_pmd_core_jar
 rectangle "slf4j-api\n\n2.0.16" as org_slf4j_slf4j_api_jar
 rectangle "antlr4-runtime\n\n4.9.3" as org_antlr_antlr4_runtime_jar
-rectangle "checker-qual\n\n3.48.1" as org_checkerframework_checker_qual_jar
+rectangle "checker-qual\n\n3.48.3" as org_checkerframework_checker_qual_jar
 rectangle "pcollections\n\n4.0.2" as org_pcollections_pcollections_jar
 rectangle "nice-xml-messages\n\n3.1" as com_github_oowekyala_ooxml_nice_xml_messages_jar
-rectangle "pmd-java\n\n7.8.0" as net_sourceforge_pmd_pmd_java_jar
+rectangle "pmd-java\n\n7.9.0" as net_sourceforge_pmd_pmd_java_jar
 rectangle "json\n\n20240303" as org_json_json_jar
 rectangle "json-smart\n\n2.5.1" as net_minidev_json_smart_jar
 rectangle "accessors-smart\n\n2.5.1" as net_minidev_accessors_smart_jar
-rectangle "codingstyle\n\n5.2.0" as edu_hm_hafner_codingstyle_jar
+rectangle "codingstyle\n\n5.5.0" as edu_hm_hafner_codingstyle_jar
 rectangle "spotbugs-annotations\n\n4.8.6" as com_github_spotbugs_spotbugs_annotations_jar
-rectangle "error_prone_annotations\n\n2.35.1" as com_google_errorprone_error_prone_annotations_jar
+rectangle "error_prone_annotations\n\n2.36.0" as com_google_errorprone_error_prone_annotations_jar
 rectangle "commons-lang3\n\n3.17.0" as org_apache_commons_commons_lang3_jar
 rectangle "streamex\n\n0.8.3" as one_util_streamex_jar
 edu_hm_hafner_analysis_model_jar -[#000000]-> org_jsoup_jsoup_jar

pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>edu.hm.hafner</groupId>
     <artifactId>codingstyle-pom</artifactId>
-    <version>5.5.0</version>
+    <version>5.9.0</version>
     <relativePath />
   </parent>
 
@@ -62,15 +62,15 @@
     <jmh.version>1.37</jmh.version>
     <commons.io.version>2.18.0</commons.io.version>
     <commons.digester.version>3.2</commons.digester.version>
-    <commons-beanutils.version>1.9.4</commons-beanutils.version>
+    <commons-beanutils.version>1.10.0</commons-beanutils.version>
     <commons.text.version>1.13.0</commons.text.version>
     <j2html.version>1.4.0</j2html.version>
     <slf4j.version>2.0.16</slf4j.version>
     <violations-lib.version>1.157.3</violations-lib.version>
     <jsoup.version>1.18.3</jsoup.version>
     <json.version>20240303</json.version>
     <json-smart.version>2.5.1</json-smart.version>
-    <pmd.api.version>7.8.0</pmd.api.version>
+    <pmd.api.version>7.9.0</pmd.api.version>
     <spotbugs.api.version>4.8.6</spotbugs.api.version>
 
     <incrementals-plugin.version>1.8</incrementals-plugin.version>
@@ -292,6 +292,13 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>@{argLine} -Dorg.apache.logging.log4j.level=OFF</argLine>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.sonatype.plugins</groupId>
         <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -352,6 +359,7 @@
           <excludes>
             <exclude>.*LineRangeList</exclude>
             <exclude>.*SecureDigester</exclude>
+            <exclude>.*Benchmark.*</exclude>
             <exclude>edu.hm.hafner.analysis.parser.*</exclude>
             <exclude>edu.hm.hafner.analysis.PackageDetectors.*</exclude>
           </excludes>
@@ -383,14 +391,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.revapi</groupId>
-        <artifactId>revapi-maven-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-          <failBuildOnProblemsFound>false</failBuildOnProblemsFound>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

src/main/java/edu/hm/hafner/analysis/AbstractModuleDetector.java

@@ -5,7 +5,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import edu.hm.hafner.analysis.ModuleDetector.FileSystem;
+import edu.hm.hafner.analysis.ModuleDetectorRunner.FileSystemFacade;
 
 /**
  * Abstract class for all Module Detectors.
@@ -15,7 +15,7 @@ abstract class AbstractModuleDetector {
     static final String ALL_DIRECTORIES = "**/";
     static final String PLUS = ", ";
 
-    private final FileSystem factory;
+    private final FileSystemFacade factory;
 
     /**
      * Collects all projects of a specific type.
@@ -32,8 +32,8 @@ abstract class AbstractModuleDetector {
      */
     abstract String getPattern();
 
-    AbstractModuleDetector(final FileSystem fileSystem) {
-        factory = fileSystem;
+    AbstractModuleDetector(final FileSystemFacade fileSystemFacade) {
+        factory = fileSystemFacade;
     }
 
     void addMapping(final Map<String, String> mapping, final String fileName, final String suffix,
@@ -43,7 +43,7 @@ void addMapping(final Map<String, String> mapping, final String fileName, final
         }
     }
 
-    public FileSystem getFactory() {
+    public FileSystemFacade getFactory() {
         return factory;
     }
 }

src/main/java/edu/hm/hafner/analysis/AntModuleDetector.java

@@ -8,16 +8,16 @@
 import org.apache.commons.lang3.StringUtils;
 import org.xml.sax.SAXException;
 
-import edu.hm.hafner.analysis.ModuleDetector.FileSystem;
+import edu.hm.hafner.analysis.ModuleDetectorRunner.FileSystemFacade;
 
 /**
  * Detects module names by parsing the name of a source file, the ANT build.xml.
  */
-public class AntModuleDetector extends AbstractModuleDetector {
+class AntModuleDetector extends AbstractModuleDetector {
     static final String ANT_PROJECT = "build.xml";
 
-    AntModuleDetector(final FileSystem fileSystem) {
-        super(fileSystem);
+    AntModuleDetector(final FileSystemFacade fileSystemFacade) {
+        super(fileSystemFacade);
     }
 
     @Override
@@ -44,7 +44,7 @@ void collectProjects(final Map<String, String> mapping, final List<String> proje
      */
     private String parseBuildXml(final String buildXml) {
         try (var file = getFactory().open(buildXml)) {
-            var digester = new SecureDigester(ModuleDetector.class);
+            var digester = new SecureDigester(ModuleDetectorRunner.class);
 
             digester.push(new StringBuilder());
             var xPath = "project";

src/main/java/edu/hm/hafner/analysis/GradleModuleDetector.java

@@ -11,12 +11,12 @@
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import edu.hm.hafner.analysis.ModuleDetector.FileSystem;
+import edu.hm.hafner.analysis.ModuleDetectorRunner.FileSystemFacade;
 
 /**
  * Detects module names by parsing gradle source files.
  */
-public class GradleModuleDetector extends AbstractModuleDetector {
+class GradleModuleDetector extends AbstractModuleDetector {
     static final String BUILD_GRADLE = "build.gradle";
     static final String BUILD_GRADLE_KTS = "build.gradle.kts";
     static final String SETTINGS_GRADLE = "settings.gradle";
@@ -29,8 +29,8 @@ public class GradleModuleDetector extends AbstractModuleDetector {
     private static final Pattern RE_GRADLE_SET_PROJECT_NAME =
             Pattern.compile("^\\s*rootProject\\.(name\\s*=|setName\\(?)\\s*['\"]([^'\"]*)['\"]\\)?");
 
-    GradleModuleDetector(final FileSystem fileSystem) {
-        super(fileSystem);
+    GradleModuleDetector(final FileSystemFacade fileSystemFacade) {
+        super(fileSystemFacade);
     }
 
     @Override

src/main/java/edu/hm/hafner/analysis/Issue.java

@@ -375,7 +375,7 @@ public static Predicate<Issue> byType(final String type) {
     }
 
     /**
-     * Called after de-serialization to improve the memory usage.
+     * Called after deserialization to improve the memory usage.
      *
      * @return this
      */