Merge branch 'develop'

wcm-io · Jan 12, 2023 · 77cc517 · 77cc517
2 parents 29a7bb3 + 7c253f1
commit 77cc517
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 16 deletions.
diff --git 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
@@ -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,19 +15,19 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Configure GIT
         run: |
           git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
           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
@@ -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
@@ -6,7 +6,7 @@
 Global parent for Maven artifact hierarchy for AEM projects.
 
 Documentation: https://wcm.io/tooling/maven/aem-global-parent.html<br/>
-Issues: https://wcm-io.atlassian.net/browse/WTOOL<br/>
+Issues: https://github.com/wcm-io/io.wcm.maven.aem-global-parent/issues<br/>
 Wiki: https://wcm-io.atlassian.net/wiki/<br/>
 Continuous Integration: https://github.com/wcm-io/io.wcm.maven.aem-global-parent/actions<br/>
 Commercial support: https://wcm.io/commercial-support.html
diff --git 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">
   <body>
 
+    <release version="2.1.0" date="2023-01-12">
+      <action type="update" dev="sseifert"><![CDATA[
+        <b>Minimum Java Version supported is Java 11. Java 8 is no longer supported.</b>
+      ]]></action>
+      <action type="update" dev="sseifert">
+        Update to Jackrabbit filevault-package-maven-plugin 1.3.2.
+      </action>
+      <action type="update" dev="sseifert">
+        Update global-parent dependency to 50.
+      </action>
+      <action type="update" dev="sseifert">
+        Update CONGA AEM plugin.
+      </action>
+    </release>
+
     <release version="2.0.18" date="2022-12-15">
       <action type="update" dev="sseifert">
         Update CONGA AEM plugin.

diff --git a/pom.xml b/pom.xml
@@ -29,13 +29,13 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.global-parent</artifactId>
-    <version>48</version>
+    <version>50</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.maven</groupId>
   <artifactId>io.wcm.maven.aem-global-parent</artifactId>
-  <version>2.0.18</version>
+  <version>2.1.0</version>
   <packaging>pom</packaging>
 
   <name>io.wcm.maven.aem-global-parent</name>
@@ -363,7 +363,7 @@
         <plugin>
           <groupId>org.apache.jackrabbit</groupId>
           <artifactId>filevault-package-maven-plugin</artifactId>
-          <version>1.3.0</version>
+          <version>1.3.2</version>
           <configuration>
             <filterSource>META-INF/vault/filter.xml</filterSource>
             <thumbnailImage>META-INF/vault/definition/thumbnail.png</thumbnailImage>
@@ -489,7 +489,7 @@
             <dependency>
               <groupId>io.wcm.devops.conga.plugins</groupId>
               <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-              <version>2.19.0</version>
+              <version>2.19.2</version>
             </dependency>
             <dependency>
               <groupId>io.wcm.devops.conga.plugins</groupId>
@@ -501,7 +501,7 @@
         <plugin>
           <groupId>io.wcm.devops.conga.plugins</groupId>
           <artifactId>conga-aem-maven-plugin</artifactId>
-          <version>2.19.0</version>
+          <version>2.19.2</version>
           <configuration>
             <serviceURL>${sling.url}/crx/packmgr/service</serviceURL>
             <userId>${sling.vault.user}</userId>