diff --git a/README.md b/README.md index 27715bfb3..b5720c644 100644 --- a/README.md +++ b/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). diff --git a/VERSIONS.md b/VERSIONS.md index bf0402b54..67479b8e5 100644 --- a/VERSIONS.md +++ b/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 diff --git a/pom.xml b/pom.xml index 520039d95..70288f25f 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem aem-project-archetype - 43-SNAPSHOT + 44-SNAPSHOT maven-archetype AEM Multi-Module Archetype diff --git a/src/main/archetype/dispatcher.cloud/src/conf.d/rewrites/rewrite.rules b/src/main/archetype/dispatcher.cloud/src/conf.d/rewrites/rewrite.rules index 57952e15f..f3659042e 100644 --- a/src/main/archetype/dispatcher.cloud/src/conf.d/rewrites/rewrite.rules +++ b/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] diff --git a/src/main/archetype/pom.xml b/src/main/archetype/pom.xml index 0de2f925f..c97572012 100644 --- a/src/main/archetype/pom.xml +++ b/src/main/archetype/pom.xml @@ -83,11 +83,11 @@ #if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") #if ($aemVersion == "cloud") - 2.0.26 - 2.0.26 + 2.0.36 + 2.0.36 #else - 1.1.22 - 1.1.22 + 1.1.24 + 1.1.24 #end SDK_FORMS_VERSION #end diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/easel/thumbnail.png b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/easel/thumbnail.png new file mode 100644 index 000000000..a568319c4 Binary files /dev/null and b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/easel/thumbnail.png differ diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/wknd/thumbnail.png b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/wknd/thumbnail.png new file mode 100644 index 000000000..51358deb5 Binary files /dev/null and b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/wknd/thumbnail.png differ diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/thumbnail.png b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/thumbnail.png index 023e906d1..b9aa53205 100644 Binary files a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/thumbnail.png and b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/thumbnail.png differ diff --git a/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 b/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 index 97d54fca8..a81e36064 100644 --- a/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 +++ b/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]"/> - + \ No newline at end of file