Merge branch 'develop'

wcm-io · Dec 15, 2022 · 29a7bb3 · 29a7bb3
2 parents a82edd8 + 0f3de4e
commit 29a7bb3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,24 @@
     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.0.18" date="2022-12-15">
+      <action type="update" dev="sseifert">
+        Update CONGA AEM plugin.
+      </action>
+      <action type="update" dev="sseifert">
+        Update to AEM Analyser plugin 1.5.8.
+      </action>
+      <action type="update" dev="sseifert">
+        Update to bnd Maven plugins 6.4.0.
+      </action>
+      <action type="update" dev="sseifert">
+        Update aem-nodetypes to 2022.10.0.
+      </action>
+      <action type="update" dev="sseifert">
+        Update global-parent dependency to 48.
+      </action>
+    </release>
+
     <release version="2.0.16" date="2022-09-30">
       <action type="update" dev="sseifert">
         Update to wcmio-content-package-maven-plugin 2.1.6.

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>47</version>
+    <version>48</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.maven</groupId>
   <artifactId>io.wcm.maven.aem-global-parent</artifactId>
-  <version>2.0.16</version>
+  <version>2.0.18</version>
   <packaging>pom</packaging>
 
   <name>io.wcm.maven.aem-global-parent</name>
@@ -68,7 +68,7 @@
 
     <!-- versions -->
     <sling.sling-maven-plugin.version>3.0.2</sling.sling-maven-plugin.version>
-    <bnd.version>6.3.1</bnd.version>
+    <bnd.version>6.4.0</bnd.version>
 
   </properties>
 
@@ -386,7 +386,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>2020.11.0</version>
+              <version>2022.10.0</version>
             </dependency>
             <dependency>
               <groupId>io.wcm.tooling.nodetypes</groupId>
@@ -399,8 +399,7 @@
         <plugin>
           <groupId>com.adobe.aem</groupId>
           <artifactId>aemanalyser-maven-plugin</artifactId>
-          <!-- Stick with 1.4.16 until https://github.com/adobe/aemanalyser-maven-plugin/issues/175 is fixed -->
-          <version>1.4.16</version>
+          <version>1.5.8</version>
         </plugin>
 
         <plugin>
@@ -490,7 +489,7 @@
             <dependency>
               <groupId>io.wcm.devops.conga.plugins</groupId>
               <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-              <version>2.18.4</version>
+              <version>2.19.0</version>
             </dependency>
             <dependency>
               <groupId>io.wcm.devops.conga.plugins</groupId>
@@ -502,7 +501,7 @@
         <plugin>
           <groupId>io.wcm.devops.conga.plugins</groupId>
           <artifactId>conga-aem-maven-plugin</artifactId>
-          <version>2.18.4</version>
+          <version>2.19.0</version>
           <configuration>
             <serviceURL>${sling.url}/crx/packmgr/service</serviceURL>
             <userId>${sling.vault.user}</userId>