FORMS-7603 forms core components changes (#1074)

* FORMS-7603 forms core components changes

* FORMS-7603 update forms core components 6.5

---------

Co-authored-by: barshatr <barshatr@adobe.com>

src/main/archetype/pom.xml

@@ -86,8 +86,8 @@
         <core.forms.components.version>2.0.14</core.forms.components.version>
         <core.forms.components.af.version>2.0.14</core.forms.components.af.version>
 #else
-        <core.forms.components.version>1.1.12</core.forms.components.version>
-        <core.forms.components.af.version>1.1.12</core.forms.components.af.version>
+        <core.forms.components.version>1.1.18</core.forms.components.version>
+        <core.forms.components.af.version>1.1.18</core.forms.components.af.version>
 #end
         <aem.forms.sdk.api>SDK_FORMS_VERSION</aem.forms.sdk.api>
 #end

src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/formcontainer/.content.xml

@@ -5,4 +5,4 @@
     jcr:title="Adaptive Form Container"
     fd:version="2.1"
     sling:resourceSuperType="core/fd/components/form/container/v2/container"
-    componentGroup=".${appTitle} - Adaptive Form"/>
+    componentGroup="${appTitle} - Adaptive Form"/>

src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/pageheader/_cq_template.xml

@@ -21,7 +21,7 @@
     <image
         jcr:primaryType="nt:unstructured"
         jcr:title="Logo"
-        sling:resourceType="wcm/foundation/components/image"
+        sling:resourceType="${appId}/components/image"
         name="logoImage"/>
     <text
         jcr:primaryType="nt:unstructured"

src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/aemformscontainer/.content.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
           jcr:primaryType="cq:Component"
-          jcr:title="AEM Forms Container"
+          jcr:title="Adaptive Form - Embed"
           sling:resourceSuperType="core/fd/components/aemform/v1/aemform"
           componentGroup="${appTitle} - Forms"/>

src/test/resources/projects/forms-basic-6.5.0/archetype.properties

@@ -0,0 +1,27 @@
+groupId=archetype.it
+artifactId=testing-basicforms650
+appId=testing-basicforms650
+package=it.pkg
+version=0.1-SNAPSHOT
+appTitle=Test Basic Project
+aemVersion=6.5.15
+sdkVersion=latest
+language=en
+country=us
+singleCountry=n
+frontendModule=none
+includeExamples=y
+includeErrorHandler=y
+includeDispatcherConfig=y
+includeCommerce=n
+commerceEndpoint=https://hostname.com/grapql
+includeForms=n
+includeFormsenrollment=y
+includeFormscommunications=n
+sdkFormsVersion=latest
+datalayer=y
+amp=y
+enableDynamicMedia=y
+enableSSR=n
+precompiledScripts=n
+includeFormsheadless=n

src/test/resources/projects/forms-basic-6.5.0/goal.txt

@@ -0,0 +1 @@
+install