From fd1f630dea492217f723d9dc0b35282eef517dd8 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Sat, 21 Oct 2023 12:39:27 +0200 Subject: [PATCH 01/18] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d6008f7d..360ee5e8 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ under the License. maven-checkstyle-plugin - 3.3.1 + 3.3.2-SNAPSHOT maven-plugin Apache Maven Checkstyle Plugin @@ -81,7 +81,7 @@ under the License. 1.11.1 3.12.1 3.3.0 - 2023-10-21T10:35:28Z + 2023-10-21T10:39:27Z From eb71af5742867c121636a66d0055425fec744071 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Tue, 14 Nov 2023 19:53:49 +0100 Subject: [PATCH 02/18] Consistently use MavenReport#getReportOutputDirectory() --- .../maven/plugins/checkstyle/AbstractCheckstyleReport.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java b/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java index 6ee09873..ef4bbc2f 100644 --- a/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java +++ b/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java @@ -685,7 +685,8 @@ private void initializeXrefTestLocation(CheckstyleReportRenderer renderer) { } private String determineRelativePath(File location) { - String relativePath = PathTool.getRelativePath(getOutputDirectory(), location.getAbsolutePath()); + String relativePath = PathTool.getRelativePath(getReportOutputDirectory().getAbsolutePath(), + location.getAbsolutePath()); if (relativePath == null || relativePath.trim().isEmpty()) { relativePath = "."; } From 56157e4c1d8c3dc25ee69a0dd35a92007ae126a6 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Fri, 17 Nov 2023 23:09:35 +0100 Subject: [PATCH 03/18] [MCHECKSTYLE-443] Upgrade to Parent 41 --- pom.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 360ee5e8..b2a6e997 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins - 40 + 41 @@ -170,7 +170,10 @@ under the License. org.codehaus.plexus plexus-utils - 3.5.1 + + + org.codehaus.plexus + plexus-xml org.codehaus.plexus From c3774d6fb58604183ddbfec6aa3304ce4fa49a01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 05:35:17 +0000 Subject: [PATCH 04/18] Bump org.codehaus.plexus:plexus-component-annotations Bumps [org.codehaus.plexus:plexus-component-annotations](https://github.com/codehaus-plexus/plexus-containers) from 2.1.0 to 2.1.1. - [Release notes](https://github.com/codehaus-plexus/plexus-containers/releases) - [Changelog](https://github.com/codehaus-plexus/plexus-containers/blob/master/ReleaseNotes.md) - [Commits](https://github.com/codehaus-plexus/plexus-containers/compare/plexus-containers-2.1.0...plexus-containers-2.1.1) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-component-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b2a6e997..a90512e0 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,7 @@ under the License. org.codehaus.plexus plexus-component-annotations - 2.1.0 + 2.1.1 org.codehaus.plexus From 12a21a47833ea73e16173c3aa98817e85eb4a8ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 05:34:51 +0000 Subject: [PATCH 05/18] Bump org.codehaus.plexus:plexus-component-metadata from 2.1.0 to 2.1.1 Bumps [org.codehaus.plexus:plexus-component-metadata](https://github.com/codehaus-plexus/plexus-containers) from 2.1.0 to 2.1.1. - [Release notes](https://github.com/codehaus-plexus/plexus-containers/releases) - [Changelog](https://github.com/codehaus-plexus/plexus-containers/blob/master/ReleaseNotes.md) - [Commits](https://github.com/codehaus-plexus/plexus-containers/compare/plexus-containers-2.1.0...plexus-containers-2.1.1) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-component-metadata dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a90512e0..f2a048bc 100644 --- a/pom.xml +++ b/pom.xml @@ -341,7 +341,7 @@ under the License. org.codehaus.plexus plexus-component-metadata - 2.1.0 + 2.1.1 From 61df54d979d22e3a736d831a009bc671bfa98742 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sat, 23 Dec 2023 03:08:05 +0100 Subject: [PATCH 06/18] Fix spotless --- .../maven/plugins/checkstyle/AbstractCheckstyleReport.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java b/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java index ef4bbc2f..51de7d93 100644 --- a/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java +++ b/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java @@ -685,8 +685,8 @@ private void initializeXrefTestLocation(CheckstyleReportRenderer renderer) { } private String determineRelativePath(File location) { - String relativePath = PathTool.getRelativePath(getReportOutputDirectory().getAbsolutePath(), - location.getAbsolutePath()); + String relativePath = + PathTool.getRelativePath(getReportOutputDirectory().getAbsolutePath(), location.getAbsolutePath()); if (relativePath == null || relativePath.trim().isEmpty()) { relativePath = "."; } From a96a4da1ec18a755f232fd3ac36ace42de8b7283 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 05:54:56 +0000 Subject: [PATCH 07/18] Bump org.codehaus.plexus:plexus-component-annotations Bumps [org.codehaus.plexus:plexus-component-annotations](https://github.com/codehaus-plexus/plexus-containers) from 2.1.1 to 2.2.0. - [Release notes](https://github.com/codehaus-plexus/plexus-containers/releases) - [Changelog](https://github.com/codehaus-plexus/plexus-containers/blob/master/ReleaseNotes.md) - [Commits](https://github.com/codehaus-plexus/plexus-containers/compare/plexus-containers-2.1.1...plexus-containers-2.2.0) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-component-annotations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f2a048bc..908aa856 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,7 @@ under the License. org.codehaus.plexus plexus-component-annotations - 2.1.1 + 2.2.0 org.codehaus.plexus From bf8014841e7709937bb761241b30afefd2004700 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Mon, 1 Jan 2024 21:19:58 +0100 Subject: [PATCH 08/18] Add .checkstyle to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f79c9285..8f9ebd5c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ out/ /bootstrap /dependencies.xml .java-version +.checkstyle \ No newline at end of file From 6521c2995ef17ddfacb654c6e5bc1bd8f5b65bd0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 02:29:58 +0000 Subject: [PATCH 09/18] Bump org.codehaus.plexus:plexus-component-metadata from 2.1.1 to 2.2.0 (#131) Bumps [org.codehaus.plexus:plexus-component-metadata](https://github.com/codehaus-plexus/plexus-containers) from 2.1.1 to 2.2.0. - [Release notes](https://github.com/codehaus-plexus/plexus-containers/releases) - [Changelog](https://github.com/codehaus-plexus/plexus-containers/blob/master/ReleaseNotes.md) - [Commits](https://github.com/codehaus-plexus/plexus-containers/compare/plexus-containers-2.1.1...plexus-containers-2.2.0) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-component-metadata dependency-type: direct:production update-type: version-update:semver-minor ... 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 908aa856..566fe885 100644 --- a/pom.xml +++ b/pom.xml @@ -341,7 +341,7 @@ under the License. org.codehaus.plexus plexus-component-metadata - 2.1.1 + 2.2.0 From 05df96b987b69b6137faccfe57108378752614a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 02:30:15 +0000 Subject: [PATCH 10/18] Bump org.apache.commons:commons-lang3 from 3.12.0 to 3.14.0 (#128) Bumps org.apache.commons:commons-lang3 from 3.12.0 to 3.14.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... 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 566fe885..efc60c14 100644 --- a/pom.xml +++ b/pom.xml @@ -196,7 +196,7 @@ under the License. org.apache.commons commons-lang3 - 3.12.0 + 3.14.0 From 34fcf3ea87a91bbe1a7511a6f393ca59066a30a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 02:30:31 +0000 Subject: [PATCH 11/18] Bump org.codehaus.mojo:build-helper-maven-plugin from 3.4.0 to 3.5.0 (#127) Bumps [org.codehaus.mojo:build-helper-maven-plugin](https://github.com/mojohaus/build-helper-maven-plugin) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/mojohaus/build-helper-maven-plugin/releases) - [Commits](https://github.com/mojohaus/build-helper-maven-plugin/compare/3.4.0...3.5.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:build-helper-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... 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 efc60c14..6714e3a1 100644 --- a/pom.xml +++ b/pom.xml @@ -298,7 +298,7 @@ under the License. org.codehaus.mojo build-helper-maven-plugin - 3.4.0 + 3.5.0 com.puppycrawl.tools @@ -209,7 +222,7 @@ under the License. org.slf4j slf4j-simple - 1.7.36 + ${slf4jVersion} test From e72bd83039bdee65126e36eebe58a175cbd39fc5 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Fri, 31 May 2024 22:38:23 +0200 Subject: [PATCH 17/18] [MCHECKSTYLE-448] Upgrade to Parent 42 and Maven 3.6.3 This closes #137 --- pom.xml | 54 ++++++++++++++++-------------------------------------- 1 file changed, 16 insertions(+), 38 deletions(-) diff --git a/pom.xml b/pom.xml index 5652407d..7b2602b9 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins - 41 + 42 @@ -74,8 +74,8 @@ under the License. 8 - 1.0.0.v20140518 - 3.2.5 + 3.6.3 + 1.4.1 9.3 1.7.36 1.11.1 @@ -238,27 +238,27 @@ under the License. - org.eclipse.aether - aether-api - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-api + ${resolverVersion} test - org.eclipse.aether - aether-impl - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-impl + ${resolverVersion} test - org.eclipse.aether - aether-connector-basic - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-connector-basic + ${resolverVersion} test - org.eclipse.aether - aether-transport-wagon - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-transport-wagon + ${resolverVersion} test @@ -302,28 +302,6 @@ under the License. - - org.codehaus.mojo - build-helper-maven-plugin - 3.5.0 - - - - parse-version - - parse-version - - - javaSignature - ${maven.compiler.target} - - - - org.codehaus.mojo animal-sniffer-maven-plugin @@ -331,7 +309,7 @@ under the License. org.codehaus.mojo.signature - java${javaSignature.majorVersion}${javaSignature.minorVersion} + java18 1.0 From 3af735f04cc3d6dd5e785d626043ecbe46a63395 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Sun, 2 Jun 2024 16:45:36 +0200 Subject: [PATCH 18/18] [maven-release-plugin] prepare release maven-checkstyle-plugin-3.4.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7b2602b9..2b75bbf8 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ under the License. maven-checkstyle-plugin - 3.3.2-SNAPSHOT + 3.4.0 maven-plugin Apache Maven Checkstyle Plugin @@ -54,7 +54,7 @@ under the License. scm:git:https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git scm:git:https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git - maven-checkstyle-plugin-3.3.1 + maven-checkstyle-plugin-3.4.0 https://github.com/apache/maven-checkstyle-plugin/tree/${project.scm.tag} @@ -82,7 +82,7 @@ under the License. 1.11.1 3.12.1 3.3.0 - 2023-10-21T10:39:27Z + 2024-06-02T14:45:09Z