Merge branch 'main' into checkstyle-10.17.0

Signed-off-by: Kai Kreuzer <kai@openhab.org>
openhab · Aug 11, 2024 · 378bfe6 · 378bfe6
2 parents add0ca2 + 2dfdbed
commit 378bfe6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/docs/maven-plugin.md b/docs/maven-plugin.md
@@ -87,7 +87,7 @@ Parameters:
 | ------ | ------| -------- |
 | **pmdRuleset** | String | Relative path of the XML configuration to use. If not set the default ruleset file will be used |
 | **pmdFilter** | String | Relative path of a suppression.properties file that lists classes and rules to be excluded from failures. If not set no classes and no rules will be excluded |
-| **maven.pmd.version** | String | The version of the maven-pmd-plugin that will be used (Default value is **3.21.2**)|
+| **maven.pmd.version** | String | The version of the maven-pmd-plugin that will be used (Default value is **3.24.0**)|
 | **pmdPlugins** | List<Dependency> | A list with artifacts that contain additional checks for PMD |
 
 ### sat-plugin:checkstyle
@@ -117,8 +117,8 @@ Parameters:
 | **spotbugsRuleset** | String | Relative path to the XML that specifies the bug detectors which should be run. If not set the default file will be used|
 | **spotbugsInclude** | String | Relative path to the XML that specifies the bug instances that will be included in the report. If not set the default file will be used|
 | **spotbugsExclude** | String | Relative path to the XML that specifies the bug instances that will be excluded from the report. If not set the default file will be used|
-| **maven.spotbugs.version** | String | The version of the spotbugs-maven-plugin that will be used (default value is **4.8.3.1**) |
-| **spotbugs.version** | String | The version of SpotBugs that will be used (default value is **4.8.3**) |
+| **maven.spotbugs.version** | String | The version of the spotbugs-maven-plugin that will be used (default value is **4.8.6.2**) |
+| **spotbugs.version** | String | The version of SpotBugs that will be used (default value is **4.8.6**) |
 | **spotbugsPlugins** | List<Dependency> | A list with artifacts that contain additional detectors/patterns for SpotBugs |
 | **findbugs.slf4j.version** | String | The version of the findbugs-slf4j plugin that will be used (default value is **1.5.0**)|
 

diff --git a/pom.xml b/pom.xml
@@ -66,9 +66,9 @@
  <commons.lang3.version>3.12.0</commons.lang3.version>
  <mockito.version>4.10.0</mockito.version>
  <maven.resources.version>3.3.0</maven.resources.version>
- <pmd.version>7.0.0</pmd.version>
+ <pmd.version>7.4.0</pmd.version>
  <checkstyle.version>10.17.0</checkstyle.version>
- <spotbugs.version>4.8.3</spotbugs.version>
+ <spotbugs.version>4.8.6</spotbugs.version>
  <maven.core.version>3.6.0</maven.core.version>
  <maven.plugin.api.version>3.8.5</maven.plugin.api.version>
  <maven.plugin.annotations.version>3.7.0</maven.plugin.annotations.version>
@@ -93,11 +93,6 @@
  </properties>
 
  <dependencies>
- <dependency>
- <groupId>net.sourceforge.pmd</groupId>
- <artifactId>pmd-compat6</artifactId>
- <version>7.0.0</version>
- </dependency>
  <dependency>
  <groupId>javax.xml.bind</groupId>
  <artifactId>jaxb-api</artifactId>

diff --git a/sat-plugin/src/main/java/org/openhab/tools/analysis/tools/PmdChecker.java b/sat-plugin/src/main/java/org/openhab/tools/analysis/tools/PmdChecker.java
@@ -60,7 +60,7 @@ public class PmdChecker extends AbstractChecker {
  /**
  * The version of the maven-pmd-plugin that will be used
  */
- @Parameter(property = "maven.pmd.version", defaultValue = "3.21.2")
+ @Parameter(property = "maven.pmd.version", defaultValue = "3.24.0")
  private String mavenPmdVersion;
 
  /**
@@ -69,7 +69,7 @@ public class PmdChecker extends AbstractChecker {
  @Parameter
  private List<Dependency> pmdPlugins = new ArrayList<>();
 
- private static final String PMD_VERSION = "7.0.0";
+ private static final String PMD_VERSION = "7.4.0";
  /**
  * Location of the properties files that contains configuration options for the maven-pmd-plugin
  */

diff --git a/sat-plugin/src/main/java/org/openhab/tools/analysis/tools/SpotBugsChecker.java b/sat-plugin/src/main/java/org/openhab/tools/analysis/tools/SpotBugsChecker.java
@@ -83,7 +83,7 @@ public class SpotBugsChecker extends AbstractChecker {
  /**
  * The version of the spotbugs-maven-plugin that will be used
  */
- @Parameter(property = "maven.spotbugs.version", defaultValue = "4.8.3.1")
+ @Parameter(property = "maven.spotbugs.version", defaultValue = "4.8.6.2")
  private String spotbugsMavenPluginVersion;
 
  /**
@@ -95,7 +95,7 @@ public class SpotBugsChecker extends AbstractChecker {
  /**
  * The version of the spotbugs that will be used
  */
- @Parameter(property = "spotbugs.version", defaultValue = "4.8.3")
+ @Parameter(property = "spotbugs.version", defaultValue = "4.8.6")
  private String spotBugsVersion;
 
  /**