Release 4.2.0

.github/workflows/backwards-compatibility-java11.yml

@@ -13,14 +13,15 @@ on:
     branches: [main, develop]
   schedule:
     - cron: "0 15 * * 0,3"
+  workflow_dispatch:
 
 jobs:
   compatibility:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        version: ["2105.17", "2011.27", "2005.32"]
+        version: ["2105.26"]
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 11
@@ -32,7 +33,7 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Set up cache for SAP artifacts
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           key: sap-artifacts-cache-${{ hashFiles('core-customize/manifest.json') }}-${{ matrix.version }}
           path: dependencies
@@ -41,12 +42,14 @@ jobs:
           sed -i 's/\"commerceSuiteVersion\": \"[^\"]*\"/\"commerceSuiteVersion\": \"${{ matrix.version }}\"/' core-customize/manifest.json
       - name: SAP download config
         env:
+          SAPCX_ARTEFACT_BASEURL: ${{ secrets.SAPCX_ARTEFACT_BASEURL }}
           SAPCX_ARTEFACT_USER: ${{ secrets.SAPCX_ARTEFACT_USER }}
           SAPCX_ARTEFACT_PASSWORD: ${{ secrets.SAPCX_ARTEFACT_PASSWORD }}
         shell: bash
         run: |
           mkdir -p ${HOME}/.gradle
           echo "GRADLE_USER_HOME=${HOME}/.gradle" >> $GITHUB_ENV
+          echo "SAPCX_ARTEFACT_BASEURL=${SAPCX_ARTEFACT_BASEURL}" >> ${HOME}/.gradle/gradle.properties
           echo "SAPCX_ARTEFACT_USER=${SAPCX_ARTEFACT_USER}" >> ${HOME}/.gradle/gradle.properties
           echo "SAPCX_ARTEFACT_PASSWORD=${SAPCX_ARTEFACT_PASSWORD}" >> ${HOME}/.gradle/gradle.properties
       - name: SAP Commerce environment

.github/workflows/backwards-compatibility-java17.yml

@@ -13,14 +13,15 @@ on:
     branches: [main, develop]
   schedule:
     - cron: "0 15 * * 0,3"
+  workflow_dispatch:
 
 jobs:
   compatibility:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        version: ["2205.12"]
+        version: ["2205.20"]
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 17
@@ -32,7 +33,7 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Set up cache for SAP artifacts
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           key: sap-artifacts-cache-${{ hashFiles('core-customize/manifest.json') }}-${{ matrix.version }}
           path: dependencies
@@ -41,12 +42,14 @@ jobs:
           sed -i 's/\"commerceSuiteVersion\": \"[^\"]*\"/\"commerceSuiteVersion\": \"${{ matrix.version }}\"/' core-customize/manifest.json
       - name: SAP download config
         env:
+          SAPCX_ARTEFACT_BASEURL: ${{ secrets.SAPCX_ARTEFACT_BASEURL }}
           SAPCX_ARTEFACT_USER: ${{ secrets.SAPCX_ARTEFACT_USER }}
           SAPCX_ARTEFACT_PASSWORD: ${{ secrets.SAPCX_ARTEFACT_PASSWORD }}
         shell: bash
         run: |
           mkdir -p ${HOME}/.gradle
           echo "GRADLE_USER_HOME=${HOME}/.gradle" >> $GITHUB_ENV
+          echo "SAPCX_ARTEFACT_BASEURL=${SAPCX_ARTEFACT_BASEURL}" >> ${HOME}/.gradle/gradle.properties
           echo "SAPCX_ARTEFACT_USER=${SAPCX_ARTEFACT_USER}" >> ${HOME}/.gradle/gradle.properties
           echo "SAPCX_ARTEFACT_PASSWORD=${SAPCX_ARTEFACT_PASSWORD}" >> ${HOME}/.gradle/gradle.properties
       - name: SAP Commerce environment

.github/workflows/buildandtest.yml

@@ -2,7 +2,7 @@ name: Build and Test
 
 on:
   push:
-    branches: [develop, "feature/**"]
+    branches: [develop]
     paths:
       - "core-customize/hybris/bin/custom/sapcxtools/**/*.java"
       - "core-customize/hybris/bin/custom/sapcxtools/**/*-beans.xml"
@@ -13,6 +13,7 @@ on:
     branches: [main, develop]
   schedule:
     - cron: "0 15 * * 0,3"
+  workflow_dispatch:
 
 jobs:
   build-and-test:
@@ -36,12 +37,14 @@ jobs:
           path: dependencies
       - name: SAP download config
         env:
+          SAPCX_ARTEFACT_BASEURL: ${{ secrets.SAPCX_ARTEFACT_BASEURL }}
           SAPCX_ARTEFACT_USER: ${{ secrets.SAPCX_ARTEFACT_USER }}
           SAPCX_ARTEFACT_PASSWORD: ${{ secrets.SAPCX_ARTEFACT_PASSWORD }}
         shell: bash
         run: |
           mkdir -p ${HOME}/.gradle
           echo "GRADLE_USER_HOME=${HOME}/.gradle" >> $GITHUB_ENV
+          echo "SAPCX_ARTEFACT_BASEURL=${SAPCX_ARTEFACT_BASEURL}" >> ${HOME}/.gradle/gradle.properties
           echo "SAPCX_ARTEFACT_USER=${SAPCX_ARTEFACT_USER}" >> ${HOME}/.gradle/gradle.properties
           echo "SAPCX_ARTEFACT_PASSWORD=${SAPCX_ARTEFACT_PASSWORD}" >> ${HOME}/.gradle/gradle.properties
       - name: SAP Commerce environment

.github/workflows/code-analysis.yml

@@ -3,14 +3,9 @@ name: Code Analysis
 on:
   push:
     branches: [develop, "feature/**"]
-    paths:
-      - "core-customize/hybris/bin/custom/sapcxtools/**/*.java"
-      - "core-customize/hybris/bin/custom/sapcxtools/**/*-beans.xml"
-      - "core-customize/hybris/bin/custom/sapcxtools/**/*-items.xml"
-      - "core-customize/hybris/bin/custom/sapcxtools/**/extensioninfo.xml"
-      - "core-customize/hybris/bin/custom/sapcxtools/**/external-dependencies.xml"
   pull_request:
     branches: [main, develop]
+  workflow_dispatch:
 
 jobs:
   code-analysis:

.github/workflows/dependency-check.yml

@@ -11,6 +11,7 @@ on:
       - "core-customize/hybris/bin/custom/sapcxtools/**/external-dependencies.xml"
   pull_request:
     branches: [main, develop]
+  workflow_dispatch:
 
 jobs:
   dependency-check:
@@ -29,18 +30,20 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Set up cache for SAP artifacts
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           key: sap-artifacts-cache-${{ hashFiles('core-customize/manifest.json') }}
           path: dependencies
       - name: SAP download config
         env:
+          SAPCX_ARTEFACT_BASEURL: ${{ secrets.SAPCX_ARTEFACT_BASEURL }}
           SAPCX_ARTEFACT_USER: ${{ secrets.SAPCX_ARTEFACT_USER }}
           SAPCX_ARTEFACT_PASSWORD: ${{ secrets.SAPCX_ARTEFACT_PASSWORD }}
         shell: bash
         run: |
           mkdir -p ${HOME}/.gradle
           echo "GRADLE_USER_HOME=${HOME}/.gradle" >> $GITHUB_ENV
+          echo "SAPCX_ARTEFACT_BASEURL=${SAPCX_ARTEFACT_BASEURL}" >> ${HOME}/.gradle/gradle.properties
           echo "SAPCX_ARTEFACT_USER=${SAPCX_ARTEFACT_USER}" >> ${HOME}/.gradle/gradle.properties
           echo "SAPCX_ARTEFACT_PASSWORD=${SAPCX_ARTEFACT_PASSWORD}" >> ${HOME}/.gradle/gradle.properties
       - name: SAP Commerce environment

.gitignore

@@ -1,6 +1,6 @@
 # IDE & gradle files
 build/
-build/
+consolestorage/
 /dependencies
 /cloud-extension-pack/
 .gradle/

core-customize/build.gradle.kts

@@ -17,14 +17,15 @@ repositories {
     mavenCentral()
 }
 
-if (project.hasProperty("SAPCX_ARTEFACT_USER") && project.hasProperty("SAPCX_ARTEFACT_PASSWORD")) {
+if (project.hasProperty("SAPCX_ARTEFACT_BASEURL") && project.hasProperty("SAPCX_ARTEFACT_USER") && project.hasProperty("SAPCX_ARTEFACT_PASSWORD")) {
+    val BASEURL = project.property("SAPCX_ARTEFACT_BASEURL") as String
     val USER = project.property("SAPCX_ARTEFACT_USER") as String
     val PASSWORD = project.property("SAPCX_ARTEFACT_PASSWORD") as String
     val AUTHORIZATION = Base64.getEncoder().encodeToString((USER + ":" + PASSWORD).toByteArray())
 
     val COMMERCE_VERSION = CCV2.manifest.commerceSuiteVersion
     tasks.register<Download>("downloadPlatform") {
-        src("http://artefacts.sapcx.tools/hybris-commerce-suite/${COMMERCE_VERSION}.zip")
+        src(BASEURL + "/hybris-commerce-suite/${COMMERCE_VERSION}.zip")
         dest(file("${DEPENDENCY_FOLDER}/hybris-commerce-suite-${COMMERCE_VERSION}.zip"))
         header("Authorization", "Basic ${AUTHORIZATION}")
         overwrite(false)
@@ -41,7 +42,7 @@ if (project.hasProperty("SAPCX_ARTEFACT_USER") && project.hasProperty("SAPCX_ART
     if (CCV2.manifest.extensionPacks.any{"hybris-commerce-integrations".equals(it.name)}) {
         val INTEXTPACK_VERSION = CCV2.manifest.extensionPacks.first{"hybris-commerce-integrations".equals(it.name)}.version        
         tasks.register<Download>("downloadIntExtPack") {
-            src("http://artefacts.sapcx.tools/hybris-commerce-integrations/${INTEXTPACK_VERSION}.zip")
+            src(BASEURL + "/hybris-commerce-integrations/${INTEXTPACK_VERSION}.zip")
             dest(file("${DEPENDENCY_FOLDER}/hybris-commerce-integrations-${INTEXTPACK_VERSION}.zip"))
             header("Authorization", "Basic ${AUTHORIZATION}")
             overwrite(false)