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

Use PMD 7.0.0-rc4 for maven-pmd-plugin

Browse Source
This commit is contained in:
Andreas Dangel
2023-11-23 12:25:17 +01:00
parent b72c277e9b
commit da95ddb4e3
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/build.sh
View File

@ -323,10 +323,6 @@ function pmd_ci_dogfood() {
local mpmdVersion=() local mpmdVersion=()
./mvnw versions:set -DnewVersion="${PMD_CI_MAVEN_PROJECT_VERSION}-dogfood" -DgenerateBackupPoms=false ./mvnw versions:set -DnewVersion="${PMD_CI_MAVEN_PROJECT_VERSION}-dogfood" -DgenerateBackupPoms=false
sed -i 's/<version>[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}.*<\/version>\( *<!-- pmd.dogfood.version -->\)/<version>'"${PMD_CI_MAVEN_PROJECT_VERSION}"'<\/version>\1/' pom.xml sed -i 's/<version>[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}.*<\/version>\( *<!-- pmd.dogfood.version -->\)/<version>'"${PMD_CI_MAVEN_PROJECT_VERSION}"'<\/version>\1/' pom.xml
if [ "${PMD_CI_MAVEN_PROJECT_VERSION}" = "7.0.0-SNAPSHOT" ]; then
sed -i 's/pmd-dogfood-config\.xml/pmd-dogfood-config7.xml/' pom.xml
mpmdVersion=(-Denforcer.skip=true -Dpmd.plugin.version=3.21.1-pmd-7.0.0-SNAPSHOT)
fi
./mvnw verify --show-version --errors --batch-mode "${PMD_MAVEN_EXTRA_OPTS[@]}" \ ./mvnw verify --show-version --errors --batch-mode "${PMD_MAVEN_EXTRA_OPTS[@]}" \
"${mpmdVersion[@]}" \ "${mpmdVersion[@]}" \
-DskipTests \ -DskipTests \

14
pom.xml
View File

@ -441,7 +441,6 @@
<targetJdk>1.${java.version}</targetJdk> <targetJdk>1.${java.version}</targetJdk>
<rulesets> <rulesets>
<ruleset>/net/sourceforge/pmd/pmd-dogfood-config.xml</ruleset> <ruleset>/net/sourceforge/pmd/pmd-dogfood-config.xml</ruleset>
<ruleset>/net/sourceforge/pmd/pmd7-dogfood-config.xml</ruleset>
</rulesets> </rulesets>
<excludeRoots> <excludeRoots>
<excludeRoot>target/generated-sources/javacc</excludeRoot> <excludeRoot>target/generated-sources/javacc</excludeRoot>
@ -455,25 +454,30 @@
<dependencies> <dependencies>
<!-- Note: we can't use a property for the version here due to https://issues.apache.org/jira/browse/MRELEASE-932 --> <!-- 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 --> <!-- 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> <dependency>
<groupId>net.sourceforge.pmd</groupId> <groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId> <artifactId>pmd-core</artifactId>
<version>6.55.0</version> <!-- pmd.dogfood.version --> <version>7.0.0-rc4</version> <!-- pmd.dogfood.version -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sourceforge.pmd</groupId> <groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId> <artifactId>pmd-java</artifactId>
<version>6.55.0</version> <!-- pmd.dogfood.version --> <version>7.0.0-rc4</version> <!-- pmd.dogfood.version -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sourceforge.pmd</groupId> <groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-jsp</artifactId> <artifactId>pmd-jsp</artifactId>
<version>6.55.0</version> <!-- pmd.dogfood.version --> <version>7.0.0-rc4</version> <!-- pmd.dogfood.version -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sourceforge.pmd</groupId> <groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-javascript</artifactId> <artifactId>pmd-javascript</artifactId>
<version>6.55.0</version> <!-- pmd.dogfood.version --> <version>7.0.0-rc4</version> <!-- pmd.dogfood.version -->
</dependency> </dependency>
<!-- This contains the dogfood ruleset --> <!-- This contains the dogfood ruleset -->
<dependency> <dependency>