Merge pull request #1170 from adobe/release65-to-release65-eds

Release650 to release650-eds  merge 8th - April

.circleci/ci/it-tests.js

@@ -25,7 +25,8 @@ const qpPath = '/home/circleci/cq';
 const buildPath = '/home/circleci/build';
 const { TYPE, BROWSER, AEM, PRERELEASE, FT, CONTEXTPATH, FTCONFIG} = process.env;
 const classicFormAddonVersion = 'LATEST';
-const classicFormReleasedAddonVersion = '6.0.1120'; // change this value to last form released addon version
+// this value is for 6.5.20.0 version as per, https://experienceleague.adobe.com/en/docs/experience-manager-release-information/aem-release-updates/forms-updates/aem-forms-releases
+const classicFormReleasedAddonVersion = '6.0.1192';
 
 try {
     ci.stage("Integration Tests");
@@ -41,6 +42,8 @@ try {
             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`;
+            // add hotfix for 6520, remove it later if required
+            // extras += ` --install-file ${buildPath}/it/core/src/main/resources/Hotfix-6520-Linux.zip`;
         } else if (AEM === 'classic-latest' || AEM === 'classic-latest-cp') {
             // 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`);
@@ -107,7 +110,7 @@ try {
             ci.sh(`./qp.sh stop --id author`);
             ci.sh(`./qp.sh start --id author`);
             // add a sleep for 7 mins, add-on takes times to come up
-            ci.sh(`sleep 10m`);
+            ci.sh(`sleep 12m`);
         }
     });
 

.circleci/config.yml

@@ -128,7 +128,7 @@ 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:6.5.21-load2-openjdk11
+      - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem:6.5.21-load3-openjdk11
         <<: *docker_auth
 
 jobs:
@@ -322,8 +322,13 @@ jobs:
       - run:
           name: Update VERSIONS.md and README.md with the new released version
           command: |
+            # Echo Git version
+            echo "Git Version: $(git --version)"
+
+            # Echo Circle CI tag
             echo "CIRCLE_TAG: $CIRCLE_TAG"
-            RELEASE_BRANCH=$(git branch --contains ${CIRCLE_TAG} | awk 'FNR==2 {print $1}')
+            # Hardcoding the branch on release/650, since finding branch name with tag does not return correct output
+            RELEASE_BRANCH="release/650"
 
             # Debugging output
             echo "RELEASE_BRANCH: $RELEASE_BRANCH"
@@ -340,14 +345,14 @@ jobs:
             # Debugging output
             echo "BRANCH_NAME: $BRANCH_NAME"
 
-            # Find the last two tags on the branch
-            LAST_TWO_TAGS=$(git tag -l "core-forms-components-reactor-*" | sort -V -r | head -n 2)
+            # Find the last tag on the branch, ignoring the private release
+            LAST_TAG=$(git tag -l --sort=-v:refname "core-forms-components-reactor-*" | grep -v -- '-[[:alnum:]]*$' | awk -v tag="$CIRCLE_TAG" '$0 < tag' | head -n 1)
 
             # Debugging output
-            echo "LAST_TWO_TAGS: $LAST_TWO_TAGS"
+            # echo "LAST_TWO_TAGS: $LAST_TWO_TAGS"
 
             # Extract the last released from the output
-            LAST_TAG=$(echo "$LAST_TWO_TAGS" | tail -n 1)
+            # LAST_TAG=$(echo "$LAST_TWO_TAGS" | tail -n 1)
 
             # Debugging output
             echo "LAST_TAG: $LAST_TAG"
@@ -372,13 +377,13 @@ jobs:
             # Debugging output
             echo "WCM_CORE_COMPONENTS_VERSION: $WCM_CORE_COMPONENTS_VERSION"
 
-            echo "Before sed: $(cat VERSIONS.md)"
+            # echo "Before sed: $(cat VERSIONS.md)"
             # update versions.md
             sed -i "/$LAST_VERSION/ { p; b; }; 1,/$LAST_VERSION/ { p; d; }" VERSIONS.md
             sed -i -E "0,/(\| $LAST_VERSION\s*\|) [0-9]+\.[0-9]+\.[0-9]+\s*\|/s//| $NEW_VERSION                \| $WCM_CORE_COMPONENTS_VERSION             |/" VERSIONS.md
             echo "After sed: $(cat VERSIONS.md)"
 
-            echo "Before sed: $(cat README.md)"
+            # echo "Before sed: $(cat README.md)"
             # update readme.md
             sed -i -E "s/(\| $LAST_VERSION\s*\|) [0-9]+\.[0-9]+\.[0-9]+ \s*\| /| $NEW_VERSION                | $WCM_CORE_COMPONENTS_VERSION             | /g" README.md
             echo "After sed: $(cat README.md)"
@@ -445,7 +450,6 @@ workflows:
       - release:
           requires:
             - build-java-11
-            - jsdocs-deploy
           filters:
             branches:
               ignore: /.*/

README.md

@@ -50,10 +50,9 @@ 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 6.5 | Java  | Maven  |  
 |-----------------------|---------------------|---------| ----- | ------ | 
-| 1.1.34                | 2.24.2              | 6.5.18+ | 8, 11 | 3.3.9+ |
+| 1.1.36                | 2.24.2              | 6.5.18+ | 8, 11 | 3.3.9+ |
 
 
 For a list of requirements for previous versions, see [Historical System Requirements](VERSIONS.md).

VERSIONS.md

@@ -4,6 +4,7 @@ See below for a full list of minimum system requirements for historical versions
 
 | Forms Core Components | WCM Core Components | AEM 6.5 | Java  | Maven  |  
 |-----------------------|---------------------|---------| ----- | ------ |
+| 1.1.36                | 2.24.2              | 6.5.20+ | 8, 11 | 3.3.9+ |
 | 1.1.34                | 2.24.2              | 6.5.18+ | 8, 11 | 3.3.9+ |
 | 1.1.32                | 2.23.2              | 6.5.18+ | 8, 11 | 3.3.9+ |
 | 1.1.28                | 2.23.2              | 6.5.19+ | 8, 11 | 3.3.9+ |
@@ -14,5 +15,4 @@ See below for a full list of minimum system requirements for historical versions
 | 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+ |
-
 

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

@@ -15,6 +15,7 @@
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 package com.adobe.cq.forms.core.components.internal.models.v1.form;
 
+import javax.annotation.Nullable;
 import javax.annotation.PostConstruct;
 
 import org.apache.sling.api.SlingHttpServletRequest;
@@ -24,7 +25,6 @@
 import org.apache.sling.models.annotations.Model;
 import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
 import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
-import org.jetbrains.annotations.Nullable;
 
 import com.adobe.cq.export.json.ComponentExporter;
 import com.adobe.cq.export.json.ExporterConstants;
@@ -64,7 +64,6 @@ public class NumberInputImpl extends AbstractFieldImpl implements NumberInput {
     @Nullable
     private Boolean excludeMinimumCheck;
     /** End **/
-
     private Long exclusiveMinimumVaue;
     private Long exclusiveMaximumValue;
 

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

@@ -69,7 +69,6 @@ public class TextInputImpl extends AbstractFieldImpl implements TextInput {
     private Object exclusiveMaximumValue;
 
     /** End of Type number specific constraints **/
-
     @Override
     public boolean isMultiLine() {
         return multiLine;

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/Field.java

@@ -98,4 +98,14 @@ default Object[] getDefault() {
         return null;
     }
 
+    /**
+     * The expression that when evaluated would determine what the displayValue of a field would be
+     *
+     * @return display value expression of the field
+     * @since com.adobe.cq.forms.core.components.models.form 5.2.0
+     */
+    default String getDisplayValueExpression() {
+        return null;
+    }
+
 }

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java

@@ -65,7 +65,7 @@ public interface FormContainer extends Container {
     String PN_CLIENT_LIB_REF = GuideConstants.CLIENT_LIB_REF;
 
     String THEME_CLIENT_LIB_REF = "themeClientLibRef";
-    String DEFAULT_FORMS_SPEC_VERSION = "0.12.1";
+    String DEFAULT_FORMS_SPEC_VERSION = "0.12.5";
 
     /**
      * Returns form metadata {@link FormMetaData}
@@ -90,7 +90,7 @@ default String getAdaptiveFormVersion() {
      * Returns schema reference
      *
      * @return reference to schema
-     * 
+     *
      * @since com.adobe.cq.forms.core.components.models.form 2.1.0
      */
     @Nullable

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/Label.java

@@ -21,10 +21,21 @@
 /**
  * Interface for a label
  *
- * @since com.adobe.cq.forms.core.components.models.form 5.4.0
+ * @since com.adobe.cq.forms.core.components.models.form 0.0.1
  */
 @ConsumerType
-public interface Label extends TextContent {
+public interface Label {
+
+    /**
+     * Returns {@code true} if label is rich text, otherwise {@code false}.
+     *
+     * @return {@code true} if label is rich text, otherwise {@code false}
+     * @since com.adobe.cq.forms.core.components.models.form 0.0.1
+     */
+    @Nullable
+    default Boolean isRichText() {
+        return null;
+    }
 
     /**
      * Returns {@code true} if label should be visible, otherwise {@code false}.
@@ -37,4 +48,15 @@ default Boolean isVisible() {
         return null;
     }
 
+    /**
+     * Returns the value of this label.
+     *
+     * @return the value of this label
+     * @since com.adobe.cq.forms.core.components.models.form 0.0.1
+     */
+    @Nullable
+    default String getValue() {
+        return null;
+    }
+
 }

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/NumberInput.java

@@ -27,7 +27,6 @@
  */
 @ConsumerType
 public interface NumberInput extends Field, NumberConstraint {
-
     @Nullable
     @JsonIgnore
     default String getEditFormat() {

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/OptionsConstraint.java

@@ -17,7 +17,6 @@
 
 import org.osgi.annotation.versioning.ProviderType;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -58,17 +57,5 @@ default boolean isEnforceEnum() {
      * @return the list of enum names
      * @since com.adobe.cq.forms.core.components.models.form 0.0.1
      */
-    @Deprecated
-    @JsonIgnore
     String[] getEnumNames();
-
-    /**
-     * Returns a list of RichText to be displayed to the end user.
-     * The length of enum and enumNames array must match
-     *
-     * @return the list of enum names
-     * @since com.adobe.cq.forms.core.components.models.form 5.4.0
-     */
-    @JsonProperty("enumNames")
-    TextContent[] getEnumNamesAsTextContent();
 }

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java

@@ -34,7 +34,7 @@
  * version, is bound to this proxy component resource type.
  * </p>
  */
-@Version("5.4.0") // aligning this with release/650 since af2-rest-api is compiled with 5.2.0 in release/650
+@Version("5.3.0") // aligning this with release/650 since af2-rest-api is compiled with 5.2.0 in release/650
 package com.adobe.cq.forms.core.components.models.form;
 
 import org.osgi.annotation.versioning.Version;

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractBaseImpl.java

@@ -269,7 +269,7 @@ protected String getConstraintMessage(ConstraintType type) {
                     putConstraintMessage(ConstraintType.FORMAT, msgs.getFormatConstraintMessage());
                 }
 
-                if (type.equals(Type.NUMBER)) {
+                if (type.equals(Type.NUMBER) || type.equals(Type.INTEGER)) {
                     putConstraintMessage(ConstraintType.MINIMUM, msgs.getMinimumConstraintMessage());
                     putConstraintMessage(ConstraintType.MAXIMUM, msgs.getMaximumConstraintMessage());
                 }

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFieldImpl.java

@@ -64,6 +64,10 @@ public abstract class AbstractFieldImpl extends AbstractBaseImpl implements Fiel
     @Nullable
     protected String editFormat;
 
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL)
+    @Nullable
+    protected String displayValueExpression;
+
     @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = "dataFormat")
     @Nullable
     protected String dataFormat;
@@ -181,6 +185,12 @@ public String getEditFormat() {
         return editFormat;
     }
 
+    @Override
+    @Nullable
+    public String getDisplayValueExpression() {
+        return displayValueExpression;
+    }
+
     @Override
     @Nullable
     public String getDataFormat() {