Merge branch 'develop' into form_update

adobe · Sep 30, 2024 · bdc6cdd · bdc6cdd
2 parents 98814f6 + 08be194
commit bdc6cdd
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/maven-deploy-cm.yml b/.github/workflows/maven-deploy-cm.yml
@@ -65,7 +65,7 @@ jobs:
       # Create new project
       - name: Create new project with the archetype
         run: |
-          mvn -B archetype:generate \
+          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=${ARCHETYPE_VERSION} \

diff --git a/.github/workflows/maven-sdk-update.yml b/.github/workflows/maven-sdk-update.yml
@@ -67,7 +67,7 @@ jobs:
       # Create new project
       - name: Create new project with the archetype
         run: |
-          mvn -B archetype:generate \
+          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=${ARCHETYPE_VERSION} \

diff --git a/...ent/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/basic-af/.content.xml b/...ent/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/basic-af/.content.xml
@@ -4,8 +4,9 @@
     <jcr:content
         author="adobe"        
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page"
+        jcr:description="Basic Template provides key components to help users create or modify forms. Users can customize existing components or add new ones to meet their specific needs, offering flexibility for a variety of form creation scenarios."
         jcr:primaryType="cq:PageContent"
         jcr:lastModified="{Date}2021-03-24T18:22:20.809+05:30"
         jcr:title="Basic"
         status="enabled"/>
-</jcr:root>
+</jcr:root>
diff --git a/.../src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/.content.xml b/.../src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/.content.xml
@@ -8,5 +8,6 @@
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:primaryType="cq:PageContent"
         jcr:title="Blank With Core Components"
+        jcr:description="Blank Template based on Adaptive Forms Core Components allows users to create an adaptive form structure, content, and rules from scratch. It offers complete flexibility, as no components are pre-incorporated, enabling users to build forms entirely according to their requirements."
         status="enabled"/>
 </jcr:root>
diff --git a/...ent/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af/.content.xml b/...ent/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af/.content.xml
@@ -4,9 +4,10 @@
     <jcr:content
         author="adobe"        
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page"
+        jcr:description="Blank Template based on Adaptive Forms Foundation Components allows users to create an adaptive form structure, content, and rules from scratch. It offers complete flexibility, as no components are pre-incorporated, enabling users to build forms entirely according to their requirements."
         jcr:primaryType="cq:PageContent"
         jcr:lastModified="{Date}2021-03-24T18:22:20.809+05:30"
         cq:lastModifiedBy="adobe"
         jcr:title="Blank"
         status="enabled"/>
-</jcr:root>
+</jcr:root>
diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -485,6 +485,7 @@
                         <exclude>**/*.png</exclude>
                         <exclude>**/*.jpeg</exclude>
                         <exclude>**/*.jpg</exclude>
+                        <exclude>**/*.gif</exclude>
                         <exclude>**/image</exclude>
                         <exclude>**/original</exclude>
                         <exclude>**/*.eot</exclude>
@@ -503,6 +504,7 @@
                         <include>**/*.png</include>
                         <include>**/*.jpeg</include>
                         <include>**/*.jpg</include>
+                        <include>**/*.gif</include>
                         <include>**/image</include>
                         <include>**/original</include>
                         <include>**/*.eot</include>
@@ -541,6 +543,9 @@
                         <exclude>**/*.png</exclude>
                         <exclude>**/*.jpeg</exclude>
                         <exclude>**/image</exclude>
+                        <exclude>**/folderThumbnail</exclude>
+                        <exclude>**/*.jpg</exclude>
+                        <exclude>**/*.svg</exclude>
                         <exclude>**/original</exclude>
                     </excludes>
                 </fileSet>
@@ -551,7 +556,10 @@
                         <include>**/*.png</include>
                         <include>**/image</include>
                         <include>**/file</include>
+                        <include>**/folderThumbnail</include>
                         <include>**/*.png</include>
+                        <include>**/*.jpg</include>
+                        <include>**/*.svg</include>
                         <include>**/*.jpeg</include>
                         <include>**/image</include>
                         <include>**/original</include>