.github/workflows/gradle.yml

@@ -20,9 +20,9 @@ jobs:
     name: Gradle wrapper validation
     steps:
       - name: Check out repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v4
 
   # Basic Compliance check. Checks if codeStyle is correct and if reuse
   # is applied correctly
@@ -32,21 +32,21 @@ jobs:
     needs: validation
     steps:
       - name: Check out repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: REUSE Compliance Check
-        uses: fsfe/reuse-action@v1
+        uses: fsfe/reuse-action@v5
       - name: Set up Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
-          distribution: 'temurin'
+          distribution: 'sapmachine'
           cache: 'gradle'
-      - name: Gradle build
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: spotlessCheck
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Check code style
+        run: ./gradlew spotlessCheck
 
   # One Basic check, for all kind of OS - to check if we have some kind of
   # issue with any kind of OS
@@ -59,54 +59,52 @@ jobs:
     needs: validation
     steps:
       - name: Check out repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
-          distribution: 'temurin'
+          distribution: 'sapmachine'
           cache: 'gradle'
-      - name: Gradle build
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: check -x spotlessCheck
-      - uses: actions/upload-artifact@v3
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Build and Test
+        run: ./gradlew check -x spotlessCheck
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
           name: ${{ matrix.os }}-test-result
           path: |
             build/reports
             build/test-results
 
-  # The check for different kind of gradle Versions
-  verify:
+  # Check supported Gradle releases
+  # https://gradle.org/releases/
+  # https://docs.gradle.org/current/userguide/feature_lifecycle.html#eol_support
+  compatibility:
     strategy:
       matrix:
-        # https://gradle.org/releases/
         GRADLE_VERSION:
-        - "7.6.2"
-        - "8.0.2"
-        - "8.1.1"
-        - "8.2.1"
+        - "7.6.4"
     runs-on: ubuntu-latest
     needs: [basic, compliance]
     name: with Gradle ${{ matrix.GRADLE_VERSION }}
     steps:
       - name: Check out repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Java JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
-          distribution: 'temurin'
+          distribution: 'sapmachine'
           cache: 'gradle'
-      - name: Gradle build
-        uses: gradle/gradle-build-action@v2
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Build and Test
+        run: ./gradlew check -x spotlessCheck
         env:
-          GRADLE_VERSION: ${{ matrix.GRADLE_VERSION }}
-        with:
-          arguments: check -x spotlessCheck
-      - uses: actions/upload-artifact@v3
+          GRADLE_VERSION: "${{ matrix.GRADLE_VERSION }}"
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
           name: ${{ matrix.GRADLE_VERSION }}-test-result
@@ -116,22 +114,21 @@ jobs:
 
   publish:
     runs-on: ubuntu-latest
-    needs: verify
+    needs: compatibility
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - name: Check out repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Java JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
-          distribution: 'temurin'
+          distribution: 'sapmachine'
           cache: 'gradle'
-      - name: Gradle build
-        uses: gradle/gradle-build-action@v2
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Publish Plugin
         env:
-          GRADLE_PUBLISH_KEY: ${{secrets.PUBLISH_KEY}}
-          GRADLE_PUBLISH_SECRET: ${{secrets.PUBLISH_SECRET}}
-        with:
-          arguments: publishPlugins "-Pgradle.publish.key=${GRADLE_PUBLISH_KEY}" "-Pgradle.publish.secret=${GRADLE_PUBLISH_SECRET}"
-
+          ORG_GRADLE_PROJECT_gradle.publish.key: ${{secrets.PUBLISH_KEY}}
+          ORG_GRADLE_PROJECT_gradle.publish.secret: ${{secrets.PUBLISH_SECRET}}
+        run: ./gradlew publishPlugins

README.md

@@ -5,16 +5,15 @@
 
 Bootstrap, configure and build your SAP Commerce (Hybris) project using Gradle 5+.
 
-> **Note**\
+> [!TIP]
 > **For the user documentation, please check the [`/docs` folder](/docs)**
 
 The plugins are published to https://plugins.gradle.org/.
 
-| Published Plugin                       | Documentation                | Description                                                                                                         |
-| -------------------------------------- | ---------------------------- | ------------------------------------------------------------------------------------------------------------------- |
-| [`sap.commerce.build`][build]          | [Documentation][build-doc]   | Automates the developer setup and allows you to interact with the platform build using Gradle                       |
-| [`sap.commerce.build.ccv2`][ccv2]      | [Documentation][ccv2-doc]    | Use `manifest.json` to configure and build your "SAP Commerce Cloud in the Public Cloud" (aka CCv2) project locally |
-| [`sap.commerce.ccv1.package`][package] | [Documentation][package-doc] | Creates CCv1 compliant deployment packages (Deployment Packaging Guidelines v.2.3.3)                                |
+| Published Plugin                  | Documentation              | Description                                                                                                         |
+| --------------------------------- | -------------------------- | ------------------------------------------------------------------------------------------------------------------- |
+| [`sap.commerce.build`][build]     | [Documentation][build-doc] | Automates the developer setup and allows you to interact with the platform build using Gradle                       |
+| [`sap.commerce.build.ccv2`][ccv2] | [Documentation][ccv2-doc]  | Use `manifest.json` to configure and build your "SAP Commerce Cloud in the Public Cloud" (aka CCv2) project locally |
 
 This project uses [Semantic Versioning 2.0.0](https://semver.org/spec/v2.0.0.html)
 
@@ -107,8 +106,6 @@ Please refer to [CONTRIBUTING.md]
 
 [build]: https://plugins.gradle.org/plugin/sap.commerce.build
 [build-doc]: docs/Plugin-sap.commerce.build.md
-[package]: https://plugins.gradle.org/plugin/sap.commerce.ccv1.package
-[package-doc]: docs/Plugin-sap.commerce.ccv1.package.md
 [ccv2]: https://plugins.gradle.org/plugin/sap.commerce.build.ccv2
 [ccv2-doc]: docs/Plugin-sap.commerce.build.ccv2.md
 [tools]:https://github.com/sap-commerce-tools

REUSE.toml

@@ -0,0 +1,65 @@
+version = 1
+SPDX-PackageName = "commerce-gradle-plugin"
+SPDX-PackageSupplier = "sap-oss-commerce-gradle-plugin@sap.com"
+SPDX-PackageDownloadLocation = "https://github.com/SAP/commerce-gradle-plugin"
+SPDX-PackageComment = """
+The code in this project may include calls to APIs (“API Calls”) of
+SAP or third-party products or services developed outside of this project
+(“External Products”).
+“APIs” means application programming interfaces, as well as their respective
+specifications and implementing code that allows software to communicate with
+other software.
+API Calls to External Products are not licensed under the open source license
+that governs this project. The use of such API Calls and related External
+Products are subject to applicable additional agreements with the relevant
+provider of the External Products. In no event shall the open source license
+that governs this project grant any rights in or to any External Products,or
+alter, expand or supersede any terms of the applicable additional agreements.
+If you have a valid license agreement with SAP for the use of a particular SAP
+External Product, then you may make use of any API Calls included in this
+project’s code for that SAP External Product, subject to the terms of such
+license agreement. If you do not have a valid license agreement for the use of
+a particular SAP External Product, then you may only make use of any API Calls
+in this project for that SAP External Product for your internal, non-productive
+and non-commercial test and evaluation of such API Calls. Nothing herein grants
+you any rights to use or access any SAP External Product, or provide any third
+parties the right to use of access any SAP External Product, through API Calls.
+"""
+
+[[annotations]]
+path = [
+    "gradle.properties",
+    ".gitignore",
+    "**/.gitignore",
+    "README.md",
+    "CHANGELOG.md",
+    "CONTRIBUTING.md",
+    ".java-version",
+    "**/**.gradle.kts",
+    "**.gradle.kts",
+    "gradle/**",
+    ".github/**",
+    "docs/**",
+    "manualTest/**",
+    "renovate.json",
+    "REUSE.toml"
+]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2020 SAP SE or an SAP affiliate company and commerce-gradle-plugin contributors"
+SPDX-License-Identifier = "CC0-1.0"
+
+[[annotations]]
+path = [
+    "gradlew",
+    "gradlew.bat",
+    "**/gradle/wrapper/**"
+]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Gradle Inc. 2020"
+SPDX-License-Identifier = "Apache-2.0"
+
+[[annotations]]
+path = "**/src/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2020 SAP SE or an SAP affiliate company and commerce-gradle-plugin contributors"
+SPDX-License-Identifier = "Apache-2.0"

build-plugin/build.gradle.kts

@@ -16,15 +16,16 @@ gradlePlugin {
 
             displayName = "SAP Commerce Bootstrap & Build Plugin"
             description = """Manage the whole development lifecycle of your SAP Commerce Project with Gradle"""
-            tags = setOf(
-                "sap commerce",
-                "sap hybris commerce",
-                "hybris",
-                "sap",
-                "commerce",
-                "bootstrap",
-                "build",
-            )
+            tags =
+                setOf(
+                    "sap commerce",
+                    "sap hybris commerce",
+                    "hybris",
+                    "sap",
+                    "commerce",
+                    "bootstrap",
+                    "build",
+                )
         }
     }
 }

buildSrc/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     `kotlin-dsl`
-    id("com.github.ben-manes.versions") version "0.47.0"
 }
 
 repositories {
@@ -9,9 +8,8 @@ repositories {
 }
 
 dependencies {
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.20.0")
-    implementation("com.gradle.publish:plugin-publish-plugin:1.2.0")
-    implementation("pl.allegro.tech.build:axion-release-plugin:1.15.4")
-    implementation("com.github.ben-manes:gradle-versions-plugin:0.47.0")
-    implementation("com.github.johnrengelman:shadow:8.1.1")
+    implementation("com.diffplug.gradle.spotless:com.diffplug.gradle.spotless.gradle.plugin:7.0.2")
+    implementation("com.gradle.plugin-publish:com.gradle.plugin-publish.gradle.plugin:1.3.1")
+    implementation("pl.allegro.tech.build.axion-release:pl.allegro.tech.build.axion-release.gradle.plugin:1.18.16")
+    implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:8.3.6")
 }

buildSrc/src/main/kotlin/mpern.commons.gradle.kts

@@ -1,7 +1,6 @@
 plugins {
     java
     id("com.diffplug.spotless")
-    id("com.github.ben-manes.versions")
 }
 
 repositories {
@@ -28,7 +27,7 @@ spotless {
 
         // define the steps to apply to those files
         trimTrailingWhitespace()
-        indentWithSpaces(4)
+        leadingTabsToSpaces(4)
         endWithNewline()
     }
     java {

buildSrc/src/main/kotlin/mpern.plugin.basics.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     id("groovy")
     `jvm-test-suite`
     id("com.gradle.plugin-publish")
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
 }
 
 dependencies {
@@ -17,7 +17,7 @@ testing {
             if (this is JvmTestSuite) {
                 useJUnitJupiter()
                 dependencies {
-                    implementation(platform("org.spockframework:spock-bom:2.2-groovy-3.0"))
+                    implementation(platform("org.spockframework:spock-bom:2.3-groovy-3.0"))
                     implementation("org.spockframework:spock-core")
 
                     implementation(project())

cloud-plugin/build.gradle.kts

@@ -16,16 +16,17 @@ gradlePlugin {
 
             displayName = "SAP Commerce Cloud in the Public Cloud Build Support Plugin"
             description = """Use the CCv2 manifest.json to configure and build your local development environment"""
-            tags = setOf(
-                "sap commerce",
-                "sap hybris commerce",
-                "hybris",
-                "sap",
-                "commerce",
-                "ccv2",
-                "public cloud",
-                "manifest",
-            )
+            tags =
+                setOf(
+                    "sap commerce",
+                    "sap hybris commerce",
+                    "hybris",
+                    "sap",
+                    "commerce",
+                    "ccv2",
+                    "public cloud",
+                    "manifest",
+                )
         }
     }
 }