Release/37 (#952)

* CIF-2628 - Remove reference to Venia from Archetype (#873) * remove references to Venia * Issue/angular ssr - io runtime support Provide support for IO runtime in the angular spa editor. This will provide support for performing SSR for aem in the cloud as well. Co-authored-by: Niek Raaijmakers <raaijmak@adobe.com> Co-authored-by: Zoran Nikolovski <nikolovs@adobe.com> * releng - Update CIF to January release (#881) * releng - Update CIF to January release * Add feedback * CIF-2678 - Styling is broken on catalog page in Venia and archetype projects (#884) * fixed HTL syntax in catalogpage customheaderlibs.html * CIF-2638: Move navigation styling to archetype (#888) * add rule to remove form ui test assets if not a forms project (#890) * Update aemanalyser maven plugin to 1.4.0 (#895) * Bump log4js in /src/main/archetype/ui.tests/test-module (#879) Bumps [log4js](https://github.com/log4js-node/log4js-node) from 6.3.0 to 6.4.0. - [Release notes](https://github.com/log4js-node/log4js-node/releases) - [Changelog](https://github.com/log4js-node/log4js-node/blob/master/CHANGELOG.md) - [Commits](log4js-node/log4js-node@v6.3.0...v6.4.0) --- updated-dependencies: - dependency-name: log4js dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump nanoid in /src/main/archetype/ui.frontend.general (#880) Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.2.0. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](ai/nanoid@3.1.30...3.2.0) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump node-fetch in /src/main/archetype/ui.frontend.general (#883) Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](node-fetch/node-fetch@v2.6.6...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump aem-testing-clients to 1.0.5 (#892) Fixes: SLING-11131 - Remove Guava Dependency for CVE-2018-10237 and CVE-2020-8908 SLING-11124 - Update Apache HTTP Client Dependency for CVE-2020-13956 Allow to set "forceBasicAuth" for author and publish instance separately Co-authored-by: Andrei Tuicu <tuicu@adobe.com> * Bump follow-redirects in /src/main/archetype/ui.frontend.general (#894) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.6 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.14.6...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Restore .gitignore files to generated projects (#889) * restore gitignore file * disable default exclude rule * Update Core Components to v2.18.0 (#897) * Update Core Components to v2.18.0 - update dependency of core components to latest v2.18.0 - update resourceSuperType of proxy components to latest component version - enable inheritance of edit config from parent component - remove deprecated sharing component fixes #896 * Adjust AIO SSR configuration, handle gzip payload (#903) Co-authored-by: Cezary Czernecki <czerneck@adobe.com> Co-authored-by: Hanish Bansal <38317539+habansal@users.noreply.github.com> * CIF-2721: update CIF Core Components to 2.6.0 (#899) * CIF-2526 - Add add-to-cart button in all product collections (#904) * updated style templates for productcarousel, productcollection and productlist component * Update forms (#901) * Update Forms Core Components to v1.0.4 Also include examples if user chose to in project creation @review @rismehta * CQ-4331109 Update to forms core components v1.0.6 * Update AEM Analyser Maven Plugin to 1.4.2 (#906) * updated README and VERSIONS for 36 release (#908) Co-authored-by: ddewanji <ddewanji@adobe.com> * Release/36 merge into develop after release step (#909) * [maven-release-plugin] prepare release aem-project-archetype-36 * [maven-release-plugin] prepare for next development iteration Co-authored-by: adobe-bot <Grp-opensourceoffice@adobe.com> * Update the AEMAnalyser update to 1.4.6 (#912) Co-authored-by: Niek Raaijmakers <raaijmak@adobe.com> * Adding updated immutable files gnerated by AEM Dispatcher Tools 2.0.91 (#918) * CIF-2734: update CIF Core Components to 2.8.0 and CIF GQL Client to 1.7.10 (#923) * Update Core Components to v2.19.0 (#926) * Update Core Components to v2.19.0 - update dependency of core components to 2.19.0 - set proxy search component to v2 - set proxy amp image component to v2 fixes #921 * SITES-5185 - Ensure all GraphQL Queries to publisher are using Persistent Queries and not POST requests (#922) * Update aemanalyser-maven-plugin to 1.4.8 (#928) Updating to the latest release to get some improvements and bugfixes. * Load js clientlibs async in customfooterlibs (#934) * CIF-2302 - JS error in console (#935) * load js clientlibs async in customfooterlibs * load js clientlibs async in customfooterlibs * Update aemanalyser plugin to 1.4.10 (#936) We should update to the latest release: https://github.com/adobe/aemanalyser-maven-plugin/releases/tag/aemanalyser-maven-plugin-1.4.10 * CIF-2289 - Create a CIF Page v3 component based on the WCM Page v3 (#933) * update CIF page to v3 * update CIF components to 2.9.0 * CIF-2732 - Teaser: add option to open CTA in a new Tab (#932) * updated commerce teaser proxy to v3 * Adding model.json cache settings to dispatcher (#937) * * adding model.json cache settings to dispatcher * bump of required version of spa.project.core * * adding model.json cache settings to dispatcher * bump of required version of spa.project.core Co-authored-by: Bartosz Borowski <pid63525@adobe.com> * Cq 4343453 (#945) * CQ-4343453 Initial commit for af2 forms component * CQ-4343453 using flag includeFormsheadless for headless forms * CQ-4343453 changes to include includeFormsheadless * CQ-4343453 Renaming * CQ-4343453 include ui.frontend.forms module * CQ-4343453 adding basic af2 template and some minor fixes * CQ-4343453 closing review comments * CQ-4343453 Update Readme * CQ-4343453 Updated package.json with aemforms dependencies, changes in template and templatetypes * CQ-4343453 Added Sample Form Json * CQ-4343453 Added test case * CQ-4343453 template-type editable * CQ-4343453 minor fixes * CQ-4343453 removing unnecessary lines * CQ-4343453 aligning npm packages to new names * CQ-4343453 Review comments * CQ-4343453 build fix * revert 940419a Co-authored-by: barshatr <barshatr@adobe.com> * CQ-4343453 Upgrade forms core components (#947) * CQ-4343453 Upgrade forms core components * CQ-4343453 Update @AEMFORMS artifacts in package.json Co-authored-by: barshatr <barshatr@adobe.com> * CQ-4343453 Update sample form for multiple submit fix (#948) Co-authored-by: barshatr <barshatr@adobe.com> * CQ-4343453 Exclude forms core components if cloud (#949) * CQ-4343453 Exclude forms core components if cloud * CQ-4343453 include sdk api for cloud * CQ-4343453 minor changes Co-authored-by: barshatr <barshatr@adobe.com> * updated README and VERSIONS for 37 release (#944) Co-authored-by: barshatr <barshatr@adobe.com> * CQ-4343453 remove debugger from form.tsx (#950) Co-authored-by: barshatr <barshatr@adobe.com> * [maven-release-plugin] prepare release aem-project-archetype-37 * [maven-release-plugin] prepare for next development iteration * remove extra spaces Co-authored-by: Burkhard Pauli <mail@bpauli.de> Co-authored-by: Mark J. Becker <herzog31@users.noreply.github.com> Co-authored-by: Niek Raaijmakers <niekraaijmakers@gmail.com> Co-authored-by: Niek Raaijmakers <raaijmak@adobe.com> Co-authored-by: Zoran Nikolovski <nikolovs@adobe.com> Co-authored-by: Levente Sántha <levente@adobe.com> Co-authored-by: Daniel Gordon <dgordon@adobe.com> Co-authored-by: Carsten Ziegeler <cziegele@adobe.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrei Tuicu <andrei.tuicu@gmail.com> Co-authored-by: Andrei Tuicu <tuicu@adobe.com> Co-authored-by: Cezary Czernecki <czarek.czernecki@gmail.com> Co-authored-by: Cezary Czernecki <czerneck@adobe.com> Co-authored-by: Hanish Bansal <38317539+habansal@users.noreply.github.com> Co-authored-by: Dirk Rudolph <drudolph@adobe.com> Co-authored-by: Viresh Gupta <virresh@users.noreply.github.com> Co-authored-by: David Bosschaert <bosschae@adobe.com> Co-authored-by: deepprakash345 <deepprakash345@gmail.com> Co-authored-by: ddewanji <ddewanji@adobe.com> Co-authored-by: adobe-bot <Grp-opensourceoffice@adobe.com> Co-authored-by: Patrick Heinzelmann <patrick.heinzelmann@antegma.com> Co-authored-by: Andreea Miruna Moise <53038821+sandru85@users.noreply.github.com> Co-authored-by: Bartosz Borowski <mail@bborowski.com> Co-authored-by: Bartosz Borowski <pid63525@adobe.com> Co-authored-by: barshatr <barshatr@adobe.com>
adobe · Jun 27, 2022 · ca31098 · ca31098
1 parent 46873f2
commit ca31098
Show file tree

Hide file tree

Showing 71 changed files with 1,432 additions and 65 deletions.
diff --git a/README.md b/README.md
@@ -53,7 +53,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=36\
+ -D archetypeVersion=37\
  -D appTitle="My Site" \
  -D appId="mysite" \
  -D groupId="com.mysite"
@@ -92,12 +92,12 @@ Name                      | Default        | Description
 `enableDynamicMedia`      | `n`            | Enabled foundation DynamicMedia components in project policy settings and activates Dynamic Media features in Core Image component's policy.
 `enableSSR`    | `n`            | Option to enable SSR for the front-end project
 `precompiledScripts`  | `n`     | Option to [precompile](https://experienceleague.adobe.com/docs/experience-manager-core-components/using/developing/archetype/precompiled-bundled-scripts.html) the server-side scripts from `ui.apps` and attach them to the build as a secondary bundle artifact in the `ui.apps` project. `aemVersion` should be set to `cloud`.
-
+`includeFormsheadless`   | `n`       | Includes [Forms Core Components](https://github.com/adobe/aem-core-forms-components) dependencies, ui.frontend.react.forms.af and headless artifacts.
 ## System Requirements
 
 Archetype | AEM as a Cloud Service | AEM 6.5 | Java SE | Maven
 ---------|---------|---------|---------|---------
-[36](https://github.com/adobe/aem-project-archetype/releases/tag/aem-project-archetype-36) | Continual | 6.5.7.0+ | 8, 11 | 3.3.9+
+[37](https://github.com/adobe/aem-project-archetype/releases/tag/aem-project-archetype-37) | 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
@@ -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  | 6.5.7, AEM as a Cloud Service
+28, 30, 31, 32, 33, 34, 35, 36, 37  | 6.5.7, AEM as a Cloud Service
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
 
     <groupId>com.adobe.aem</groupId>
     <artifactId>aem-project-archetype</artifactId>
-    <version>37-SNAPSHOT</version>
+    <version>38-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
 
     <name>AEM Multi-Module Archetype</name>

diff --git a/src/main/archetype/all/pom.xml b/src/main/archetype/all/pom.xml
@@ -181,7 +181,7 @@
                         </embedded>
 #end
 #end
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y") and $aemVersion == "cloud" )
+#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion != "cloud" )
                         <embedded>
                             <groupId>com.adobe.aem</groupId>
                             <artifactId>core-forms-components-apps</artifactId>
@@ -194,7 +194,7 @@
                             <target>/apps/${appId}-vendor-packages/application/install</target>
                         </embedded>
 #end
-#if ( $includeExamples == "y" and ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y") and $aemVersion == "cloud" ) )
+#if ( $includeExamples == "y" and ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud" ) )
                         <embedded>
                             <groupId>com.adobe.aem</groupId>
                             <artifactId>core-forms-components-examples-all</artifactId>
@@ -397,7 +397,7 @@
             <type>zip</type>
         </dependency>
 #end
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y") and $aemVersion == "cloud" )
+#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion != "cloud" )
         <!-- AEM Forms Dependencies -->
         <dependency>
             <groupId>com.adobe.aem</groupId>
@@ -422,12 +422,12 @@
             <type>zip</type>
         </dependency>
 #end
-#if ( $includeExamples == "y" and ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y") and $aemVersion == "cloud" ) )
+#if ( $includeExamples == "y" and ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud" ) )
         <dependency>
             <groupId>com.adobe.aem</groupId>
             <artifactId>core-forms-components-examples-all</artifactId>
             <type>zip</type>
         </dependency>
 #end
     </dependencies>
-</project>
+</project>
diff --git a/src/main/archetype/archetype.properties b/src/main/archetype/archetype.properties
@@ -25,3 +25,4 @@ amp=${amp}
 enableDynamicMedia=${enableDynamicMedia}
 enableSSR=${enableSSR}
 precompiledScripts=${precompiledScripts}
+includeFormsheadless=${includeFormsheadless}
diff --git a/src/main/archetype/core/pom.xml b/src/main/archetype/core/pom.xml
@@ -207,16 +207,18 @@ Import-Package: javax.annotation;version=0.0.0,*
 #end
 #end
 
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y") and $aemVersion == "cloud" )
+#if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y")
         <!-- AEM Forms Dependencies -->
         <dependency>
             <groupId>com.adobe.aem</groupId>
             <artifactId>aem-forms-sdk-api</artifactId>
         </dependency>
+        #if ($aemVersion != "cloud")
         <dependency>
             <groupId>com.adobe.aem</groupId>
             <artifactId>core-forms-components-core</artifactId>
         </dependency>
+        #end
 #end
         <!-- Testing -->
         <dependency>

diff --git a/src/main/archetype/dispatcher.cloud/src/conf.d/available_vhosts/default.vhost b/src/main/archetype/dispatcher.cloud/src/conf.d/available_vhosts/default.vhost
@@ -1,5 +1,5 @@
 #
-# This is the default publish virtualhost definition for Apache.
+# This is the default publish virtualhost definition for Apache. 
 #
 # DO NOT EDIT this file, your changes will have no impact on your deployment.
 #
@@ -23,7 +23,7 @@ Include conf.d/variables/custom.vars
 	<IfModule mod_headers.c>
 		Header add X-Vhost "publish"
 	</IfModule>
-	<Directory "${DOCROOT}">
+	<Directory />
 		<IfModule disp_apache2.c>
 			# Some items cache with the wrong mime type
 			# Use this option to use the name to auto-detect mime types when cached improperly
@@ -37,14 +37,17 @@ Include conf.d/variables/custom.vars
 		</IfModule>
 		Options FollowSymLinks
 		AllowOverride None
-		Require all granted
 		# Insert filter
 		SetOutputFilter DEFLATE
 		# Don't compress images
 		SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary
 		# Prevent clickjacking
 		Header always append X-Frame-Options SAMEORIGIN
 	</Directory>
+	<Directory "${DOCROOT}">
+		AllowOverride None
+		Require all granted
+	</Directory>
 	<IfModule disp_apache2.c>
 		# Enabled to allow rewrites to take affect and not be ignored by the dispatcher module
 		DispatcherUseProcessedURL	On
@@ -57,6 +60,12 @@ Include conf.d/variables/custom.vars
 
 		# Rewrite index page internally, pass through (PT)
 		RewriteRule "^(/?)$" "/index.html" [PT]
-
 	</IfModule>
+
+    # Content Services/Sling Model Exporter: Cache for 5min with background refresh 1h on browser and 12h on CDN to avoid MISS
+    <LocationMatch "^/content/.*\.model\.json$">
+       Header set Cache-Control "max-age=300,stale-while-revalidate=3600" "expr=%{REQUEST_STATUS} < 400"
+       Header set Surrogate-Control "stale-while-revalidate=43200,stale-if-error=43200" "expr=%{REQUEST_STATUS} < 400"
+       Header set Age 0
+    </LocationMatch>
 </VirtualHost>
diff --git a/src/main/archetype/dispatcher.cloud/src/conf.d/dispatcher_vhost.conf b/src/main/archetype/dispatcher.cloud/src/conf.d/dispatcher_vhost.conf
@@ -10,6 +10,28 @@ ServerName dispatcher
 Include conf.d/variables/default.vars
 Include conf.d/variables/global.vars
 
+
+# WARNING!!! The probe paths below are INTERNAL and RESERVED - please DO NOT USE them in your virtual host configurations!
+
+# Liveness probe URL
+Alias "/system/probes/live" /etc/httpd/probes/live-status.json
+# Readiness probe URL
+Alias "/system/probes/ready" /etc/httpd/probes/ready-status.json
+# Startup probe URL
+Alias "/system/probes/start" /etc/httpd/probes/startup-status.json
+
+# internal probes endpoint
+<LocationMatch "/system/probes">
+    RewriteEngine Off
+</LocationMatch>
+
+<Directory "/etc/httpd/probes">
+    SetHandler default-handler
+    AllowOverride None
+    Require all granted
+</Directory>
+
+
 #SKYOPS-13837: Proxy static frontend code requests through dispatcher
 <IfDefine FRONTEND_SUPPORT>
     SSLProxyEngine on
@@ -32,6 +54,16 @@ Include conf.d/variables/global.vars
     </LocationMatch>
 </IfDefine>
 
+# SITES-5185 - Ensure all GraphQL Queries to production publisher are using Persistent Queries and not direct query requests
+<IfDefine ENVIRONMENT_PROD>
+    SSLProxyEngine on
+    <LocationMatch "^/content/_cq_graphql/.*/endpoint.json$">
+        RewriteCond %{ENV:ENABLE_GRAPHQL_ENDPOINT} ^$ [OR]
+        RewriteCond %{ENV:ENABLE_GRAPHQL_ENDPOINT} ^false$
+        RewriteRule ^/(.*)$ - [R=404,L]
+    </LocationMatch>
+</IfDefine>
+
 # If the module loads correctly then apply base settings for the module
 <IfModule disp_apache2.c>
 	# location of the configuration file. eg: 'conf/dispatcher.any'
@@ -76,12 +108,18 @@ Include conf.d/variables/global.vars
 	Header unset Age
 </IfDefine>
 
-# Allow ingressroute checks through on /systemready (regardless of dispatcher filters)
+# (legacy) Allow ingressroute checks through on /systemready (regardless of dispatcher filters)
 <Location "/systemready">
 	ProxyPass http://${AEM_HOST}:${AEM_PORT}/systemready
 	RewriteEngine Off
 </Location>
 
+# new Health probe URL to legacy /systemready URL mapping
+<Location "/system/probes/health">
+	ProxyPass http://${AEM_HOST}:${AEM_PORT}/systemready
+	RewriteEngine Off
+</Location>
+
 # Allow access to CRXDE on dev environment
 <IfDefine ENVIRONMENT_DEV>
     <LocationMatch "/crx/(de|server)/">
@@ -93,6 +131,10 @@ Include conf.d/variables/global.vars
 # CQ-4287185: Allow access to magento reverse-proxy endpoint
 <IfDefine COMMERCE>
 	SSLProxyEngine on
+	# CIF-2557 add ProxyRemote to tunnel reverse-proxy traffic through egress proxy if available
+	<IfDefine HTTP_EGRESS_PROXY>
+		ProxyRemote ${COMMERCE_ENDPOINT} "http://${AEM_HTTP_PROXY_HOST}:${AEM_HTTP_PROXY_PORT}"
+	</IfDefine>
 	<LocationMatch "/api/graphql">
 		ProxyPass        ${COMMERCE_ENDPOINT}
 		ProxyPassReverse ${COMMERCE_ENDPOINT}
@@ -107,6 +149,19 @@ Include conf.d/variables/global.vars
     Require all denied
 </Directory>
 
+# internal metadata endpoint
+Alias "/gitinit-status" /etc/httpd/metadata/gitinit-status.json
+
+<LocationMatch "/gitinit-status">
+    RewriteEngine Off
+</LocationMatch>
+
+<Directory "/etc/httpd/metadata">
+	SetHandler default-handler
+    AllowOverride None
+    Require expr "%{HTTP_HOST} == '${POD_NAME}'"
+</Directory>
+
 Include conf.d/enabled_vhosts/*.vhost
 
 # Create a catch-all vhost

diff --git a/src/main/archetype/dispatcher.cloud/src/conf.dispatcher.d/filters/default_filters.any b/src/main/archetype/dispatcher.cloud/src/conf.dispatcher.d/filters/default_filters.any
@@ -52,7 +52,7 @@
 
 # AEM Forms specific filters
 # to allow AF specific endpoints for prefill, submit and sign
-/0032 { /type "allow" /path "/content/forms/af/*" /method "POST" /selectors '(submit|internalsubmit|agreement|signSubmit|prefilldata|save)' /extension '(jsp|json)' }
+/0032 { /type "allow" /path "/content/forms/af/*" /method "POST" /selectors '(submit|internalsubmit|agreement|signSubmit|prefilldata|save|analyticsconfigparser)' /extension '(jsp|json)' }
 
 # to allow AF specific endpoints for thank you page
 /0033 { /type "allow" /path "/content/forms/af/*"  /method "GET" /selectors '(guideThankYouPage|guideAsyncThankYouPage)'  /extension '(html)'}
@@ -69,6 +69,9 @@
 # to allow invoke service functionality (FDM)
 /0037 { /type "allow" /path "/content/forms/*" /selectors '(af)'  /extension '(dermis)' }
 
+# to allow forms portal draft and submissions component operation servlet
+/0038 { /type "allow" /path "/content/*" /method "GET" /selectors '(fp)' /extension '(operation)' }
+
 # AEM Screens Filters
 # to allow AEM Screens channels selectors
 /0050 { /type "allow" /method "GET" /url "/screens/channels.json" }
@@ -80,12 +83,18 @@
 # to allow site30 theme servlet
 /0052 { /type "allow" /extension "theme" /path "/content/*" }
 
+# Allow manifest.webmanifest files located in the content
+/0053 { /type "allow" /extension "webmanifest" /path "/content/*/manifest" }
+
+# Allow Apache Sling Sitemap selectors: sitemap, sitemap-index, sitemap.any-nested-or-named-sitemap
+/0054 { /type "allow" /method "GET" /path "/content/*" /selectors 'sitemap(-index)?' /extension "xml" }
+
 # Allow GraphQL & preflight requests
 # GraphQL also supports "GET" requests, if you intend to use "GET" add a rule in filters.any
 /0060 { /type "allow" /method '(POST|OPTIONS)' /url "/content/_cq_graphql/*/endpoint.json" }
 
 # GraphQL Persisted Queries & preflight requests
 /0061 { /type "allow" /method '(GET|POST|OPTIONS)' /url "/graphql/execute.json*" }
 
-# Allow Forms Doc Generation requests
-/0062 { /type "allow" /method "POST" /url "/adobe/forms/doc/*" }
+# Allow Forms Document Services requests
+/0062 { /type "allow" /method "POST" /url "/adobe/forms/*" }
diff --git a/src/main/archetype/pom.xml b/src/main/archetype/pom.xml
@@ -41,6 +41,9 @@
 #if ( $frontendModule != "none" )
         <module>ui.frontend</module>
 #end
+ #if ( $includeFormsheadless == "y" )
+        <module>ui.frontend.react.forms.af</module>
+ #end
         <module>ui.apps</module>
         <module>ui.apps.structure</module>
         <module>ui.config</module>
@@ -71,27 +74,27 @@
         <aio.runtime.namespace>${env.AIO_RUNTIME_NAMESPACE}</aio.runtime.namespace>
         <aio.runtime.auth>${env.AIO_RUNTIME_AUTH}</aio.runtime.auth>
 #end
-        <core.wcm.components.version>2.18.0</core.wcm.components.version>
+        <core.wcm.components.version>2.19.0</core.wcm.components.version>
 #if ( $includeCommerce == "y" )
-        <core.cif.components.version>2.6.0</core.cif.components.version>
+        <core.cif.components.version>2.9.0</core.cif.components.version>
         <magento.graphql.version>9.0.0-magento242ee</magento.graphql.version>
 #if ( $aemVersion != "cloud")
-        <graphql.client.version>1.7.7</graphql.client.version>
+        <graphql.client.version>1.7.10</graphql.client.version>
 #end
 #if ( $aemVersion == "cloud")
         <aem.cif.sdk.api>2022.01.20.00</aem.cif.sdk.api>
 #end
 #end
 
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y") and $aemVersion == "cloud" )
-        <core.forms.components.version>1.0.6</core.forms.components.version>
+#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud" )
+        <core.forms.components.version>1.0.14</core.forms.components.version>
         <aem.forms.sdk.api>SDK_FORMS_VERSION</aem.forms.sdk.api>
 #end
         <bnd.version>5.1.2</bnd.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 #if ( $isSpaProject )
-        <spa.project.core.version>1.3.10</spa.project.core.version>
+        <spa.project.core.version>1.3.12</spa.project.core.version>
 #end
 #if ( $frontendModule == "angular" )
         <!--
@@ -103,7 +106,7 @@
 #end
 #if ( $aemVersion == "cloud")
         <aem.sdk.api>SDK_VERSION</aem.sdk.api>
-        <aemanalyser.version>1.4.2</aemanalyser.version>
+        <aemanalyser.version>1.4.10</aemanalyser.version>
 #end
         <componentGroupName>$appTitle</componentGroupName>
     </properties>
@@ -870,7 +873,7 @@ Bundle-DocURL:
             </dependency>
 #end
 #end
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y") and $aemVersion == "cloud")
+#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud")
             <!-- AEM Forms Dependencies -->
             <dependency>
                 <groupId>com.adobe.aem</groupId>
@@ -889,7 +892,7 @@ Bundle-DocURL:
                 <version>${core.forms.components.version}</version>
             </dependency>
 #end
-#if ( $includeExamples == "y" and ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y") and $aemVersion == "cloud" ) )
+#if ( $includeExamples == "y" and ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud" ) )
             <dependency>
                 <groupId>com.adobe.aem</groupId>
                 <artifactId>core-forms-components-examples-all</artifactId>
@@ -965,4 +968,4 @@ Bundle-DocURL:
         </dependencies>
     </dependencyManagement>
 
-</project>
+</project>