Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump edu.hm.hafner:codingstyle from 3.42.0 to 4.5.0 #903

Merged
merged 4 commits into from
Apr 23, 2024
Merged

Bump edu.hm.hafner:codingstyle from 3.42.0 to 4.5.0 #903

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
232cce4
Bump edu.hm.hafner:codingstyle from 3.42.0 to 4.5.0
dependabot[bot] Apr 22, 2024
1d3d4c7
Use new test/production rules for CheckStyle and PMD.
uhafner Apr 22, 2024
31b831b
Fix some `LooseCoupling` warnings.
uhafner Apr 23, 2024
0688663
Bump version to 8.x to make clear that we have incompatible changes.
uhafner Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 109 additions & 36 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<artifactId>analysis-pom</artifactId>
<packaging>pom</packaging>
<name>Analysis Plug-ins Parent POM</name>
<version>7.5.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>

<url>https://github.com/jenkinsci/analysis-pom-plugin</url>
<description>This static analysis POM serves as parent POM for all my Jenkins Plugins. It basically enhances the
Expand All @@ -26,7 +26,7 @@
<jenkins.baseline>2.426</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<spotbugs.failOnError>false</spotbugs.failOnError>
<codingstyle.config.version>3.42.0</codingstyle.config.version>
<codingstyle.config.version>4.6.0</codingstyle.config.version>

<!-- NPM and node versions for frontend-maven-plugin -->
<node.version>20.11.0</node.version>
Expand All @@ -41,7 +41,7 @@

<!-- Maven plug-in versions -->
<spotbugs.version>4.8.4</spotbugs.version>
<pmd.version>6.55.0</pmd.version>
<pmd.version>7.0.0</pmd.version>
<maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
<checkstyle.version>10.15.0</checkstyle.version>
<maven-pmd-plugin.version>3.21.2</maven-pmd-plugin.version>
Expand Down Expand Up @@ -331,20 +331,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven-checkstyle-plugin.version}</version>
<executions>
<execution>
<id>run-checkstyle</id>
<goals>
<goal>checkstyle</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
<configuration>
<linkXRef>false</linkXRef>
<failOnViolation>false</failOnViolation>
<configLocation>checkstyle-configuration.xml</configLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<excludeGeneratedSources>true</excludeGeneratedSources>
<failsOnError>false</failsOnError>
<excludes>**/*Assert*.java,**/InjectedTest.java,**/Messages.java,**/*_jmh*</excludes>
</configuration>
<dependencies>
Expand All @@ -360,38 +350,49 @@
<classifier>config</classifier>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>${maven-pmd-plugin.version}</version>
<executions>
<execution>
<id>run-pmd</id>
<id>run-checkstyle-java</id>
<goals>
<goal>pmd</goal>
<goal>cpd</goal>
<goal>checkstyle</goal>
</goals>
<phase>verify</phase>
<configuration>
<excludes>**/module-info.java</excludes>
<includeTestSourceDirectory>false</includeTestSourceDirectory>
<configLocation>checkstyle-java-configuration.xml</configLocation>
<outputFile>${project.build.directory}/checkstyle-java/checkstyle-result.xml</outputFile>
</configuration>
</execution>
<execution>
<id>run-checkstyle-tests</id>
<goals>
<goal>checkstyle</goal>
</goals>
<phase>verify</phase>
<configuration>
<excludes>**/*Assert*.java,**/*_jmh*,**/module-info.java</excludes>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<configLocation>checkstyle-tests-configuration.xml</configLocation>
<outputFile>${project.build.directory}/checkstyle-tests/checkstyle-result.xml</outputFile>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>${maven-pmd-plugin.version}</version>
<configuration>
<linkXRef>false</linkXRef>
<rulesets>
<ruleset>pmd-configuration.xml</ruleset>
</rulesets>
<excludeRoots>
<excludeRoot>target/generated-sources/localizer</excludeRoot>
<excludeRoot>target/generated-test-sources/test-annotations</excludeRoot>
<excludeRoot>target/generated-test-sources/assertj-assertions</excludeRoot>
</excludeRoots>
<excludes>
<exclude>**/InjectedTest.java</exclude>
</excludes>
<includeTests>true</includeTests>
<minimumTokens>50</minimumTokens>
<failOnViolation>false</failOnViolation>
</configuration>
<dependencies>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-compat6</artifactId>
<version>${pmd.version}</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
Expand All @@ -402,13 +403,85 @@
<artifactId>pmd-java</artifactId>
<version>${pmd.version}</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-javascript</artifactId>
<version>${pmd.version}</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-jsp</artifactId>
<version>${pmd.version}</version>
</dependency>
<dependency>
<groupId>edu.hm.hafner</groupId>
<artifactId>codingstyle</artifactId>
<version>${codingstyle.config.version}</version>
<classifier>config</classifier>
</dependency>
</dependencies>
<executions>
<execution>
<id>run-pmd-java</id>
<goals>
<goal>pmd</goal>
<goal>cpd</goal>
</goals>
<phase>verify</phase>
<configuration>
<targetDirectory>${project.build.directory}/pmd-java</targetDirectory>
<rulesets>
<ruleset>pmd-java-configuration.xml</ruleset>
</rulesets>
<includeTests>false</includeTests>
<minimumTokens>50</minimumTokens>
</configuration>
</execution>
<execution>
<id>run-pmd-tests</id>
<goals>
<goal>pmd</goal>
<goal>cpd</goal>
</goals>
<phase>verify</phase>
<configuration>
<targetDirectory>${project.build.directory}/pmd-tests</targetDirectory>
<rulesets>
<ruleset>pmd-tests-configuration.xml</ruleset>
</rulesets>
<includeTests>true</includeTests>
<minimumTokens>100</minimumTokens>
<excludeRoots>
<excludeRoot>src/main/java</excludeRoot>
<excludeRoot>${project.build.directory}/generated-test-sources/test-annotations</excludeRoot>
<excludeRoot>${project.build.directory}/generated-test-sources/assertj-assertions</excludeRoot>
</excludeRoots>
</configuration>
</execution>
<execution>
<id>run-pmd-javascript</id>
<goals>
<goal>pmd</goal>
</goals>
<phase>verify</phase>
<configuration>
<targetDirectory>${project.build.directory}/pmd-javascript</targetDirectory>
<rulesets>
<ruleset>pmd-javascript-configuration.xml</ruleset>
</rulesets>
<includeTests>false</includeTests>
<language>javascript</language>
<compileSourceRoots>
<compileSourceRoot>${basedir}/src/main/resources</compileSourceRoot>
<compileSourceRoot>${basedir}/src/main/webapp/js</compileSourceRoot>
</compileSourceRoots>
<includes>
<include>**/*.js</include>
</includes>
</configuration>
</execution>

</executions>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
Expand Down