switch 650

.circleci/ci/it-tests.js

@@ -24,7 +24,8 @@ console.log(config);
 const qpPath = '/home/circleci/cq';
 const buildPath = '/home/circleci/build';
 const { TYPE, BROWSER, AEM, PRERELEASE, FT } = process.env;
-const isLatestAddon = AEM === 'addon-latest';
+const classicFormAddonVersion = 'LATEST';
+const classicFormReleasedAddonVersion = '6.0.1016';
 
 try {
     ci.stage("Integration Tests");
@@ -35,6 +36,15 @@ try {
 
     let extras = ``, preleaseOpts = ``;
     if (AEM === 'classic') {
+        // Download latest add-on release from artifactory
+        ci.sh(`mvn -s ${buildPath}/.circleci/settings.xml com.googlecode.maven-download-plugin:download-maven-plugin:1.6.3:artifact -Partifactory-cloud -DgroupId=com.adobe.aemds -DartifactId=adobe-aemfd-linux-pkg -Dversion=${classicFormReleasedAddonVersion} -Dtype=zip -DoutputDirectory=${buildPath} -DoutputFileName=forms-linux-addon.far`);
+        extras += ` --install-file ${buildPath}/forms-linux-addon.far`;
+        // The core components are already installed in the Cloud SDK
+        extras += ` --bundle com.adobe.cq:core.wcm.components.all:${wcmVersion}:zip`;
+    } else if (AEM === 'classic-latest') {
+        // Download latest add-on release from artifactory
+        ci.sh(`mvn -s ${buildPath}/.circleci/settings.xml com.googlecode.maven-download-plugin:download-maven-plugin:1.6.3:artifact -Partifactory-cloud -DgroupId=com.adobe.aemds -DartifactId=adobe-aemfd-linux-pkg -Dversion=${classicFormAddonVersion} -Dtype=zip -DoutputDirectory=${buildPath} -DoutputFileName=forms-linux-addon.far`);
+        extras += ` --install-file ${buildPath}/forms-linux-addon.far`;
         // The core components are already installed in the Cloud SDK
         extras += ` --bundle com.adobe.cq:core.wcm.components.all:${wcmVersion}:zip`;
     } else if (AEM === 'addon') {
@@ -74,6 +84,7 @@ try {
             ${extras} \
             ${ci.addQpFileDependency(config.modules['core-forms-components-apps'] /*, isLatestAddon ? true : false */)} \
             ${ci.addQpFileDependency(config.modules['core-forms-components-af-apps'] /*, isLatestAddon ? true : false */)} \
+            ${ci.addQpFileDependency(config.modules['core-forms-components-core'])} \\
             ${ci.addQpFileDependency(config.modules['core-forms-components-af-core'])} \
             ${ci.addQpFileDependency(config.modules['core-forms-components-examples-apps'])} \
             ${ci.addQpFileDependency(config.modules['core-forms-components-examples-content'])} \
@@ -84,6 +95,16 @@ try {
             ${ci.addQpFileDependency(config.modules['core-forms-components-it-tests-content'])} \
             --vm-options \\\"-Xmx4096m -XX:MaxPermSize=1024m -Djava.awt.headless=true -javaagent:${process.env.JACOCO_AGENT}=destfile=crx-quickstart/jacoco-it.exec\\\" \
             ${preleaseOpts}`);
+
+        if (AEM === 'classic' || AEM === 'classic-latest') {
+            // add a sleep for 10 mins, add-on takes times to come up
+            ci.sh(`sleep 10m`);
+            // restart the AEM insatnce
+            ci.sh(`./qp.sh stop --id author`);
+            ci.sh(`./qp.sh start --id author`);
+            // add a sleep for 5 mins, add-on takes times to come up
+            ci.sh(`sleep 5m`);
+        }
 });
 
     // Run integration tests

.circleci/config.yml

@@ -51,13 +51,14 @@ common:
           command: npm install axe-html-reporter
       - run:
           name: UI tests
+          no_output_timeout: 20m
           # Supports 'Re-run failed tests only'. See this for more info: https://circleci.com/docs/rerun-failed-tests-only/
           command: |
             TEST_EXECUTED=false
             cd ui.tests/test-module
             TESTFILES=$(circleci tests glob "specs/**/*.spec.js")
             cd ../../
-            echo $TESTFILES | circleci tests run --command="xargs node .circleci/ci/it-tests.js" --verbose --split-by=timings
+            echo $TESTFILES | circleci tests run --command="xargs node .circleci/ci/it-tests.js" --verbose
       - store_test_results:
           path: ui.tests/test-module/test_results
       - run:
@@ -109,8 +110,20 @@ executors:
     docker:
       - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-qp:6.4.6-openjdk11
         <<: *docker_auth
-      - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:1209202301-openjdk11
+      - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:12441-openjdk11
         <<: *docker_auth
+  test_executor_655:
+      docker:
+        - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-qp:6.4.6-openjdk11
+          <<: *docker_auth
+        - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem:6.5.18.0-openjdk11
+          <<: *docker_auth
+  test_executor_655_latest:
+      docker:
+        - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-qp:6.4.6-openjdk11
+          <<: *docker_auth
+        - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem:6.5.19-load2-openjdk11
+          <<: *docker_auth
 
 jobs:
   build-java-11:
@@ -171,42 +184,24 @@ jobs:
       - store_artifacts:
           path: test-results/junit
 
-  cypress-chrome-cloudready-with-addon:
-    executor: test_executor_cloudready
+  cypress-chrome-655:
+    executor: test_executor_655
     environment:
-      AEM: addon
+      AEM: classic
       TYPE: cypress
       BROWSER: chrome
-      PRERELEASE: 'true'
     resource_class: xlarge
     working_directory: /home/circleci/build
-    parallelism: 8
     <<: *cypress_test_steps
 
-  cypress-chrome-cloudready-with-latest-addon:
-    executor: test_executor_cloudready
+  cypress-chrome-655-with-latest-addon:
+    executor: test_executor_655_latest
     environment:
-      AEM: addon-latest
+      AEM: classic-latest
       TYPE: cypress
       BROWSER: chrome
-      PRERELEASE: 'true'
-      FT: 'true'
     resource_class: xlarge
     working_directory: /home/circleci/build
-    parallelism: 8
-    <<: *cypress_test_steps
-
-  cypress-chrome-cloudready-with-latest-addon-without-ft:
-    executor: test_executor_cloudready
-    environment:
-      AEM: addon-latest
-      TYPE: cypress
-      BROWSER: chrome
-      PRERELEASE: 'true'
-      FT: 'false'
-    resource_class: xlarge
-    working_directory: /home/circleci/build
-    parallelism: 8
     <<: *cypress_test_steps
 
   jsdocs-deploy:
@@ -345,21 +340,14 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - cypress-chrome-cloudready-with-addon:
-          filters:
-            tags:
-              only: /.*/
-          requires:
-            - build-java-11
-            - build-java-8
-      - cypress-chrome-cloudready-with-latest-addon:
+      - cypress-chrome-655:
           filters:
             tags:
               only: /.*/
           requires:
             - build-java-11
             - build-java-8
-      - cypress-chrome-cloudready-with-latest-addon-without-ft:
+      - cypress-chrome-655-with-latest-addon:
           filters:
             tags:
               only: /.*/

README.md

@@ -21,12 +21,6 @@ See [AEM Sites Core Components](https://docs.adobe.com/content/help/en/experienc
 
 -   [Adaptive Form - Embed](ui.apps/src/main/content/jcr_root/apps/core/fd/components/aemform/v2/aemform)
 
-### Forms And Communications Portal
-
--   [Link Component](ui.apps/src/main/content/jcr_root/apps/core/fd/components/formsportal/link/v1/link)
--   [Drafts and Submissions Component](ui.apps/src/main/content/jcr_root/apps/core/fd/components/formsportal/draftsandsubmissions/v1/draftsandsubmissions)
--   [Search and Lister Component](ui.apps/src/main/content/jcr_root/apps/core/fd/components/formsportal/searchlister/v1/searchlister)
-
 ### Adaptive Form
 
 -   [Form Container](ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container)
@@ -56,9 +50,11 @@ See [AEM Sites Core Components](https://docs.adobe.com/content/help/en/experienc
 
 The latest version of the AEM Forms Core Components, require the below minimum system requirements:
 
-| Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java  | Maven  |  
-|-----------------------|---------------------| ---------------------------- | ----- | ------ | 
-| 2.0.56                | 2.23.0             | Continual                    | 8, 11 | 3.3.9+ |
+
+| Forms Core Components | WCM Core Components | AEM 6.5 | Java  | Maven  |  
+|-----------------------|---------------------|---------| ----- | ------ | 
+| 1.1.24                | 2.23.2              | 6.5.18+ | 8, 11 | 3.3.9+ |
+
 
 For a list of requirements for previous versions, see [Historical System Requirements](VERSIONS.md).
 
@@ -158,13 +154,6 @@ and sub package section
 to the `content-package-maven-plugin`.
 
 
-## Using Pre-release versions
-In order to use components under pre-release:  
-1. Enable the pre-release channel. Instructions at https://experienceleague.adobe.com/docs/experience-manager-cloud-service/content/release-notes/prerelease.html?lang=en
-   1. Replace `core-forms-components-*` version with the desired pre-release version (e.g `1.0.4-PRERELEASE-20211223`) in your Cloud Manager / AEM Archetype project. This can be done by updating `<core.forms.components.version>x.y.z</core.forms.components.version>` in the top level pom.xml of archetype project.
-
-Contents in the pre-release are contained in the `pre-release` branch.
-
 ## Code Formatting
 
 ### Java

VERSIONS.md

@@ -2,50 +2,13 @@
 
 See below for a full list of minimum system requirements for historical versions of the Forms Core Components:
 
-| Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java  | Maven  |  
-|-----------------------|---------------------| ---------------------------- | ----- | ------ |
-| 2.0.56                | 2.23.0             | Continual                    | 8, 11 | 3.3.9+ |
-| 2.0.54                | 2.23.0             | Continual                    | 8, 11 | 3.3.9+ |
-| 2.0.52                | 2.23.0             | Continual                    | 8, 11 | 3.3.9+ |
-| 2.0.50                | 2.23.0             | Continual                    | 8, 11 | 3.3.9+ |
-| 2.0.48                | 2.23.0             | Continual                    | 8, 11 | 3.3.9+ |
-| 2.0.46                | 2.23.0             | Continual                    | 8, 11 | 3.3.9+ |
-| 2.0.44                | 2.23.0              | Continual                    | 8, 11 | 3.3.9+ |
-| 2.0.42                | 2.23.0              | Continual                    | 8, 11 | 3.3.9+ |
-| 2.0.40                | 2.23.0              | Continual                    | 8, 11 | 3.3.9+ |
-| 2.0.36                | 2.23.0              | Continual                    | 8, 11 | 3.3.9+ |
-| 2.0.26                | 2.22.12             | Continual                    | 8, 11 | 3.3.9+ |
-| 2.0.18                | 2.22.10             | Continual                    | 8, 11 | 3.3.9+ |
-| 2.0.14                | 2.21.2              | Continual                    | 8, 11 | 3.3.9+ |
-| 2.0.6                 | 2.21.2              | Continual                    | 8, 11 | 3.3.9+ |                      |                     |                              |       |        |
-| 2.0.4                 | 2.21.2              | Continual                    | 8, 11 | 3.3.9+ |
-| 2.0.2                 | 2.21.2              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.1.8                 | 2.21.2              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.1.6                 | 2.21.2              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.56                | 2.21.2              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.54                | 2.21.0              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.52                | 2.21.0              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.50                | 2.21.0              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.48                | 2.21.0              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.46                | 2.21.0              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.44                | 2.21.0              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.42                | 2.20.8              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.40                | 2.20.8              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.38                | 2.20.8              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.36                | 2.20.8              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.34                | 2.20.8              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.30                | 2.20.8              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.28                | 2.20.8              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.26                | 2.20.8              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.24                | 2.20.2              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.22                | 2.20.2              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.20                | 2.20.2              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.18                | 2.20.2              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.16                | 2.19.0              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.14                | 2.19.0              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.12                | 2.19.0              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.10                | 2.19.0              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.8                 | 2.18.0              | Continual                    | 8, 11 | 3.3.9+ |
-| 1.0.4                 | 2.18.0              | Continual                    | 8, 11 | 3.3.9+ |  
-| 1.0.2                 | 2.10.0              | Continual                    | 8, 11 | 3.3.9+ |  
+| Forms Core Components | WCM Core Components | AEM 6.5 | Java  | Maven  |  
+|-----------------------|---------------------|---------| ----- | ------ |
+| 1.1.24                | 2.22.12             | 6.5.17+ | 8, 11 | 3.3.9+ |
+| 1.1.22                | 2.22.12             | 6.5.17+ | 8, 11 | 3.3.9+ |
+| 1.1.20                | 2.22.10             | 6.5.17+ | 8, 11 | 3.3.9+ |
+| 1.1.18                | 2.21.2              | 6.5.17+ | 8, 11 | 3.3.9+ |
+| 1.1.16                | 2.21.2              | 6.5.17+ | 8, 11 | 3.3.9+ |
+| 1.1.12                | 2.21.2              | 6.5.16+ | 8, 11 | 3.3.9+ |
+
 

all/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>2.0.57-SNAPSHOT</version>
+        <version>1.1.25-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -167,4 +167,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>

bundles/af-core/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>2.0.57-SNAPSHOT</version>
+        <version>1.1.25-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -86,10 +86,16 @@
                         <!-- Enable processing of OSGI metatype annotations -->
                         <_metatypeannotations>*</_metatypeannotations>
                         <Import-Package>
-                            javax.annotation;version=0.0.0,
-                            com.adobe.cq.wcm.core.components.models;version="[12.0.0,13.0.0)",
+<!--                            javax.annotation;version=0.0.0,-->
+                            <!-- https://github.com/jhy/jsoup/issues/1616 -->
+                            javax.annotation;version=!;resolution:=optional,javax.annotation.meta;version=!;resolution:=optional,
+                            <!-- com.adobe.cq.wcm.core.components.models;version="[12.0.0,13.0.0)", -->
                             *
                         </Import-Package>
+                        <Embed-Dependency>
+                            core.wcm.components.core;
+                            jsoup;
+                        </Embed-Dependency>
                     </instructions>
                 </configuration>
                 <dependencies>
@@ -160,7 +166,7 @@
                                                 <limit>
                                                     <counter>INSTRUCTION</counter>
                                                     <value>COVEREDRATIO</value>
-                                                    <minimum>0.80</minimum>
+                                                    <minimum>0.60</minimum>
                                                 </limit>
                                             </limits>
                                         </rule>
@@ -454,25 +460,31 @@
             <artifactId>httpclient</artifactId>
         </dependency>
 
-
-        <!-- AEM and forms sdk versions -->
-        <!-- the below order of dependencies is very critical -->
-
         <dependency>
-            <groupId>com.adobe.aem</groupId>
-            <artifactId>aem-forms-sdk-api</artifactId>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.15.3</version>
+            <scope>compile</scope>
         </dependency>
 
 
+        <!-- AEM and forms sdk versions -->
+        <!-- the below order of dependencies is very critical -->
+
         <dependency>
-            <groupId>com.adobe.aem</groupId>
-            <artifactId>aem-sdk-api</artifactId>
+            <groupId>com.adobe.aemfd</groupId>
+            <artifactId>aemfd-client-sdk</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>com.adobe.aem</groupId>
             <artifactId>uber-jar</artifactId>
-            <classifier>apis</classifier>
         </dependency>
 
         <!-- End of AEM and forms sdk versions -->

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java

@@ -50,6 +50,9 @@ private FormConstants() {
     /** The resource type for checkbox v1 */
     public static final String RT_FD_FORM_CHECKBOX_V1 = RT_FD_FORM_PREFIX + "checkbox/v1/checkbox";
 
+    /** The resource type for switch v1 */
+    public static final String RT_FD_FORM_SWITCH_V1 = RT_FD_FORM_PREFIX + "switch/v1/switch";
+
     /** The resource type for date picker v1 */
     public static final String RT_FD_FORM_DATE_PICKER_V1 = RT_FD_FORM_PREFIX + "datepicker/v1/datepicker";
 
@@ -108,6 +111,9 @@ private FormConstants() {
 
     public static final String RT_FD_FRAGMENT_CONTAINER_V1 = RT_FD_FORM_PREFIX + "fragmentcontainer/v1/fragmentcontainer";
 
+    /** The resource type for terms and conditions v1 */
+    public static final String RT_FD_FORM_TERMS_AND_CONDITIONS_V1 = RT_FD_FORM_PREFIX + "termsandconditions/v1/termsandconditions";
+
     public static final String FORM_FIELD_TYPE = "form";
 
     public static final String REQ_ATTR_FORMCONTAINER_PATH = "formContainerPath";