Merge branch 'develop'

wcm-io · Mar 30, 2022 · c38d771 · c38d771
2 parents f9e5a7a + 63a8cb7
commit c38d771
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 35 deletions.
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,15 @@
     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="3.5.2" date="2022-03-30">
+      <action type="update" dev="sseifert">
+        Update dependencies.
+      </action>
+      <action type="update" dev="sseifert">
+        Add support for AEM 6.5 SP12.
+      </action>
+    </release>
+
     <release version="3.5.0" date="2022-01-28">
       <action type="add" dev="sseifert">
         Add aemanalyser-maven-plugin to validate "all" packages generated by CONGA.

diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>io.wcm.maven.archetypes</groupId>
   <artifactId>io.wcm.maven.archetypes.aem</artifactId>
-  <version>3.5.0</version>
+  <version>3.5.2</version>
   <packaging>maven-archetype</packaging>
 
   <name>wcm.io Maven Archetype for AEM</name>

diff --git a/...ore/src/main/webapp/app-root/components/admin/page/structureElement/structureElement.html b/...ore/src/main/webapp/app-root/components/admin/page/structureElement/structureElement.html
@@ -5,7 +5,7 @@
 <html data-sly-use.clientLib="/libs/granite/sightly/templates/clientlib.html">
   <head>
     <title>${symbol_dollar}{currentPage.title}</title>
-    <style data-sly-call="${symbol_dollar}{clientLib.css @ categories='coralui2'}" data-sly-unwrap/>
+    <style data-sly-call="${symbol_dollar}{clientLib.css @ categories='coralui3'}" data-sly-unwrap/>
     <style>
       body { margin: 15px; }
     </style>

diff --git a/...sources/archetype-resources/config-definition/src/main/roles/__projectName__-aem-cms.yaml b/...sources/archetype-resources/config-definition/src/main/roles/__projectName__-aem-cms.yaml
@@ -14,7 +14,7 @@ files:
 
 #if ( $optionAemVersion == '6.5' && $optionAemServicePack == 'y' )
 # AEM Service Pack
-- url: mvn:adobe.binary.aem.65.servicepack/aem-service-pkg/6.5.11/zip
+- url: mvn:adobe.binary.aem.65.servicepack/aem-service-pkg/6.5.12.0/zip
   dir: packages
   modelOptions:
     delayAfterInstallSec: 30

diff --git a/...ot/apps/__projectName__/core/components/admin/page/structureElement/structureElement.html b/...ot/apps/__projectName__/core/components/admin/page/structureElement/structureElement.html
@@ -5,7 +5,7 @@
 <html data-sly-use.clientLib="/libs/granite/sightly/templates/clientlib.html">
   <head>
     <title>${symbol_dollar}{currentPage.title}</title>
-    <style data-sly-call="${symbol_dollar}{clientLib.css @ categories='coralui2'}" data-sly-unwrap/>
+    <style data-sly-call="${symbol_dollar}{clientLib.css @ categories='coralui3'}" data-sly-unwrap/>
     <style>
       body { margin: 15px; }
     </style>

diff --git a/src/main/resources/archetype-resources/frontend/package.json b/src/main/resources/archetype-resources/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "name": "${projectName}-frontend",
+  "name": "betacloudProject-frontend",
   "version": "1.0.0",
   "description": "Frontend build pipeline for AEM projects",
   "main": "index.js",
@@ -11,12 +11,12 @@
     "build:clientlibs": "npm run build:prod && clientlib"
   },
   "dependencies": {
-    "bootstrap": "4.6.0",
+    "bootstrap": "4.6.1",
     "jquery": "3.6.0",
     "popper.js": "1.16.1"
   },
   "devDependencies": {
-    "@babel/core": "7.15.8",
+    "@babel/core": "7.17.5",
     "aem-clientlib-generator": "1.7.7",
     "babel-core": "6.26.3",
     "babel-loader": "8.2.3",
@@ -25,18 +25,18 @@
     "babel-preset-env": "1.7.0",
     "babel-register": "6.26.0",
     "clean-webpack-plugin": "4.0.0",
-    "copy-webpack-plugin": "9.0.1",
-    "css-loader": "6.5.0",
+    "copy-webpack-plugin": "10.2.4",
+    "css-loader": "6.7.1",
     "handlebars": "4.7.7",
     "handlebars-loader": "1.7.1",
     "html-webpack-plugin": "5.5.0",
-    "mini-css-extract-plugin": "2.4.3",
-    "node-sass": "6.0.1",
-    "postcss-loader": "6.2.0",
-    "sass-loader": "12.2.0",
-    "webpack": "5.60.0",
-    "webpack-cli": "4.9.1",
-    "webpack-dev-server": "4.3.1",
+    "mini-css-extract-plugin": "2.6.0",
+    "node-sass": "7.0.1",
+    "postcss-loader": "6.2.1",
+    "sass-loader": "12.6.0",
+    "webpack": "5.70.0",
+    "webpack-cli": "4.9.2",
+    "webpack-dev-server": "4.7.4",
     "webpack-merge": "5.8.0"
   }
 }
diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.aem-global-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.6</version>
     <relativePath/>
   </parent>
 
@@ -37,10 +37,10 @@
     <!-- Versions -->
 #end
 #if ( $optionAemVersion != "cloud" )
-    <core.wcm.components.version>2.17.14</core.wcm.components.version>
+    <core.wcm.components.version>2.18.8</core.wcm.components.version>
 #end
 #if( $optionAcsCommons == "y" )
-    <acs.aem.commons.version>5.1.0</acs.aem.commons.version>
+    <acs.aem.commons.version>5.2.0</acs.aem.commons.version>
 #end
 
     <!-- Enable reproducible builds -->
@@ -146,13 +146,13 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.caconfig.editor</artifactId>
-        <version>1.10.0</version>
+        <version>1.11.0</version>
       </dependency>
 #if ( $optionAemVersion == "cloud" )
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.caconfig.editor</artifactId>
-        <version>1.10.0</version>
+        <version>1.11.0</version>
         <classifier>content</classifier>
         <type>zip</type>
       </dependency>
@@ -177,41 +177,41 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.url</artifactId>
-        <version>1.6.0</version>
+        <version>1.7.0</version>
       </dependency>
 #if ( $optionAemVersion == "cloud" )
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.url</artifactId>
-        <version>1.6.0</version>
+        <version>1.7.0</version>
         <classifier>content</classifier>
         <type>zip</type>
       </dependency>
 #end
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.link</artifactId>
-        <version>1.8.0</version>
+        <version>1.9.2</version>
       </dependency>
 #if ( $optionAemVersion == "cloud" )
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.link</artifactId>
-        <version>1.8.0</version>
+        <version>1.9.2</version>
         <classifier>content</classifier>
         <type>zip</type>
       </dependency>
 #end
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.media</artifactId>
-        <version>1.13.8</version>
+        <version>1.14.0</version>
       </dependency>
 #if ( $optionAemVersion == "cloud" )
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.media</artifactId>
-        <version>1.13.8</version>
+        <version>1.14.0</version>
         <classifier>content</classifier>
         <type>zip</type>
       </dependency>
@@ -247,13 +247,13 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.wcm.core.components</artifactId>
-        <version>1.9.2-2.17.12</version>
+        <version>1.10.0-2.18.6</version>
       </dependency>
 #if ( $optionAemVersion == "cloud" )
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.wcm.core.components</artifactId>
-        <version>1.9.2-2.17.12</version>
+        <version>1.10.0-2.18.6</version>
         <classifier>content</classifier>
         <type>zip</type>
       </dependency>
@@ -275,13 +275,13 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.wcm.ui.granite</artifactId>
-        <version>1.9.0</version>
+        <version>1.9.2</version>
       </dependency>
 #if ( $optionAemVersion == "cloud" )
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.wcm.ui.granite</artifactId>
-        <version>1.9.0</version>
+        <version>1.9.2</version>
         <classifier>content</classifier>
         <type>zip</type>
       </dependency>
@@ -304,7 +304,7 @@
       <dependency>
         <groupId>io.wcm.devops.conga.definitions</groupId>
         <artifactId>io.wcm.devops.conga.definitions.aem</artifactId>
-        <version>1.11.4</version>
+        <version>1.12.0</version>
       </dependency>
 
       <!-- wcm.io Testing -->
@@ -368,7 +368,7 @@
       <dependency>
         <groupId>io.wcm.maven</groupId>
         <artifactId>io.wcm.maven.aem-dependencies</artifactId>
-        <version>#if($optionAemServicePack=="y")6.5.11.0001#{else}6.5.0.0005#end</version>
+        <version>#if($optionAemServicePack=="y")6.5.12.0000#{else}6.5.0.0005#end</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -428,7 +428,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-#set( $mockitoVersion = "4.2.0" )
+#set( $mockitoVersion = "4.4.0" )
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
@@ -451,7 +451,7 @@
       <dependency>
         <groupId>com.adobe.cq</groupId>
         <artifactId>aem-cloud-testing-clients</artifactId>
-        <version>0.8.3</version>
+        <version>1.0.5</version>
       </dependency>
 #elseif ( $optionAemVersion == "6.5" )
       <dependency>