Merge branch 'develop'

wcm-io · Oct 18, 2023 · 7c3a145 · 7c3a145
2 parents 6b7b129 + 14dcd48
commit 7c3a145
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -19,13 +19,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [11, 17]
+        java: [11, 17, 21]
         os: [ubuntu-latest]
         distribution: [temurin]
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup JDK
         uses: actions/setup-java@v3

diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure GIT
         run: |

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@v3
+    - uses: actions/checkout@v4
     - 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/changes.xml b/changes.xml
@@ -23,6 +23,18 @@
     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.10" date="2023-10-18">
+      <action type="update" dev="sseifert">
+        Update global-parent dependency to 54.
+      </action>
+      <action type="update" dev="sseifert">
+        Update biz.netcentric.aem:aem-nodetypes to 2023.10.0.
+      </action>
+      <action type="update" dev="sseifert">
+        Update CONGA, CONGA AEM plugin, CONGA Ansible plugin.
+      </action>
+    </release>
+
     <release version="2.1.8" date="2023-09-18">
       <action type="update" dev="sseifert">
         Update global-parent dependency to 53.

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>53</version>
+    <version>54</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.maven</groupId>
   <artifactId>io.wcm.maven.aem-global-parent</artifactId>
-  <version>2.1.8</version>
+  <version>2.1.10</version>
   <packaging>pom</packaging>
 
   <name>io.wcm.maven.aem-global-parent</name>
@@ -384,7 +384,7 @@
               <!-- Using latest version for AEM cloud services for all AEM projects. This is a good best fit because
                    a) AEM cloud services used somwhat a subset of AEM 6.5.5 nodetypes (excluding some deprecated stuff) and
                    b) node types are very stable and do not change over a long time (it's not longer best practice to use them as it was in the past) -->
-              <version>2022.10.0</version>
+              <version>2023.10.0</version>
             </dependency>
             <dependency>
               <groupId>io.wcm.tooling.nodetypes</groupId>
@@ -474,7 +474,7 @@
 
         <plugin>
           <groupId>io.wcm.devops.conga</groupId>
-          <version>1.16.2</version>
+          <version>1.16.4</version>
           <artifactId>conga-maven-plugin</artifactId>
           <extensions>true</extensions>
           <dependencies>
@@ -486,19 +486,19 @@
             <dependency>
               <groupId>io.wcm.devops.conga.plugins</groupId>
               <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-              <version>2.19.6</version>
+              <version>2.19.8</version>
             </dependency>
             <dependency>
               <groupId>io.wcm.devops.conga.plugins</groupId>
               <artifactId>io.wcm.devops.conga.plugins.ansible</artifactId>
-              <version>1.4.4</version>
+              <version>1.4.6</version>
             </dependency>
           </dependencies>
         </plugin>
         <plugin>
           <groupId>io.wcm.devops.conga.plugins</groupId>
           <artifactId>conga-aem-maven-plugin</artifactId>
-          <version>2.19.6</version>
+          <version>2.19.8</version>
           <configuration>
             <serviceURL>${sling.url}/crx/packmgr/service</serviceURL>
             <userId>${sling.vault.user}</userId>