From 6d2a6d3861d57390cf5e64d4f21bcae5fbd324ab Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 15 Dec 2022 11:50:57 +0100 Subject: [PATCH 01/16] [gitflow-maven-plugin] Update for next development version 49-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd4d938..b6516a0 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ io.wcm.maven io.wcm.maven.global-parent - 48 + 49-SNAPSHOT pom io.wcm.maven.global-parent From 1e67e721c9fb9fab667501435a8a576fb7c4b640 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Dec 2022 14:06:58 +0000 Subject: [PATCH 02/16] Bump versions-maven-plugin from 2.13.0 to 2.14.1 Bumps [versions-maven-plugin](https://github.com/mojohaus/versions) from 2.13.0 to 2.14.1. - [Release notes](https://github.com/mojohaus/versions/releases) - [Changelog](https://github.com/mojohaus/versions/blob/master/ReleaseNotes.md) - [Commits](https://github.com/mojohaus/versions/compare/2.13.0...2.14.1) --- updated-dependencies: - dependency-name: org.codehaus.mojo:versions-maven-plugin 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 b6516a0..4c43ae4 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ 1.12.0 6.52.0 0.8.8 - 2.13.0 + 2.14.1 disabled From cb42e94c030a44e278f076eaa06faaa621eae8d5 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 15 Dec 2022 15:25:03 +0100 Subject: [PATCH 03/16] update changelog --- changes.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes.xml b/changes.xml index 1c28536..fadfe13 100644 --- a/changes.xml +++ b/changes.xml @@ -23,6 +23,12 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> + + + Update plugins and dependencies to latest versions. + + + Update plugins and dependencies to latest versions. From 5644edd3c9d23f5e984120bad53a8d4d479a1ddc Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Fri, 16 Dec 2022 08:54:47 +0100 Subject: [PATCH 04/16] Minimum Java Version supported is Java 11. Java 8 is no longer supported. --- .github/workflows/maven-build.yml | 2 +- .github/workflows/maven-deploy.yml | 6 +++--- changes.xml | 5 ++++- pom.xml | 23 +++++++++++++++++------ 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 0b56a1c..d2f8c81 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -19,7 +19,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - java: [8, 11, 17] + java: [11, 17] os: [ubuntu-latest] distribution: [temurin] diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml index 89c709a..c2af680 100644 --- a/.github/workflows/maven-deploy.yml +++ b/.github/workflows/maven-deploy.yml @@ -1,4 +1,4 @@ -# Deploy snapshots to Sonatpe OSS repository and deploy site to GitHub Pages +# Deploy snapshots to Sonatype OSS repository and deploy site to GitHub Pages name: Deploy @@ -26,8 +26,8 @@ jobs: uses: actions/setup-java@v2 with: distribution: temurin - java-version: 8 - cache: 'maven' + java-version: 11 + cache: maven - name: Build, verify, deploy, generate site env: diff --git a/changes.xml b/changes.xml index fadfe13..2714f68 100644 --- a/changes.xml +++ b/changes.xml @@ -23,7 +23,10 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> - + + Minimum Java Version supported is Java 11. Java 8 is no longer supported. + ]]> Update plugins and dependencies to latest versions. diff --git a/pom.xml b/pom.xml index 4c43ae4..4f70311 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ io.wcm.maven io.wcm.maven.global-parent - 49-SNAPSHOT + 50-SNAPSHOT pom io.wcm.maven.global-parent @@ -72,11 +72,10 @@ ${maven.test.skip} - - 1.8 + + 11 ${java.version} ${java.version} - ${build.compiler.target} @@ -258,6 +257,19 @@ org.apache.maven.plugins maven-enforcer-plugin + + enforce-default-java-min + + enforce + + + + + [11,] + + + + enforce-default @@ -592,8 +604,7 @@ com.puppycrawl.tools checkstyle - - 9.3 + 10.5.0 From 5f10c58f4028ac64b39791a889fecab3c1fe30f4 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Fri, 16 Dec 2022 08:59:08 +0100 Subject: [PATCH 05/16] update to maven-site-plugin 4.0.0-M4 --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4f70311..b172920 100644 --- a/pom.xml +++ b/pom.xml @@ -688,8 +688,7 @@ org.apache.maven.plugins maven-site-plugin - - 3.12.1 + 4.0.0-M4 From 2fc2e632dc259bf5211541dc4f7766fbfb0b1ee4 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Fri, 16 Dec 2022 12:23:27 +0100 Subject: [PATCH 06/16] update github actions --- .github/workflows/maven-build.yml | 6 +++--- .github/workflows/maven-deploy.yml | 4 ++-- .github/workflows/release-from-tag.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index d2f8c81..33b6b32 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -25,14 +25,14 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} - cache: 'maven' + cache: maven - name: Build and verify run: ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean verify diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml index c2af680..10167b9 100644 --- a/.github/workflows/maven-deploy.yml +++ b/.github/workflows/maven-deploy.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Configure GIT run: | @@ -23,7 +23,7 @@ jobs: git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}" - name: Setup JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: temurin java-version: 11 diff --git a/.github/workflows/release-from-tag.yml b/.github/workflows/release-from-tag.yml index 55ea2b5..a8f67b3 100644 --- a/.github/workflows/release-from-tag.yml +++ b/.github/workflows/release-from-tag.yml @@ -12,7 +12,7 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ncipollo/release-action@v1 with: body: 'Changes: https://github.com/wcm-io/io.wcm.maven.global-parent/blob/develop/changes.xml' From e7f0071465d209b3eb75d3dd70c29f75c2f68c1f Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Fri, 16 Dec 2022 12:47:03 +0100 Subject: [PATCH 07/16] Revert "update to maven-site-plugin 4.0.0-M4" This reverts commit 5f10c58f4028ac64b39791a889fecab3c1fe30f4. --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b172920..4f70311 100644 --- a/pom.xml +++ b/pom.xml @@ -688,7 +688,8 @@ org.apache.maven.plugins maven-site-plugin - 4.0.0-M4 + + 3.12.1 From 0dee2205f9de3700bd7ac9933acc7c066572949f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Dec 2022 14:13:50 +0000 Subject: [PATCH 08/16] Bump maven-invoker-plugin from 3.3.0 to 3.4.0 Bumps [maven-invoker-plugin](https://github.com/apache/maven-invoker-plugin) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/apache/maven-invoker-plugin/releases) - [Commits](https://github.com/apache/maven-invoker-plugin/compare/maven-invoker-plugin-3.3.0...maven-invoker-plugin-3.4.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-invoker-plugin 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 4f70311..c07e0bd 100644 --- a/pom.xml +++ b/pom.xml @@ -731,7 +731,7 @@ org.apache.maven.plugins maven-invoker-plugin - 3.3.0 + 3.4.0 From 4254d856aebba141f475afa8ac2e03e31320fd62 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Wed, 21 Dec 2022 12:10:55 +0100 Subject: [PATCH 09/16] Enforce that all local dependencies have an explicit scope set. --- changes.xml | 3 +++ pom.xml | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/changes.xml b/changes.xml index 2714f68..992bd14 100644 --- a/changes.xml +++ b/changes.xml @@ -30,6 +30,9 @@ Update plugins and dependencies to latest versions. + + Enforce that all local dependencies have an explicit scope set. + diff --git a/pom.xml b/pom.xml index c07e0bd..ffadc28 100644 --- a/pom.xml +++ b/pom.xml @@ -360,6 +360,18 @@ false + + + enforce-explicit-scope + + enforce + + + + + + + @@ -542,6 +554,13 @@ org.apache.maven.plugins maven-enforcer-plugin 3.1.0 + + + org.apache.sling + maven-enforcer-rules + 1.1.0 + + From de4111c0b75a62909df23308350b4bd39f5a7610 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 22 Dec 2022 15:59:28 +0100 Subject: [PATCH 10/16] switch issue management to GitHub --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1dee15c..2615754 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Global parent for Maven artifact hierarchy. Documentation: https://wcm.io/tooling/maven/global-parent.html
-Issues: https://wcm-io.atlassian.net/browse/WTOOL
+Issues: https://github.com/wcm-io/io.wcm.maven.global-parent/issues
Wiki: https://wcm-io.atlassian.net/wiki/
Continuous Integration: https://github.com/wcm-io/io.wcm.maven.global-parent/actions
Commercial support: https://wcm.io/commercial-support.html From c2c94f65416e77ca856c2dd701899dbee5036c34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Dec 2022 14:09:22 +0000 Subject: [PATCH 11/16] Bump wagon-ssh from 3.5.2 to 3.5.3 Bumps wagon-ssh from 3.5.2 to 3.5.3. --- updated-dependencies: - dependency-name: org.apache.maven.wagon:wagon-ssh 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 ffadc28..7176f3f 100644 --- a/pom.xml +++ b/pom.xml @@ -164,7 +164,7 @@ org.apache.maven.wagon wagon-ssh - 3.5.2 + 3.5.3 From 22c12ad2d5791972e1ccc55a1ef0fdac74316c5d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Dec 2022 14:06:20 +0000 Subject: [PATCH 12/16] Bump versions-maven-plugin from 2.14.1 to 2.14.2 Bumps [versions-maven-plugin](https://github.com/mojohaus/versions) from 2.14.1 to 2.14.2. - [Release notes](https://github.com/mojohaus/versions/releases) - [Changelog](https://github.com/mojohaus/versions/blob/master/ReleaseNotes.md) - [Commits](https://github.com/mojohaus/versions/compare/2.14.1...2.14.2) --- updated-dependencies: - dependency-name: org.codehaus.mojo:versions-maven-plugin 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 7176f3f..3e284a6 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ 1.12.0 6.52.0 0.8.8 - 2.14.1 + 2.14.2 disabled From 2de1745f0982e8c8c8cfa658ed6d2998e2ee307b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 14:07:31 +0000 Subject: [PATCH 13/16] Bump pmd.version from 6.52.0 to 6.53.0 Bumps `pmd.version` from 6.52.0 to 6.53.0. Updates `pmd-core` from 6.52.0 to 6.53.0 - [Release notes](https://github.com/pmd/pmd/releases) - [Changelog](https://github.com/pmd/pmd/blob/master/docs/render_release_notes.rb) - [Commits](https://github.com/pmd/pmd/compare/pmd_releases/6.52.0...pmd_releases/6.53.0) Updates `pmd-java` from 6.52.0 to 6.53.0 - [Release notes](https://github.com/pmd/pmd/releases) - [Changelog](https://github.com/pmd/pmd/blob/master/docs/render_release_notes.rb) - [Commits](https://github.com/pmd/pmd/compare/pmd_releases/6.52.0...pmd_releases/6.53.0) Updates `pmd-javascript` from 6.52.0 to 6.53.0 - [Release notes](https://github.com/pmd/pmd/releases) - [Changelog](https://github.com/pmd/pmd/blob/master/docs/render_release_notes.rb) - [Commits](https://github.com/pmd/pmd/compare/pmd_releases/6.52.0...pmd_releases/6.53.0) Updates `pmd-jsp` from 6.52.0 to 6.53.0 - [Release notes](https://github.com/pmd/pmd/releases) - [Changelog](https://github.com/pmd/pmd/blob/master/docs/render_release_notes.rb) - [Commits](https://github.com/pmd/pmd/compare/pmd_releases/6.52.0...pmd_releases/6.53.0) --- updated-dependencies: - dependency-name: net.sourceforge.pmd:pmd-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: net.sourceforge.pmd:pmd-java dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: net.sourceforge.pmd:pmd-javascript dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: net.sourceforge.pmd:pmd-jsp 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 3e284a6..a06d838 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ 3.0.0-M7 4.7.3.0 1.12.0 - 6.52.0 + 6.53.0 0.8.8 2.14.2 From c2d4a446d8ed368fa96afaa11581c4f7c6bbed49 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 12 Jan 2023 10:06:40 +0100 Subject: [PATCH 14/16] update plugins and dependencies --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index a06d838..0383b04 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ https://oss.sonatype.org/service/local/staging/deploy/maven2/ - 3.0.0-M7 + 3.0.0-M8 3.0.0-M7 4.7.3.0 1.12.0 @@ -119,7 +119,7 @@ org.jetbrains annotations - 23.1.0 + 24.0.0