diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 0b56a1c..33b6b32 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -19,20 +19,20 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - java: [8, 11, 17] + java: [11, 17] os: [ubuntu-latest] distribution: [temurin] 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 89c709a..10167b9 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 @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Configure GIT run: | @@ -23,11 +23,11 @@ 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: 8 - cache: 'maven' + java-version: 11 + cache: maven - name: Build, verify, deploy, generate site env: 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' 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 diff --git a/changes.xml b/changes.xml index dd0e3e1..6bd0a9a 100644 --- a/changes.xml +++ b/changes.xml @@ -23,6 +23,21 @@ 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 to Jackrabbit filevault-package-maven-plugin 1.3.2. + + + Update global-parent dependency to 50. + + + Update CONGA AEM plugin. + + + Update CONGA AEM plugin. diff --git a/pom.xml b/pom.xml index 20be29d..3d0d3a4 100644 --- a/pom.xml +++ b/pom.xml @@ -29,13 +29,13 @@ io.wcm.maven io.wcm.maven.global-parent - 48 + 50 io.wcm.maven io.wcm.maven.aem-global-parent - 2.0.18 + 2.1.0 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 @@ -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}