From 8e15f23529bc4221c92ea9bd2840c6960de37581 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 15 Dec 2022 11:57:44 +0100 Subject: [PATCH 1/9] [gitflow-maven-plugin] Update for next development version 2.0.19-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 20be29d..ca40d40 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.0.18 + 2.0.19-SNAPSHOT pom io.wcm.maven.aem-global-parent From 1e730e1f98eb26739f23eb3fed70ed17676e7836 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Fri, 16 Dec 2022 09:01:27 +0100 Subject: [PATCH 2/9] 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 | 9 +++++++++ pom.xml | 2 +- 4 files changed, 14 insertions(+), 5 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 dd0e3e1..9d10feb 100644 --- a/changes.xml +++ b/changes.xml @@ -23,6 +23,15 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://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 global-parent dependency to 50. + + + Update CONGA AEM plugin. diff --git a/pom.xml b/pom.xml index ca40d40..b6b649c 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ io.wcm.maven io.wcm.maven.global-parent - 48 + 50-SNAPSHOT From 9cba22fe3c8bf15f0b7707a8fab4fa18d5b7c702 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Fri, 16 Dec 2022 12:25:04 +0100 Subject: [PATCH 3/9] 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 8cfccb7..2846a8f 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.aem-global-parent/blob/develop/changes.xml' From 7f197d542711cc46db73caffa1b53ec2bd5e0322 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Fri, 16 Dec 2022 12:27:26 +0100 Subject: [PATCH 4/9] Update to Jackrabbit filevault-package-maven-plugin 1.3.2 set version to 2.1.0-SNAPSHOT --- changes.xml | 3 +++ pom.xml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes.xml b/changes.xml index 9d10feb..9c49e87 100644 --- a/changes.xml +++ b/changes.xml @@ -27,6 +27,9 @@ Minimum Java Version supported is Java 11. Java 8 is no longer supported. ]]> + + Update to Jackrabbit filevault-package-maven-plugin 1.3.2. + Update global-parent dependency to 50. diff --git a/pom.xml b/pom.xml index b6b649c..5a0be48 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.0.19-SNAPSHOT + 2.1.0-SNAPSHOT pom io.wcm.maven.aem-global-parent @@ -363,7 +363,7 @@ org.apache.jackrabbit filevault-package-maven-plugin - 1.3.0 + 1.3.2 META-INF/vault/filter.xml META-INF/vault/definition/thumbnail.png From 53916adcda941ea13b355900f71703dd0e41f30c Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 22 Dec 2022 15:58:48 +0100 Subject: [PATCH 5/9] switch issue management to GitHub --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 70c8cc9..109942e 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Global parent for Maven artifact hierarchy for AEM projects. Documentation: https://wcm.io/tooling/maven/aem-global-parent.html
-Issues: https://wcm-io.atlassian.net/browse/WTOOL
+Issues: https://github.com/wcm-io/io.wcm.maven.aem-global-parent/issues
Wiki: https://wcm-io.atlassian.net/wiki/
Continuous Integration: https://github.com/wcm-io/io.wcm.maven.aem-global-parent/actions
Commercial support: https://wcm.io/commercial-support.html From f8e65fb35c6dd04a3733858e79bbd647141b71cc Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 12 Jan 2023 10:34:28 +0100 Subject: [PATCH 6/9] update dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5a0be48..f78bae9 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ io.wcm.maven io.wcm.maven.global-parent - 50-SNAPSHOT + 50 From f2af0fee2cea7ce212e9069065c71ba384202dde Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 12 Jan 2023 12:01:28 +0100 Subject: [PATCH 7/9] Update CONGA AEM plugin. --- changes.xml | 3 +++ pom.xml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes.xml b/changes.xml index 9c49e87..280e4a2 100644 --- a/changes.xml +++ b/changes.xml @@ -33,6 +33,9 @@ Update global-parent dependency to 50. + + Update CONGA AEM plugin. + diff --git a/pom.xml b/pom.xml index f78bae9..805be0c 100644 --- a/pom.xml +++ b/pom.xml @@ -489,7 +489,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.19.0 + 2.19.2 io.wcm.devops.conga.plugins @@ -501,7 +501,7 @@ io.wcm.devops.conga.plugins conga-aem-maven-plugin - 2.19.0 + 2.19.2 ${sling.url}/crx/packmgr/service ${sling.vault.user} From 4e4604161862b22fc695835ecde092250bde81ad Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 12 Jan 2023 22:17:51 +0100 Subject: [PATCH 8/9] prepare release --- changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes.xml b/changes.xml index 280e4a2..6bd0a9a 100644 --- a/changes.xml +++ b/changes.xml @@ -23,7 +23,7 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://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. ]]> From 7c253f1fca08a9378a246f525f4b268df266d8aa Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 12 Jan 2023 22:18:15 +0100 Subject: [PATCH 9/9] [gitflow-maven-plugin] Update versions for release 2.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 805be0c..3d0d3a4 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.1.0-SNAPSHOT + 2.1.0 pom io.wcm.maven.aem-global-parent