phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into pr-4726

Browse Source
This commit is contained in:
Andreas Dangel
2023-12-11 13:25:32 +01:00
parent 95ec080bf1 2862d36f4e
commit 65b4c38bca
115 changed files with 6781 additions and 1186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pom.xml
View File

@@ -99,7 +99,7 @@
<surefire.version>3.0.0-M8</surefire.version>
<checkstyle.version>10.7.0</checkstyle.version>
<checkstyle.plugin.version>3.2.1</checkstyle.plugin.version>
<pmd.plugin.version>3.20.0</pmd.plugin.version>
<pmd.plugin.version>3.21.2</pmd.plugin.version>
<ant.version>1.10.13</ant.version>
<javadoc.plugin.version>3.4.1</javadoc.plugin.version>
<antlr.version>4.9.1</antlr.version>
@@ -113,7 +113,7 @@
<argLine>-Xmx512m -Dfile.encoding=${project.build.sourceEncoding} ${extraArgLine}</argLine>
<extraArgLine /> <!-- empty by default, profiles set it as needed -->
<pmd.build-tools.version>22</pmd.build-tools.version>
<pmd.build-tools.version>23-SNAPSHOT</pmd.build-tools.version>
<pmd-designer.version>7.0.0-rc4</pmd-designer.version>
<javacc.jar>${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar</javacc.jar>
@@ -441,7 +441,6 @@
<targetJdk>1.${java.version}</targetJdk>
<rulesets>
<ruleset>/net/sourceforge/pmd/pmd-dogfood-config.xml</ruleset>
<ruleset>/net/sourceforge/pmd/pmd7-dogfood-config.xml</ruleset>
</rulesets>
<excludeRoots>
<excludeRoot>target/generated-sources/javacc</excludeRoot>
@@ -455,25 +454,30 @@
<dependencies>
<!-- Note: we can't use a property for the version here due to https://issues.apache.org/jira/browse/MRELEASE-932 -->
<!-- We use the comment "pmd.dogfood.version" as a marker and manually change the version - see .ci/build.sh -->
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-compat6</artifactId>
<version>7.0.0-rc4</version> <!-- pmd.dogfood.version -->
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>6.55.0</version> <!-- pmd.dogfood.version -->
<version>7.0.0-rc4</version> <!-- pmd.dogfood.version -->
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>6.55.0</version> <!-- pmd.dogfood.version -->
<version>7.0.0-rc4</version> <!-- pmd.dogfood.version -->
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-jsp</artifactId>
<version>6.55.0</version> <!-- pmd.dogfood.version -->
<version>7.0.0-rc4</version> <!-- pmd.dogfood.version -->
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-javascript</artifactId>
<version>6.55.0</version> <!-- pmd.dogfood.version -->
<version>7.0.0-rc4</version> <!-- pmd.dogfood.version -->
</dependency>
<!-- This contains the dogfood ruleset -->
<dependency>
@@ -750,7 +754,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.33</version>
<version>2.2</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -1185,6 +1189,18 @@
<module>pmd-dist</module>
</modules>
</profile>
<profile>
<id>pmd-compat6-module</id>
<activation>
<property>
<name>!skip-pmd-compat6</name>
</property>
</activation>
<modules>
<module>pmd-compat6</module>
</modules>
</profile>
</profiles>
<modules>