Merge remote-tracking branch 'origin/develop' into issue/CQ-4353443

README.md

@@ -54,7 +54,7 @@ To generate a project, adjust the following command line to your needs:
 mvn -B org.apache.maven.plugins:maven-archetype-plugin:3.2.1:generate \
  -D archetypeGroupId=com.adobe.aem \
  -D archetypeArtifactId=aem-project-archetype \
- -D archetypeVersion=42\
+ -D archetypeVersion=43\
  -D appTitle="My Site" \
  -D appId="mysite" \
  -D groupId="com.mysite"
@@ -99,7 +99,7 @@ Name                      | Default        | Description
 
 Archetype | AEM as a Cloud Service | AEM 6.5 | Java SE | Maven
 ---------|---------|---------|---------|---------
-[42](https://github.com/adobe/aem-project-archetype/releases/tag/aem-project-archetype-42) | Continual | 6.5.7.0+ | 8, 11 | 3.3.9+
+[43](https://github.com/adobe/aem-project-archetype/releases/tag/aem-project-archetype-43) | Continual | 6.5.7.0+ | 8, 11 | 3.3.9+
 
 Setup your local development environment for [AEM as a Cloud Service SDK](https://docs.adobe.com/content/help/en/experience-manager-learn/cloud-service/local-development-environment-set-up/overview.html) or for [older versions of AEM](https://docs.adobe.com/content/help/en/experience-manager-learn/foundation/development/set-up-a-local-aem-development-environment.html).
 

VERSIONS.md

@@ -20,4 +20,4 @@ Archetype Version   | AEM Version
 20, 21, 22          | 6.5, 6.4, 6.3 + SP3
 23                  | 6.5, 6.4, 6.3 + SP3, AEM as a Cloud Service
 24, 25, 26, 27      | 6.5.5, 6.4.8.1, AEM as a Cloud Service
-28, 30, 31, 32, 33, 34, 35, 36, 37, 39, 40, 41, 42  | 6.5.7, AEM as a Cloud Service
+28, 30, 31, 32, 33, 34, 35, 36, 37, 39, 40, 41, 42, 43  | 6.5.7, AEM as a Cloud Service

pom.xml

@@ -20,7 +20,7 @@
 
     <groupId>com.adobe.aem</groupId>
     <artifactId>aem-project-archetype</artifactId>
-    <version>43-SNAPSHOT</version>
+    <version>44-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
 
     <name>AEM Multi-Module Archetype</name>

src/main/archetype/dispatcher.cloud/src/conf.d/rewrites/rewrite.rules

@@ -20,5 +20,6 @@ RewriteCond %{REQUEST_URI} !^/saml_login
 RewriteCond %{REQUEST_URI} !^/system
 RewriteCond %{REQUEST_URI} !^/tmp
 RewriteCond %{REQUEST_URI} !^/var
+RewriteCond %{REQUEST_URI} !^/conf/(.+\.jpe?g|.+\.png|.+\.svg)$
 RewriteCond %{REQUEST_URI} (.html|.jpe?g|.png|.svg)$
 RewriteRule ^/(.*)$ /content/${CONTENT_FOLDER_NAME}/$1 [PT,L]

src/main/archetype/pom.xml

@@ -83,11 +83,11 @@
 
 #if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y")
 #if ($aemVersion == "cloud")
-        <core.forms.components.version>2.0.26</core.forms.components.version>
-        <core.forms.components.af.version>2.0.26</core.forms.components.af.version>
+        <core.forms.components.version>2.0.36</core.forms.components.version>
+        <core.forms.components.af.version>2.0.36</core.forms.components.af.version>
 #else
-        <core.forms.components.version>1.1.22</core.forms.components.version>
-        <core.forms.components.af.version>1.1.22</core.forms.components.af.version>
+        <core.forms.components.version>1.1.24</core.forms.components.version>
+        <core.forms.components.af.version>1.1.24</core.forms.components.af.version>
 #end
         <aem.forms.sdk.api>SDK_FORMS_VERSION</aem.forms.sdk.api>
 #end

src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/canvas-3-0/_jcr_content/renditions/theme-json/.content.xml

@@ -160,8 +160,8 @@
                     tablet_x0023_default_x0023_ui="[marginLock:linkOff,marginPopover:0px]"/>
                 <af_helpicon
                     jcr:primaryType="nt:unstructured"
-                    default_x0023_default="[display:inline-block,position:absolute,top:8px,right:8px,width:1rem,height:1rem,border-bottom-right-radius:9px,border-bottom-left-radius:9px,border-top-left-radius:9px,border-top-right-radius:9px,background:url(../assets/questionmark.svg) center center / cover no-repeat\,#969696,cssOverride:cursor : pointer;&#xa;]"
-                    default_x0023_default_x0023_ui="[positionPopover:absolute,borderRadiusPopover:9px,backgroundContainer:{&quot;itemList&quot;:[{&quot;id&quot;:&quot;image.1453643419962&quot;\,&quot;imageSrc&quot;:&quot;../assets/questionmark.svg&quot;\,&quot;size&quot;:&quot;cover&quot;\,&quot;tiling&quot;:&quot;no-repeat&quot;\,&quot;position&quot;:&quot;center center&quot;}]},backgroundColor:#969696,marginLock:linkOff]"
+                    default_x0023_default="[display:inline-block,position:absolute,top:8px,right:8px,width:1rem,height:1rem,border-bottom-right-radius:9px,border-bottom-left-radius:9px,border-top-left-radius:9px,border-top-right-radius:9px,background:url(../assets/questionmark.svg) center center / cover no-repeat\,#747474,cssOverride:cursor : pointer;&#xa;]"
+                    default_x0023_default_x0023_ui="[positionPopover:absolute,borderRadiusPopover:9px,backgroundContainer:{&quot;itemList&quot;:[{&quot;id&quot;:&quot;image.1453643419962&quot;\,&quot;imageSrc&quot;:&quot;../assets/questionmark.svg&quot;\,&quot;size&quot;:&quot;cover&quot;\,&quot;tiling&quot;:&quot;no-repeat&quot;\,&quot;position&quot;:&quot;center center&quot;}]},backgroundColor:#747474,marginLock:linkOff]"
                     default_x0023_hover="[background:url(../assets/questionmark.svg) left top / cover no-repeat\,#777777]"
                     default_x0023_hover_x0023_ui="[backgroundColor:#777777,backgroundContainer:{&quot;itemList&quot;:[{&quot;id&quot;:&quot;image.1454170474665&quot;\,&quot;imageSrc&quot;:&quot;../assets/questionmark.svg&quot;\,&quot;tiling&quot;:&quot;no-repeat&quot;\,&quot;size&quot;:&quot;cover&quot;}]}]"/>
                 <af_panelhelpicon

src/main/archetype/ui.tests.wdio/assembly-ui-test-docker-context.xml

@@ -43,4 +43,4 @@
             </excludes>
         </fileSet>
     </fileSets>
-</assembly>
+</assembly>