Merge branch 'master' into issue/CIF-2182

adobe · Jul 14, 2021 · 858df36 · 858df36
2 parents 1a47792 + 33b0f9d
commit 858df36
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -56,8 +56,8 @@ common:
 
   docker_auth: &docker_auth
     auth:
-      username: $DOCKER_USER
-      password: $DOCKER_PASS
+      username: $ARTIFACTORY_CLOUD_USER
+      password: $ARTIFACTORY_CLOUD_PASS
 
 executors:
   cif_executor:
@@ -251,10 +251,14 @@ workflows:
   build-and-release:
     jobs:
       - build-java-11:
+          context:
+            - CIF Artifactory Cloud
           filters:
             tags:
               only: /.*/
       - build-java-8:
+          context:
+            - CIF Artifactory Cloud
           filters:
             tags:
               only: /.*/
@@ -267,6 +271,8 @@ workflows:
             tags:
               only: /.*/
       - integration-test-655:
+          context:
+            - CIF Artifactory Cloud
           filters:
             tags:
               only: /.*/
@@ -276,6 +282,8 @@ workflows:
             - karma
             - jest
       - integration-test-cloudready:
+          context:
+            - CIF Artifactory Cloud
           filters:
             tags:
               only: /.*/
@@ -285,6 +293,8 @@ workflows:
             - karma
             - jest
       - integration-test-cloudready-with-addon:
+          context:
+            - CIF Artifactory Cloud
           filters:
             tags:
               only: /.*/
@@ -294,6 +304,8 @@ workflows:
             - karma
             - jest
       - selenium-chrome-655:
+          context:
+            - CIF Artifactory Cloud
           filters:
             tags:
               only: /.*/
@@ -303,6 +315,8 @@ workflows:
             - karma
             - jest
       - selenium-chrome-cloudready-with-addon:
+          context:
+            - CIF Artifactory Cloud
           filters:
             tags:
               only: /.*/
@@ -312,6 +326,10 @@ workflows:
             - karma
             - jest
       - release:
+          context:
+            - CIF Artifactory Cloud
+            - CIF NPM
+            - CIF Maven Central
           requires:
             - build-java-11
           filters:

diff --git a/.circleci/settings.xml b/.circleci/settings.xml
@@ -79,17 +79,17 @@
         <server>
             <id>ossrh</id>
             <username>${env.SONATYPE_USER}</username>
-            <password>${env.SONATYPE_PASSWORD}</password>
+            <password>${env.SONATYPE_PASS}</password>
         </server>
         <server>
             <id>maven-adobe-cif-release</id>
-            <username>${env.DOCKER_USER}</username>
-            <password>${env.DOCKER_PASS}</password>
+            <username>${env.ARTIFACTORY_CLOUD_USER}</username>
+            <password>${env.ARTIFACTORY_CLOUD_PASS}</password>
         </server>
         <server>
             <id>maven-adobe-cif-snapshot</id>
-            <username>${env.DOCKER_USER}</username>
-            <password>${env.DOCKER_PASS}</password>
+            <username>${env.ARTIFACTORY_CLOUD_USER}</username>
+            <password>${env.ARTIFACTORY_CLOUD_PASS}</password>
         </server>
     </servers>
 

diff --git a/.../java/com/adobe/cq/commerce/core/components/internal/client/MagentoGraphqlClientImpl.java b/.../java/com/adobe/cq/commerce/core/components/internal/client/MagentoGraphqlClientImpl.java
@@ -68,8 +68,7 @@
  */
 @Model(
     adaptables = { SlingHttpServletRequest.class, Resource.class },
-    adapters = { MagentoGraphqlClient.class, MagentoGraphqlClientImpl.class },
-    cache = true)
+    adapters = { MagentoGraphqlClient.class, MagentoGraphqlClientImpl.class })
 public class MagentoGraphqlClientImpl implements MagentoGraphqlClient {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MagentoGraphqlClient.class);