adobe · armaang1729 · Nov 7, 2025 · Nov 7, 2025 · Nov 7, 2025 · Nov 7, 2025
diff --git a/...ontent/jcr_root/apps/forms-components-examples/components/form/checkboxgroup/.content.xml b/...ontent/jcr_root/apps/forms-components-examples/components/form/checkboxgroup/.content.xml
@@ -3,5 +3,5 @@
   jcr:primaryType="cq:Component"
   jcr:title="Adaptive Form CheckBox Group"
   jcr:description="Add checkboxes to select one or more of the available options."
-  sling:resourceSuperType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
+  sling:resourceSuperType="core/fd/components/form/checkboxgroup/v2/checkboxgroup"
   componentGroup="Core Components Examples - Adaptive Form"/>
diff --git a/...tent/jcr_root/apps/forms-core-components-it/components/page-dynamicoptionsv1/.content.xml b/...tent/jcr_root/apps/forms-core-components-it/components/page-dynamicoptionsv1/.content.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2024 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<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:description="Page Component for v1 Dynamic Options Testing"
+    jcr:primaryType="cq:Component"
+    jcr:title="Page - Dynamic Options V1"
+    sling:resourceSuperType="forms-components-examples/components/page"
+    componentGroup=".hidden"/>
diff --git a/...root/apps/forms-core-components-it/components/page-dynamicoptionsv1/customfooterlibs.html b/...root/apps/forms-core-components-it/components/page-dynamicoptionsv1/customfooterlibs.html
@@ -0,0 +1,29 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2024 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+<sly data-sly-use.clientlib="core/wcm/components/commons/v1/templates/clientlib.html"
+     data-sly-use.formclientlibmanager="com.adobe.cq.forms.core.components.models.form.FormClientLibManager">
+    <sly data-sly-repeat="${formclientlibmanager.clientLibRefList}" data-sly-call="${clientlib.js @ categories=item, async=true}"/>
+</sly>
+<!-- Adding v1 component clientlibs for dynamic options test -->
+<!-- core.forms.components.radiobutton.v1.runtime and core.forms.components.checkboxgroup.v1.runtime are loaded explicitly -->
+<sly data-sly-use.clientlib="core/wcm/components/commons/v1/templates/clientlib.html">
+    <sly data-sly-test="${!wcmmode.edit}" data-sly-call="${clientlib.js @ categories=['core.forms.components.runtime.base','core.forms.components.container.v2.runtime','core.forms.components.radiobutton.v1.runtime','core.forms.components.checkboxgroup.v1.runtime','core.forms.components.dropdown.v1.runtime','core.forms.components.button.v1.runtime'], async=false}"/>
+</sly>
+<sly data-sly-use.page="com.adobe.cq.wcm.core.components.models.Page">
+    <sly data-sly-test="${page.data && page.dataLayerClientlibIncluded}" data-sly-call="${clientlib.js @ categories='core.forms.components.commons.v1.datalayer', async=true}"></sly>
+</sly>
+
+
diff --git a/...m/formsanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv1/.content.xml b/...m/formsanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv1/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+          jcr:mixinTypes="[rep:AccessControllable]"
+          jcr:primaryType="sling:Folder"
+          lcFolder="{Long}0"
+          type="lcFolder"/>
diff --git a/.../samples/checkboxgroup/basic/.content.xml → ...xgroup/checkboxgroupv1/basic/.content.xml b/.../samples/checkboxgroup/basic/.content.xml → ...xgroup/checkboxgroupv1/basic/.content.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
           jcr:primaryType="dam:Asset">
     <jcr:content
-            jcr:lastModified="{Date}2023-05-03T11:33:58.405+05:30"
+            jcr:lastModified="{Date}2025-11-16T16:00:00.000+05:30"
             jcr:primaryType="dam:AssetContent"
             sling:resourceType="fd/fm/af/render"
             guide="1"
@@ -16,6 +16,6 @@
                 dorType="none"
                 formmodel="none"
                 hasCustomThumbnail="{Boolean}false"
-                title="Adaptive Form V2 (IT)"/>
+                title="basic"/>
     </jcr:content>
 </jcr:root>
diff --git a/...m/formsanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv2/.content.xml b/...m/formsanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv2/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+          jcr:mixinTypes="[rep:AccessControllable]"
+          jcr:primaryType="sling:Folder"
+          lcFolder="{Long}0"
+          type="lcFolder"/>
diff --git a/...sanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv2/basic/.content.xml b/...sanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv2/basic/.content.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+          jcr:primaryType="dam:Asset">
+    <jcr:content
+            jcr:lastModified="{Date}2025-11-16T16:00:00.000+05:30"
+            jcr:primaryType="dam:AssetContent"
+            sling:resourceType="fd/fm/af/render"
+            guide="1"
+            type="guide">
+        <metadata
+                fd:version="2.1"
+                jcr:primaryType="nt:unstructured"
+                allowedRenderFormat="HTML"
+                author="admin"
+                availableInMobileApp="{Boolean}false"
+                dorType="none"
+                formmodel="none"
+                hasCustomThumbnail="{Boolean}false"
+                title="basic"/>
+    </jcr:content>
+</jcr:root>
diff --git a/...sanddocuments/core-components-it/samples/customfunctions/populate-checkboxv2/.content.xml b/...sanddocuments/core-components-it/samples/customfunctions/populate-checkboxv2/.content.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
+          jcr:primaryType="dam:Asset">
+    <jcr:content
+            jcr:lastModified="{Date}2025-11-16T16:00:00.000+05:30"
+            jcr:primaryType="dam:AssetContent"
+            sling:resourceType="fd/fm/af/render"
+            guide="1"
+            type="guide">
+        <metadata
+                fd:version="2.1"
+                jcr:primaryType="nt:unstructured"
+                xmp:CreatorTool="AEM Forms"
+                allowedRenderFormat="HTML"
+                author="admin"
+                availableInMobileApp="{Boolean}false"
+                dorTemplateChanged="Boolean"
+                dorType="none"
+                formmodel="none"
+                themeRef="/libs/fd/af/themes/canvas"
+                title="Populate-Checkboxv2"/>
+    </jcr:content>
+</jcr:root>
diff --git a/...nddocuments/core-components-it/samples/dynamicenumenumnames/dynamicoptionsv2/.content.xml b/...nddocuments/core-components-it/samples/dynamicenumenumnames/dynamicoptionsv2/.content.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
+    jcr:primaryType="dam:Asset">
+    <jcr:content
+        cq:conf="\0"
+        jcr:lastModified="{Date}2025-01-09T12:00:00.000+05:30"
+        jcr:primaryType="dam:AssetContent"
+        sling:resourceType="fd/fm/af/render"
+        guide="1"
+        type="guide">
+        <metadata
+            fd:version="2.1"
+            jcr:language="en"
+            jcr:primaryType="nt:unstructured"
+            xmp:CreatorTool="AEM Forms AF Wizard"
+            allowedRenderFormat="HTML"
+            author="admin"
+            dorType="none"
+            formmodel="none"
+            themeRef="/libs/fd/af/themes/canvas"
+            title="dynamicOptionsv2"/>
+    </jcr:content>
+</jcr:root>
diff --git a/...nt/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml b/...nt/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml
@@ -44,7 +44,7 @@
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Check Box Group"
-                sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                 enum="[0,1]"
                 enumNames="[Item 1, Item 2]"
                 fieldType="checkbox-group"
@@ -224,7 +224,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="&lt;p>&lt;b>Select Animal&lt;/b>&lt;/p>"
-                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                     areOptionsRichText="true"
                     enabled="{Boolean}true"
                     enum="[0,1]"

diff --git a/...ot/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv1/.content.xml b/...ot/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv1/.content.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+          jcr:mixinTypes="[rep:AccessControllable]"
+          jcr:primaryType="sling:Folder"
+          hidden="true"/>
diff --git a/.../samples/checkboxgroup/basic/.content.xml → ...xgroup/checkboxgroupv1/basic/.content.xml b/.../samples/checkboxgroup/basic/.content.xml → ...xgroup/checkboxgroupv1/basic/.content.xml
@@ -63,7 +63,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Check Box Group 3"
-                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                     enabled="{Boolean}true"
                     enum="[0,1]"
                     enumNames="[Item 1, Item 2]"
@@ -118,7 +118,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Check Box Group 5"
-                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                     enabled="{Boolean}true"
                     enum="[0,1]"
                     enumNames="[Item 1, Item 2]"
@@ -141,7 +141,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Check Box Group 6"
-                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                     enabled="{Boolean}true"
                     enum="[0,1,0]"
                     enumNames="[Item 1, Item 2,Item 3]"
@@ -160,7 +160,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="&lt;p>&lt;b>Select Animal&lt;/b>&lt;/p>"
-                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                     areOptionsRichText="true"
                     enabled="{Boolean}true"
                     enum="[0,1]"

diff --git a/.../forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv1/focustest/.content.xml b/.../forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv1/focustest/.content.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
+    jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:deviceGroups="[/etc/mobile/groups/responsive]"
+        cq:lastModified="{Date}2023-10-19T13:14:31.885+05:30"
+        cq:lastModifiedBy="admin"
+        cq:template="/conf/core-components-examples/settings/wcm/templates/af-blank-v2"
+        jcr:language="en"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="focustest"
+        sling:configRef="/conf/forms/core-components-it/samples/checkboxgroup/focustest/"
+        sling:resourceType="forms-components-examples/components/page">
+        <guideContainer
+            fd:version="2.1"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="forms-components-examples/components/form/container"
+            dorType="none"
+            fieldType="form"
+            thankYouOption="page"
+            themeRef="/libs/fd/af/themes/canvas"
+            title="focustest">
+            <button
+                jcr:created="{Date}2023-10-19T13:13:52.618+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2023-10-19T13:13:52.618+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Button"
+                sling:resourceType="forms-components-examples/components/form/button"
+                dorExclusion="true"
+                fieldType="button"
+                name="button1697701432805">
+                <fd:rules
+                    fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button1697701432805&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button1697701432805&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_FOCUS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;AFCOMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup1697701437345&quot;\,&quot;displayName&quot;:&quot;Check Box Group&quot;\,&quot;type&quot;:&quot;AFCOMPONENT&quot;\,&quot;displayPath&quot;:&quot;FORM/Check Box Group/&quot;\,&quot;name&quot;:&quot;checkboxgroup1697701437345&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;setFocus(checkboxgroup1697701437345)&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    click="[setFocus(checkboxgroup1697701437345)]"/>
+            </button>
+            <checkboxgroup
+                jcr:created="{Date}2023-10-19T13:13:56.745+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2023-10-19T13:13:56.745+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Check Box Group"
+                sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
+                enum="[0,1]"
+                enumNames="[Item 1, Item 2]"
+                fieldType="checkbox-group"
+                name="checkboxgroup1697701437345"
+                type="number[]"/>
+        </guideContainer>
+    </jcr:content>
+</jcr:root>
diff --git a/...ot/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv2/.content.xml b/...ot/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv2/.content.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+          jcr:mixinTypes="[rep:AccessControllable]"
+          jcr:primaryType="sling:Folder"
+          hidden="true"/>