From 5634604b79639ec40d99af8a50e68953ffc1ed48 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 1 Sep 2022 11:45:10 +0200 Subject: [PATCH 01/15] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c7ae5fe0..a864d7ab 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ under the License. maven-pmd-plugin - 3.19.0 + 3.19.1-SNAPSHOT maven-plugin Apache Maven PMD Plugin @@ -67,7 +67,7 @@ under the License. scm:git:https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git scm:git:https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git https://github.com/apache/maven-pmd-plugin/tree/${project.scm.tag} - maven-pmd-plugin-3.19.0 + HEAD JIRA @@ -95,7 +95,7 @@ under the License. 3.12.1 3.4.1 3.3.0 - 2022-09-01T09:43:57Z + 2022-09-01T09:45:10Z From e94736992c7cc7efd27dfae98ab96c8f688e3c6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Sep 2022 17:45:51 +0200 Subject: [PATCH 02/15] Bump release-drafter/release-drafter from 5.20.1 to 5.21.0 (#93) Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 5.20.1 to 5.21.0. - [Release notes](https://github.com/release-drafter/release-drafter/releases) - [Commits](https://github.com/release-drafter/release-drafter/compare/v5.20.1...v5.21.0) --- updated-dependencies: - dependency-name: release-drafter/release-drafter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release-drafter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 76113c0a..71d38e6d 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -24,6 +24,6 @@ jobs: update_release_draft: runs-on: ubuntu-latest steps: - - uses: release-drafter/release-drafter@v5.20.1 + - uses: release-drafter/release-drafter@v5.21.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 2ca4c8f6fdd2bfc191b64424de70846d577b432a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Sep 2022 17:46:27 +0200 Subject: [PATCH 03/15] Bump maven-common-artifact-filters from 3.3.1 to 3.3.2 (#95) Bumps [maven-common-artifact-filters](https://github.com/apache/maven-common-artifact-filters) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/apache/maven-common-artifact-filters/releases) - [Commits](https://github.com/apache/maven-common-artifact-filters/compare/maven-common-artifact-filters-3.3.1...maven-common-artifact-filters-3.3.2) --- updated-dependencies: - dependency-name: org.apache.maven.shared:maven-common-artifact-filters dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a864d7ab..2a7de8c4 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ under the License. org.apache.maven.shared maven-common-artifact-filters - 3.3.1 + 3.3.2 org.apache.maven From 1d1116efe4452bb047015486b635b900d8814ec1 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 19:57:25 +0200 Subject: [PATCH 04/15] [MPMD-356] - Upgrade to PMD 6.50.0 (#98) --- pom.xml | 2 +- src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2a7de8c4..e849611c 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ under the License. 1.11.1 1.11.1 8 - 6.49.0 + 6.50.0 1.7.36 1.0.0.v20140518 3.12.1 diff --git a/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm b/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm index b6128e03..5d56fda7 100644 --- a/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm +++ b/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm @@ -88,6 +88,8 @@ Upgrading PMD at Runtime *--------------------------------------------------------------------------------*--------------------------------------------------* | <> | <> | *--------------------------------------------------------------------------------*--------------------------------------------------* +| {{{https://maven.apache.org/plugins-archives/maven-pmd-plugin-3.20.0/}3.20.0}} | {{{https://pmd.github.io/pmd-6.50.0/}6.50.0}} | +*--------------------------------------------------------------------------------*--------------------------------------------------* | {{{https://maven.apache.org/plugins-archives/maven-pmd-plugin-3.19.0/}3.19.0}} | {{{https://pmd.github.io/pmd-6.49.0/}6.49.0}} | *--------------------------------------------------------------------------------*--------------------------------------------------* | {{{https://maven.apache.org/plugins-archives/maven-pmd-plugin-3.18.0/}3.18.0}} | {{{https://pmd.github.io/pmd-6.48.0/}6.48.0}} | From 8db6bb5f841f7a26bd8182b550fccf336f86fe3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 14:42:43 +0200 Subject: [PATCH 05/15] Bump release-drafter/release-drafter from 5.21.0 to 5.21.1 (#99) Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 5.21.0 to 5.21.1. - [Release notes](https://github.com/release-drafter/release-drafter/releases) - [Commits](https://github.com/release-drafter/release-drafter/compare/v5.21.0...v5.21.1) --- updated-dependencies: - dependency-name: release-drafter/release-drafter dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release-drafter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 71d38e6d..b307d81b 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -24,6 +24,6 @@ jobs: update_release_draft: runs-on: ubuntu-latest steps: - - uses: release-drafter/release-drafter@v5.21.0 + - uses: release-drafter/release-drafter@v5.21.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 7b6623bb49d3bf48f5e8c6b57279bca1cc1e12ef Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 29 Oct 2022 13:21:37 +0200 Subject: [PATCH 06/15] [MPMD-357] - Upgrade to PMD 6.51.0 (#100) --- pom.xml | 2 +- src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e849611c..3d8957fb 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ under the License. 1.11.1 1.11.1 8 - 6.50.0 + 6.51.0 1.7.36 1.0.0.v20140518 3.12.1 diff --git a/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm b/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm index 5d56fda7..a61cd09b 100644 --- a/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm +++ b/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm @@ -88,7 +88,7 @@ Upgrading PMD at Runtime *--------------------------------------------------------------------------------*--------------------------------------------------* | <> | <> | *--------------------------------------------------------------------------------*--------------------------------------------------* -| {{{https://maven.apache.org/plugins-archives/maven-pmd-plugin-3.20.0/}3.20.0}} | {{{https://pmd.github.io/pmd-6.50.0/}6.50.0}} | +| {{{https://maven.apache.org/plugins-archives/maven-pmd-plugin-3.20.0/}3.20.0}} | {{{https://pmd.github.io/pmd-6.51.0/}6.51.0}} | *--------------------------------------------------------------------------------*--------------------------------------------------* | {{{https://maven.apache.org/plugins-archives/maven-pmd-plugin-3.19.0/}3.19.0}} | {{{https://pmd.github.io/pmd-6.49.0/}6.49.0}} | *--------------------------------------------------------------------------------*--------------------------------------------------* From 92434d0d96ebe37a5fb599fa6c3120ab5c7863f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Wed, 2 Nov 2022 23:21:04 +0100 Subject: [PATCH 07/15] add Reproducible Builds badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0fcaa94b..89be25f0 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ Contributing to [Apache Maven PMD Plugin](https://maven.apache.org/plugins/maven [![ASF Jira](https://img.shields.io/endpoint?url=https%3A%2F%2Fmaven.apache.org%2Fbadges%2Fasf_jira-MPMD.json)][jira] [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)][license] [![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.plugins/maven-pmd-plugin.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.maven.plugins/maven-pmd-plugin) +[![Reproducible Builds](https://img.shields.io/badge/Reproducible_Builds-ok-green?labelColor=blue)](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/apache/maven/plugins/maven-pmd-plugin/README.md) [![GitHub CI](https://github.com/apache/maven-pmd-plugin/actions/workflows/maven-verify.yml/badge.svg)](https://github.com/apache/maven-pmd-plugin/actions/workflows/maven-verify.yml) [![Jenkins Status](https://img.shields.io/jenkins/s/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-pmd-plugin/job/master.svg?)][build] [![Jenkins tests](https://img.shields.io/jenkins/t/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-pmd-plugin/job/master.svg?)][test-results] From cd954cc768c4bfc30440cda53c081a4640fe8548 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 17 Nov 2022 15:59:43 +0100 Subject: [PATCH 08/15] [MPMD-335] - Aggregate mode doesn't use additional repositories --- .../invoker.properties | 18 ++++++ .../mpmd335-module1/pom.xml | 40 ++++++++++++ .../src/main/java/org/example/Foo.java | 26 ++++++++ .../pom.xml | 63 +++++++++++++++++++ .../mpmd335-dependency1-1.0.0-SNAPSHOT.pom | 28 +++++++++ .../verify.groovy | 24 +++++++ .../apache/maven/plugins/pmd/PmdReport.java | 2 + 7 files changed, 201 insertions(+) create mode 100644 src/it/MPMD-335-aggregate-classpath-repositories/invoker.properties create mode 100644 src/it/MPMD-335-aggregate-classpath-repositories/mpmd335-module1/pom.xml create mode 100644 src/it/MPMD-335-aggregate-classpath-repositories/mpmd335-module1/src/main/java/org/example/Foo.java create mode 100644 src/it/MPMD-335-aggregate-classpath-repositories/pom.xml create mode 100644 src/it/MPMD-335-aggregate-classpath-repositories/private-repo/org/apache/maven/plugins/pmd/it/mpmd335-dependency1/1.0.0-SNAPSHOT/mpmd335-dependency1-1.0.0-SNAPSHOT.pom create mode 100644 src/it/MPMD-335-aggregate-classpath-repositories/verify.groovy diff --git a/src/it/MPMD-335-aggregate-classpath-repositories/invoker.properties b/src/it/MPMD-335-aggregate-classpath-repositories/invoker.properties new file mode 100644 index 00000000..71033d78 --- /dev/null +++ b/src/it/MPMD-335-aggregate-classpath-repositories/invoker.properties @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +invoker.goals = verify diff --git a/src/it/MPMD-335-aggregate-classpath-repositories/mpmd335-module1/pom.xml b/src/it/MPMD-335-aggregate-classpath-repositories/mpmd335-module1/pom.xml new file mode 100644 index 00000000..f71a3155 --- /dev/null +++ b/src/it/MPMD-335-aggregate-classpath-repositories/mpmd335-module1/pom.xml @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.plugins.pmd.it + mpmd335-parent + 1.0.0-SNAPSHOT + + mpmd335-module1 + + + + org.apache.maven.plugins.pmd.it + mpmd335-dependency1 + 1.0.0-SNAPSHOT + pom + + + + diff --git a/src/it/MPMD-335-aggregate-classpath-repositories/mpmd335-module1/src/main/java/org/example/Foo.java b/src/it/MPMD-335-aggregate-classpath-repositories/mpmd335-module1/src/main/java/org/example/Foo.java new file mode 100644 index 00000000..fd3cfbff --- /dev/null +++ b/src/it/MPMD-335-aggregate-classpath-repositories/mpmd335-module1/src/main/java/org/example/Foo.java @@ -0,0 +1,26 @@ +package org.example; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + +public class Foo +{ + +} diff --git a/src/it/MPMD-335-aggregate-classpath-repositories/pom.xml b/src/it/MPMD-335-aggregate-classpath-repositories/pom.xml new file mode 100644 index 00000000..a5533b5d --- /dev/null +++ b/src/it/MPMD-335-aggregate-classpath-repositories/pom.xml @@ -0,0 +1,63 @@ + + + + + + 4.0.0 + org.apache.maven.plugins.pmd.it + mpmd335-parent + 1.0.0-SNAPSHOT + pom + + + UTF-8 + + + + mpmd335-module1 + + + + + + org.apache.maven.plugins + maven-pmd-plugin + @project.version@ + + true + + + + + check + + + + + + + + + + corp1 + file://${user.dir}/private-repo + + + diff --git a/src/it/MPMD-335-aggregate-classpath-repositories/private-repo/org/apache/maven/plugins/pmd/it/mpmd335-dependency1/1.0.0-SNAPSHOT/mpmd335-dependency1-1.0.0-SNAPSHOT.pom b/src/it/MPMD-335-aggregate-classpath-repositories/private-repo/org/apache/maven/plugins/pmd/it/mpmd335-dependency1/1.0.0-SNAPSHOT/mpmd335-dependency1-1.0.0-SNAPSHOT.pom new file mode 100644 index 00000000..ea3473cc --- /dev/null +++ b/src/it/MPMD-335-aggregate-classpath-repositories/private-repo/org/apache/maven/plugins/pmd/it/mpmd335-dependency1/1.0.0-SNAPSHOT/mpmd335-dependency1-1.0.0-SNAPSHOT.pom @@ -0,0 +1,28 @@ + + + + + + 4.0.0 + org.apache.maven.plugins.pmd.it + mpmd335-dependency1 + 1.0.0-SNAPSHOT + pom + diff --git a/src/it/MPMD-335-aggregate-classpath-repositories/verify.groovy b/src/it/MPMD-335-aggregate-classpath-repositories/verify.groovy new file mode 100644 index 00000000..42740149 --- /dev/null +++ b/src/it/MPMD-335-aggregate-classpath-repositories/verify.groovy @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +File buildLog = new File( basedir, 'build.log' ) +assert buildLog.exists() +assert !buildLog.text.contains( 'pmd failed: org.apache.maven.reporting.MavenReportException' ) +assert !buildLog.text.contains( 'org.eclipse.aether.resolution.DependencyResolutionException' ) +assert !buildLog.text.contains( 'Could not find artifact org.apache.maven.plugins.pmd.it:mpmd335-dependency1:pom:1.0.0-SNAPSHOT' ) diff --git a/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java b/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java index 72f923a2..362a6038 100644 --- a/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java +++ b/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java @@ -552,6 +552,8 @@ private String determineAuxClasspath() throws MavenReportException { ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest( session.getProjectBuildingRequest() ); + // use any additional configured repo as well + buildingRequest.getRemoteRepositories().addAll( localProject.getRemoteArtifactRepositories() ); Iterable resolvedDependencies = dependencyResolver.resolveDependencies( buildingRequest, localProject.getDependencies(), null, filter ); From 255a35a9a5aee4cc5549915d55a4292eed85bb67 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 24 Nov 2022 14:16:20 +0100 Subject: [PATCH 09/15] (doc) Update releasenotes.md --- src/site/markdown/releasenotes.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/site/markdown/releasenotes.md b/src/site/markdown/releasenotes.md index 300e5571..1b9da893 100644 --- a/src/site/markdown/releasenotes.md +++ b/src/site/markdown/releasenotes.md @@ -21,6 +21,26 @@ under the License. # Release Notes +## Version 3.20.0 + +**Release Date:** ????-??-?? + +**JIRA:** [Release Notes - Maven PMD Plugin - Version 3.20.0](https://issues.apache.org/jira/projects/MPMD/versions/12352270) + +**GitHub:** + +### 🐛 Bug Fixes + +* [MPMD-335](https://issues.apache.org/jira/browse/MPMD-335) - Aggregate mode doesn't use additional repositories ([#101](https://github.com/apache/maven-pmd-plugin/pull/101)) @adangel + +### 📦 Dependency updates + +* [MPMD-357](https://issues.apache.org/jira/browse/MPMD-357) - Upgrade to PMD 6.51.0 ([#100](https://github.com/apache/maven-pmd-plugin/pull/100)) @adangel +* Bump release-drafter/release-drafter from 5.21.0 to 5.21.1 ([#99](https://github.com/apache/maven-pmd-plugin/pull/99)) @dependabot +* [MPMD-356](https://issues.apache.org/jira/browse/MPMD-356) - Upgrade to PMD 6.50.0 ([#98](https://github.com/apache/maven-pmd-plugin/pull/98)) @adangel +* Bump maven-common-artifact-filters from 3.3.1 to 3.3.2 ([#95](https://github.com/apache/maven-pmd-plugin/pull/95)) @dependabot +* Bump release-drafter/release-drafter from 5.20.1 to 5.21.0 ([#93](https://github.com/apache/maven-pmd-plugin/pull/93)) @dependabot + ## Version 3.19.0 **Release Date:** 2022-09-01 From 1dcc7c168f959947af10294ec9c8a7dfd46c42e5 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 24 Nov 2022 14:17:09 +0100 Subject: [PATCH 10/15] Set next development version to 3.20.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d8957fb..3a46fc9f 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ under the License. maven-pmd-plugin - 3.19.1-SNAPSHOT + 3.20.0-SNAPSHOT maven-plugin Apache Maven PMD Plugin From 6ee27fccaded3d5477e206f915ef1fe5370a245d Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 26 Nov 2022 11:48:22 +0100 Subject: [PATCH 11/15] [MPMD-358] - Upgrade to PMD 6.52.0 (#104) --- pom.xml | 2 +- src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm | 2 +- src/site/markdown/releasenotes.md | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3a46fc9f..6722c474 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ under the License. 1.11.1 1.11.1 8 - 6.51.0 + 6.52.0 1.7.36 1.0.0.v20140518 3.12.1 diff --git a/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm b/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm index a61cd09b..22044c1a 100644 --- a/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm +++ b/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm @@ -88,7 +88,7 @@ Upgrading PMD at Runtime *--------------------------------------------------------------------------------*--------------------------------------------------* | <> | <> | *--------------------------------------------------------------------------------*--------------------------------------------------* -| {{{https://maven.apache.org/plugins-archives/maven-pmd-plugin-3.20.0/}3.20.0}} | {{{https://pmd.github.io/pmd-6.51.0/}6.51.0}} | +| {{{https://maven.apache.org/plugins-archives/maven-pmd-plugin-3.20.0/}3.20.0}} | {{{https://pmd.github.io/pmd-6.52.0/}6.52.0}} | *--------------------------------------------------------------------------------*--------------------------------------------------* | {{{https://maven.apache.org/plugins-archives/maven-pmd-plugin-3.19.0/}3.19.0}} | {{{https://pmd.github.io/pmd-6.49.0/}6.49.0}} | *--------------------------------------------------------------------------------*--------------------------------------------------* diff --git a/src/site/markdown/releasenotes.md b/src/site/markdown/releasenotes.md index 1b9da893..a6a8eb8f 100644 --- a/src/site/markdown/releasenotes.md +++ b/src/site/markdown/releasenotes.md @@ -35,6 +35,7 @@ under the License. ### 📦 Dependency updates +* [MPMD-358](https://issues.apache.org/jira/browse/MPMD-358) - Upgrade to PMD 6.52.0 ([#104](https://github.com/apache/maven-pmd-plugin/pull/104)) @adangel * [MPMD-357](https://issues.apache.org/jira/browse/MPMD-357) - Upgrade to PMD 6.51.0 ([#100](https://github.com/apache/maven-pmd-plugin/pull/100)) @adangel * Bump release-drafter/release-drafter from 5.21.0 to 5.21.1 ([#99](https://github.com/apache/maven-pmd-plugin/pull/99)) @dependabot * [MPMD-356](https://issues.apache.org/jira/browse/MPMD-356) - Upgrade to PMD 6.50.0 ([#98](https://github.com/apache/maven-pmd-plugin/pull/98)) @adangel From 3c7a47ef29d75ae5c4b0f50e7579c91ab8b9b867 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Mon, 12 Dec 2022 00:10:53 +0100 Subject: [PATCH 12/15] Remove method available from super class --- .../apache/maven/plugins/pmd/AbstractPmdReport.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java b/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java index fcc9c2d1..c262397e 100644 --- a/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java +++ b/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java @@ -36,7 +36,6 @@ import java.util.Set; import java.util.TreeMap; -import org.apache.maven.doxia.siterenderer.Renderer; import org.apache.maven.execution.MavenSession; import org.apache.maven.model.ReportPlugin; import org.apache.maven.model.Reporting; @@ -274,15 +273,6 @@ protected MavenProject getProject() return project; } - /** - * {@inheritDoc} - */ - @Override - protected Renderer getSiteRenderer() - { - return siteRenderer; - } - protected String constructXRefLocation( boolean test ) { String location = null; From b65c7a6a7feb7ff25b6316e6aeb80114fc472648 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 31 Dec 2022 19:12:38 +0100 Subject: [PATCH 13/15] [MPMD-360] - Upgrade to PMD 6.53.0 (#109) --- pom.xml | 2 +- src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm | 2 +- src/site/markdown/releasenotes.md | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6722c474..3ba228a7 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ under the License. 1.11.1 1.11.1 8 - 6.52.0 + 6.53.0 1.7.36 1.0.0.v20140518 3.12.1 diff --git a/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm b/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm index 22044c1a..5b06d31f 100644 --- a/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm +++ b/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm @@ -88,7 +88,7 @@ Upgrading PMD at Runtime *--------------------------------------------------------------------------------*--------------------------------------------------* | <> | <> | *--------------------------------------------------------------------------------*--------------------------------------------------* -| {{{https://maven.apache.org/plugins-archives/maven-pmd-plugin-3.20.0/}3.20.0}} | {{{https://pmd.github.io/pmd-6.52.0/}6.52.0}} | +| {{{https://maven.apache.org/plugins-archives/maven-pmd-plugin-3.20.0/}3.20.0}} | {{{https://pmd.github.io/pmd-6.53.0/}6.53.0}} | *--------------------------------------------------------------------------------*--------------------------------------------------* | {{{https://maven.apache.org/plugins-archives/maven-pmd-plugin-3.19.0/}3.19.0}} | {{{https://pmd.github.io/pmd-6.49.0/}6.49.0}} | *--------------------------------------------------------------------------------*--------------------------------------------------* diff --git a/src/site/markdown/releasenotes.md b/src/site/markdown/releasenotes.md index a6a8eb8f..dcdde39e 100644 --- a/src/site/markdown/releasenotes.md +++ b/src/site/markdown/releasenotes.md @@ -35,6 +35,7 @@ under the License. ### 📦 Dependency updates +* [MPMD-360](https://issues.apache.org/jira/browse/MPMD-360) - Upgrade to PMD 6.53.0 ([#109](https://github.com/apache/maven-pmd-plugin/pull/109)) @adangel * [MPMD-358](https://issues.apache.org/jira/browse/MPMD-358) - Upgrade to PMD 6.52.0 ([#104](https://github.com/apache/maven-pmd-plugin/pull/104)) @adangel * [MPMD-357](https://issues.apache.org/jira/browse/MPMD-357) - Upgrade to PMD 6.51.0 ([#100](https://github.com/apache/maven-pmd-plugin/pull/100)) @adangel * Bump release-drafter/release-drafter from 5.21.0 to 5.21.1 ([#99](https://github.com/apache/maven-pmd-plugin/pull/99)) @dependabot From f3e188aed9812c38655b7c42ae5620f1d18705ab Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Fri, 6 Jan 2023 22:52:57 +0100 Subject: [PATCH 14/15] [MPMD-361] Explicitly start and end tables with Doxia Sinks in report renderers --- .../org/apache/maven/plugins/pmd/CpdReportGenerator.java | 2 ++ .../org/apache/maven/plugins/pmd/PmdReportGenerator.java | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/org/apache/maven/plugins/pmd/CpdReportGenerator.java b/src/main/java/org/apache/maven/plugins/pmd/CpdReportGenerator.java index 34a07029..18230556 100644 --- a/src/main/java/org/apache/maven/plugins/pmd/CpdReportGenerator.java +++ b/src/main/java/org/apache/maven/plugins/pmd/CpdReportGenerator.java @@ -165,6 +165,7 @@ public void generate( List duplications ) String code = duplication.getCodefragment(); sink.table(); + sink.tableRows( null, false ); sink.tableRow(); sink.tableHeaderCell(); sink.text( bundle.getString( "report.cpd.column.file" ) ); @@ -201,6 +202,7 @@ public void generate( List duplications ) sink.verbatim_(); sink.rawText( "" ); sink.tableRow_(); + sink.tableRows_(); sink.table_(); } diff --git a/src/main/java/org/apache/maven/plugins/pmd/PmdReportGenerator.java b/src/main/java/org/apache/maven/plugins/pmd/PmdReportGenerator.java index e266cb56..623b7c94 100644 --- a/src/main/java/org/apache/maven/plugins/pmd/PmdReportGenerator.java +++ b/src/main/java/org/apache/maven/plugins/pmd/PmdReportGenerator.java @@ -166,6 +166,7 @@ private void startFileSection( int level, String currentFilename, PmdFileInfo fi sink.sectionTitle_( level ); sink.table(); + sink.tableRows( null, false ); sink.tableRow(); sink.tableHeaderCell(); sink.text( bundle.getString( "report.pmd.column.rule" ) ); @@ -187,6 +188,7 @@ private void startFileSection( int level, String currentFilename, PmdFileInfo fi private void endFileSection( int level ) { + sink.tableRows_(); sink.table_(); sink.section_( level ); } @@ -406,6 +408,7 @@ public int compare( SuppressedViolation o1, SuppressedViolation o2 ) } ); sink.table(); + sink.tableRows( null, false ); sink.tableRow(); sink.tableHeaderCell(); sink.text( bundle.getString( "report.pmd.suppressedViolations.column.filename" ) ); @@ -448,6 +451,7 @@ public int compare( SuppressedViolation o1, SuppressedViolation o2 ) sink.tableRow_(); } + sink.tableRows_(); sink.table_(); sink.section1_(); } @@ -471,6 +475,7 @@ public int compare( ProcessingError e1, ProcessingError e2 ) sink.sectionTitle1_(); sink.table(); + sink.tableRows( null, false ); sink.tableRow(); sink.tableHeaderCell(); sink.text( bundle.getString( "report.pmd.processingErrors.column.filename" ) ); @@ -485,6 +490,7 @@ public int compare( ProcessingError e1, ProcessingError e2 ) processSingleProcessingError( error ); } + sink.tableRows_(); sink.table_(); sink.section1_(); From 55c4d404a1109eded89ae760c92e0cad0b5be10e Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Fri, 6 Jan 2023 23:00:24 +0100 Subject: [PATCH 15/15] [maven-release-plugin] prepare release maven-pmd-plugin-3.20.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3ba228a7..83bb60b2 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ under the License. maven-pmd-plugin - 3.20.0-SNAPSHOT + 3.20.0 maven-plugin Apache Maven PMD Plugin @@ -67,7 +67,7 @@ under the License. scm:git:https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git scm:git:https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git https://github.com/apache/maven-pmd-plugin/tree/${project.scm.tag} - HEAD + maven-pmd-plugin-3.20.0 JIRA @@ -95,7 +95,7 @@ under the License. 3.12.1 3.4.1 3.3.0 - 2022-09-01T09:45:10Z + 2023-01-06T21:59:45Z