Merge branch 'develop'

wcm-io · Jun 4, 2024 · 60cca3a · 60cca3a
2 parents 222a935 + 78efcd7
commit 60cca3a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: ${{ matrix.distribution }}
           java-version: ${{ matrix.java }}

diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
@@ -25,7 +25,7 @@ jobs:
           git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 11

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.18" date="2024-06-04">
+      <action type="update" dev="sseifert">
+        Update to AEM Analyser plugin 1.5.12.
+      </action>
+      <action type="update" dev="sseifert">
+        Update to nodejs-maven-plugin 3.0.8.
+      </action>
+      <action type="update" dev="sseifert">
+        Update global-parent dependency to 57.
+      </action>
+      <action type="update" dev="sseifert">
+        Don't remove mixing jcr:referencable and jcr:uuid property when downloading content package to store in git - otherwise assets from sample content packages deployed to AEMaaCS to do not have an Asset ID set.
+      </action>
+    </release>
+
     <release version="2.1.16" date="2024-01-26">
       <action type="update" dev="sseifert">
         Update to sling-initial-content-transform-maven-plugin 1.1.4.

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>56</version>
+    <version>57</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.maven</groupId>
   <artifactId>io.wcm.maven.aem-global-parent</artifactId>
-  <version>2.1.16</version>
+  <version>2.1.18</version>
   <packaging>pom</packaging>
 
   <name>io.wcm.maven.aem-global-parent</name>
@@ -397,7 +397,7 @@
         <plugin>
           <groupId>com.adobe.aem</groupId>
           <artifactId>aemanalyser-maven-plugin</artifactId>
-          <version>1.5.8</version>
+          <version>1.5.12</version>
         </plugin>
 
         <plugin>
@@ -420,7 +420,6 @@
               <exclude>jcr\:createdBy</exclude>
               <exclude>jcr\:lastModified</exclude>
               <exclude>jcr\:lastModifiedBy</exclude>
-              <exclude>jcr\:uuid</exclude>
               <exclude>jcr\:isCheckedOut</exclude>
               <exclude>cq\:lastModified</exclude>
               <exclude>cq\:lastModifiedBy</exclude>
@@ -438,7 +437,6 @@
             </excludeProperties>
             <excludeMixins>
               <exclude>mix\:versionable</exclude>
-              <exclude>mix\:referenceable</exclude>
               <exclude>cq\:Taggable</exclude>
               <exclude>cq\:ReplicationStatus.*</exclude>
             </excludeMixins>
@@ -469,7 +467,7 @@
         <plugin>
           <groupId>io.wcm.maven.plugins</groupId>
           <artifactId>nodejs-maven-plugin</artifactId>
-          <version>3.0.6</version>
+          <version>3.0.8</version>
         </plugin>
 
         <plugin>
@@ -589,7 +587,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.4</version>
             <inherited>false</inherited>
             <executions>
               <execution>
@@ -605,7 +603,7 @@
           <plugin>
             <groupId>org.sonatype.plugins</groupId>
             <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.8</version>
+            <version>1.7.0</version>
             <inherited>false</inherited>
             <extensions>true</extensions>
             <configuration>