Release preparation 2021.05.22 (#136)

* @releng - update CIF Core Components dependency to SNAPSHOT version * CIF-1718 - Adopt Magento GraphQL schema changes - Category UID - update graphql dependency to 2.4.2 EE to align with CIF components * CIF-2015 - Migrate to Azul Zulu JDK (#125) * @trivial fix ui.frontend readme (#128) * CIF-2039 - Missing root category field in catalog page properties (#127) * CIF-2039 - Missing root category field in catalog page properties * added UI test for catalog page properties extensions * CIF-2039 - Missing root category field in catalog page properties * added UI test for catalog page properties extensions * CIF-2039 - Missing root category field in catalog page properties * fixed root category field label in UI test * CIF-1907 - Build navigation component based on WCM Core Component (#126) * CIF-1907 - Build navigation component based on WCM Core Component * implemented Venia theme for navigation component v2 * CIF-1907 - Build navigation component based on WCM Core Component * fix test failures Co-authored-by: Markus Haack <mhaack@adobe.com> * @trivial - update dependencies (#129) * CIF-1746 - Create CIF data types for Content Fragment Models (#102) * enable content fragment models in Venia configuration * CIF-2007 - Use latest releases of CIF Add-on for IT and UI tests (#132) * CIF-2007 - Use latest release of CIF add-on from artifactory * CIF-2007 - Use latest release of CIF add-on from artifactory * CIF-2007 - Use latest release of CIF add-on from artifactory * CIF-2007 - Use latest release of CIF add-on for AEM 6.5 from artifactory * CIF-2007 - Fix UI tests * @releng Update dependency versions (#134) Update `AEM Core CIF Components` to 1.11.0 and `@adobe/aem-core-cif-react-components` to 1.11.0 Co-authored-by: Daniel Platon <platon@adobe.com> * CIF-2086: Update react-components to be in sync with CIF Components version (#133) * CIF-2086: Sync reac-components version on release * CIF-2086: Commit updated npm files * CIF-2086: Fix npm files commit profile * CIF-2086: Update cif-react-components dependency * Remove package-lock.json from .gitignore Co-authored-by: Daniel Platon <platon@adobe.com> Co-authored-by: Levente Santha <levente@adobe.com> Co-authored-by: Christophe Jelger <jelger@adobe.com> Co-authored-by: Mark J. Becker <herzog31@users.noreply.github.com> Co-authored-by: Markus Haack <mhaack@adobe.com> Co-authored-by: Daniel Platon <platon@adobe.com> Co-authored-by: Laurentiu Magureanu <magurean@adobe.com>
adobe · May 24, 2021 · 246fe84 · 246fe84
1 parent 090abaa
commit 246fe84
Show file tree

Hide file tree

Showing 9 changed files with 940 additions and 124 deletions.
diff --git a/.circleci/ci/it-tests.js b/.circleci/ci/it-tests.js
@@ -17,13 +17,15 @@
 const ci = new (require('./ci.js'))();
 ci.context();
 const qpPath = '/home/circleci/cq';
+const buildPath = '/home/circleci/build';
 const { TYPE, BROWSER } = process.env;
 
 try {
     ci.stage("Integration Tests");
     let veniaVersion = ci.sh('mvn help:evaluate -Dexpression=project.version -q -DforceStdout', true);
     let cifVersion = ci.sh('mvn help:evaluate -Dexpression=core.cif.components.version -q -DforceStdout', true);
     let wcmVersion = ci.sh('mvn help:evaluate -Dexpression=core.wcm.components.version -q -DforceStdout', true);
+
     let connectorVersion = '1.8.0-magento242ee';
     let graphqlClientVersion = ci.sh('mvn help:evaluate -Dexpression=graphql.client.version -q -DforceStdout', true);
     let classifier = process.env.AEM;
@@ -32,24 +34,25 @@ try {
         // Connect to QP
         ci.sh('./qp.sh -v bind --server-hostname localhost --server-port 55555');
 
-        // We install the graphql-client by default except with the CIF Add-On
-        let extras = `--bundle com.adobe.commerce.cif:graphql-client:${graphqlClientVersion}:jar`;
+        let extras;
         if (classifier == 'classic') {
-            // Install CIF connector
-            extras += ` --bundle com.adobe.commerce.cif:cif-connector-all:${connectorVersion}:zip`;
+            // Download latest add-on for AEM 6.5 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.cq.cif -DartifactId=commerce-addon-aem-650-all -Dversion=LATEST -Dtype=zip -DoutputDirectory=${buildPath}/dependencies -DoutputFileName=addon-650.zip`);
+            extras = ` --install-file ${buildPath}/dependencies/addon-650.zip`;
 
             // The core components are already installed in the Cloud SDK
             extras += ` --bundle com.adobe.cq:core.wcm.components.all:${wcmVersion}:zip`;
+
         } else if (classifier == 'cloud') {
-            // Download the CIF Add-On
-            ci.sh(`curl -s "${process.env.CIF_ADDON_URL}" -o cif-addon.far`);
-            extras = '--install-file cif-addon.far';
+            // 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.cq.cif -DartifactId=cif-cloud-ready-feature-pkg -Dversion=LATEST -Dtype=far -Dclassifier=cq-commerce-addon-authorfar -DoutputDirectory=${buildPath}/dependencies -DoutputFileName=addon.far`);
+            extras = ` --install-file ${buildPath}/dependencies/addon.far`;
         }
 
         // Install SNAPSHOT or current version of CIF examples bundle
         if (cifVersion.endsWith('-SNAPSHOT')) {
             let jar = `core-cif-components-examples-bundle-${cifVersion}.jar`;
-            extras += ` --install-file /home/circleci/build/dependencies/aem-core-cif-components/examples/bundle/target/${jar}`;
+            extras += ` --install-file ${buildPath}/dependencies/aem-core-cif-components/examples/bundle/target/${jar}`;
         } else {
             extras += ` --bundle com.adobe.commerce.cif:core-cif-components-examples-bundle:${cifVersion}:jar`;
         }
@@ -58,7 +61,7 @@ try {
         ci.sh(`./qp.sh -v start --id author --runmode author --port 4502 --qs-jar /home/circleci/cq/author/cq-quickstart.jar \
             --bundle org.apache.sling:org.apache.sling.junit.core:1.0.23:jar \
             ${extras} \
-            --install-file /home/circleci/build/all/target/venia.all-${veniaVersion}-${classifier}.zip \
+            --install-file ${buildPath}/all/target/venia.all-${veniaVersion}-${classifier}.zip \
             --vm-options \\\"-Xmx1536m -XX:MaxPermSize=256m -Djava.awt.headless=true -javaagent:${process.env.JACOCO_AGENT}=destfile=crx-quickstart/jacoco-it.exec\\\"`);
     });
 

diff --git a/.circleci/settings.xml b/.circleci/settings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ |  Copyright 2021 Adobe Systems Incorporated
+ |
+ |  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.
+-->
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+    <profiles>
+        <profile>
+            <id>artifactory-cloud</id>
+
+            <properties>
+                <releaseRepository-Id>maven-adobe-cif-release</releaseRepository-Id>
+                <releaseRepository-Name>maven-adobe-cif-release</releaseRepository-Name>
+                <releaseRepository-URL>https://artifactory-uw2.adobeitc.com/artifactory/maven-adobe-cif-release</releaseRepository-URL>
+
+                <snapshotRepository-Id>maven-adobe-cif-snapshot</snapshotRepository-Id>
+                <snapshotRepository-Name>maven-adobe-cif-snapshot</snapshotRepository-Name>
+                <snapshotRepository-URL>https://artifactory-uw2.adobeitc.com/artifactory/maven-adobe-cif-snapshot</snapshotRepository-URL>
+            </properties>
+
+            <repositories>
+                <repository>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <id>maven-adobe-cif-release</id>
+                    <name>maven-adobe-cif-release</name>
+                    <url>https://artifactory-uw2.adobeitc.com/artifactory/maven-adobe-cif-release</url>
+                </repository>
+                <repository>
+                    <snapshots />
+                    <id>maven-adobe-cif-snapshot</id>
+                    <name>maven-adobe-cif-snapshot</name>
+                    <url>https://artifactory-uw2.adobeitc.com/artifactory/maven-adobe-cif-snapshot</url>
+                </repository>
+            </repositories>
+
+            <pluginRepositories>
+                <pluginRepository>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <id>maven-adobe-cif-release</id>
+                    <name>maven-adobe-cif-release</name>
+                    <url>https://artifactory-uw2.adobeitc.com/artifactory/maven-adobe-cif-release</url>
+                </pluginRepository>
+                <pluginRepository>
+                    <snapshots />
+                    <id>maven-adobe-cif-snapshot</id>
+                    <name>maven-adobe-cif-snapshot</name>
+                    <url>https://artifactory-uw2.adobeitc.com/artifactory/maven-adobe-cif-snapshot</url>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+
+    <servers>
+        <server>
+            <id>maven-adobe-cif-release</id>
+            <username>${env.DOCKER_USER}</username>
+            <password>${env.DOCKER_PASS}</password>
+        </server>
+        <server>
+            <id>maven-adobe-cif-snapshot</id>
+            <username>${env.DOCKER_USER}</username>
+            <password>${env.DOCKER_PASS}</password>
+        </server>
+    </servers>
+
+</settings>
diff --git a/.gitignore b/.gitignore
@@ -88,7 +88,6 @@ buildNumber.properties
 
 # NPM
 node_modules/
-package-lock.json
 yarn.lock
 
 # Webpack

diff --git a/pom.xml b/pom.xml
@@ -50,7 +50,7 @@
         <vault.user>admin</vault.user>
         <vault.password>admin</vault.password>
         <core.wcm.components.version>2.15.0</core.wcm.components.version>
-        <core.cif.components.version>1.10.0</core.cif.components.version>
+        <core.cif.components.version>1.11.0</core.cif.components.version>
         <graphql.client.version>1.7.1</graphql.client.version>
         <magento.graphql.version>9.0.0-magento242ee</magento.graphql.version>
         <bnd.version>5.1.2</bnd.version>
@@ -72,7 +72,7 @@
                 <version>2.5.3</version>
                 <configuration>
                     <scmCommentPrefix>[maven-scm] :</scmCommentPrefix>
-                    <preparationGoals>clean install</preparationGoals>
+                    <preparationGoals>-Pcommit-changed-npm-files clean install scm:add scm:checkin</preparationGoals>
                     <goals>install</goals>
                     <releaseProfiles>release</releaseProfiles>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
@@ -601,6 +601,27 @@ Bundle-DocURL:
                 </pluginManagement>
             </build>
         </profile>
+        <profile>
+            <id>commit-changed-npm-files</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-scm-plugin</artifactId>
+                            <configuration>
+                                <includes>ui.frontend/package.json,ui.frontend/package-lock.json</includes>
+                                <message>[maven-release-plugin] :update react-components version to ${core.cif.components.version}</message>
+                                <pushChanges>false</pushChanges>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
     </profiles>
 
 

diff --git a/ui.content/src/main/content/jcr_root/conf/venia/settings/dam/.content.xml b/ui.content/src/main/content/jcr_root/conf/venia/settings/dam/.content.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder">
+    <cfm jcr:primaryType="cq:Page">
+        <models jcr:primaryType="cq:Page">
+            <jcr:content jcr:primaryType="nt:unstructured"/>
+        </models>
+    </cfm>
+</jcr:root>