build(deps): Bump gradlew to 8.7 (#47)

* build(deps): Bump io.github.gradle-nexus.publish-plugin

Bumps io.github.gradle-nexus.publish-plugin from 1.3.0 to 2.0.0.

---
updated-dependencies:
- dependency-name: io.github.gradle-nexus.publish-plugin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* cleanup

* bump gradlew

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: ndr_brt <andrea.bertagnolli@gmail.com>

build.gradle.kts

@@ -1,20 +1,19 @@
 plugins {
-    // Apply the Java Gradle plugin development plugin to add support for developing Gradle plugins
-    checkstyle
     `java-library`
-    `version-catalog`
-    `maven-publish`
-    signing
-    id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
 }
 
-val group: String by project
 val edcScmUrl: String by project
 val edcScmConnection: String by project
 
+buildscript {
+    dependencies {
+        val edcGradlePluginsVersion: String by project
+        classpath("org.eclipse.edc.edc-build:org.eclipse.edc.edc-build.gradle.plugin:${edcGradlePluginsVersion}")
+    }
+}
+
 allprojects {
-    apply(plugin = "checkstyle")
-    apply(plugin = "maven-publish")
+    apply(plugin = "${group}.edc-build")
 
     // let's not generate any reports because that is done from within the GitHub Actions workflow
     tasks.withType<Checkstyle> {
@@ -24,72 +23,11 @@ allprojects {
         }
     }
 
-    tasks.withType<Jar> {
-        duplicatesStrategy = DuplicatesStrategy.INCLUDE
-        metaInf {
-            from("${rootProject.projectDir.path}/NOTICE.md")
-            from("${rootProject.projectDir.path}/LICENSE")
+    configure<org.eclipse.edc.plugins.edcbuild.extensions.BuildExtension> {
+        pom {
+            scmUrl.set(edcScmUrl)
+            scmConnection.set(edcScmConnection)
         }
     }
 
-    afterEvaluate {
-        // values needed for publishing
-        val websiteUrl: String by project
-        val developerId: String by project
-        val developerName: String by project
-        val developerEmail: String by project
-        val scmConnection: String by project
-        val scmUrl: String by project
-        publishing {
-            publications.forEach { i ->
-                val mp = (i as MavenPublication)
-                mp.pom {
-                    name.set(project.name)
-                    description.set("Runtime metamodel for annotations of the Eclipse Dataspace Components")
-                    url.set(websiteUrl)
-
-                    licenses {
-                        license {
-                            name.set("The Apache License, Version 2.0")
-                            url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
-                        }
-                        developers {
-                            developer {
-                                id.set(developerId)
-                                name.set(developerName)
-                                email.set(developerEmail)
-                            }
-                        }
-                        scm {
-                            connection.set(scmConnection)
-                            url.set(scmUrl)
-                        }
-                    }
-                }
-            }
-            if (!project.hasProperty("skip.signing")) {
-                signing {
-                    useGpgCmd()
-                    sign(publishing.publications)
-                }
-            }
-        }
-    }
-
-}
-// configure checkstyle version
-checkstyle {
-    toolVersion = "10.0"
-    maxErrors = 0 // does not tolerate errors
 }
-
-nexusPublishing {
-    repositories {
-        sonatype {
-            nexusUrl.set(uri("https://oss.sonatype.org/service/local/"))
-            snapshotRepositoryUrl.set(uri("https://oss.sonatype.org/content/repositories/snapshots/"))
-            username.set(System.getenv("OSSRH_USER") ?: return@sonatype)
-            password.set(System.getenv("OSSRH_PASSWORD") ?: return@sonatype)
-        }
-    }
-}

gradle.properties

@@ -1,12 +1,7 @@
 group=org.eclipse.edc
 version=0.6.1-SNAPSHOT
 
+edcGradlePluginsVersion=0.6.1-SNAPSHOT
+
 edcScmUrl=https://github.com/eclipse-edc/Runtime-Metamodel
 edcScmConnection=scm:git:git@github.com:eclipse-edc/Runtime-Metamodel.git
-# used for publishing artifacts and plugins
-developerId=mspiekermann
-developerName=Markus Spiekermann
-developerEmail=markus.spiekermann@isst.fraunhofer.de
-scmConnection=scm:git:git@github.com:eclipse-dataspaceconnector/GradlePlugins.git
-websiteUrl=https://github.com/eclipse-dataspaceconnector/GradlePlugins.git
-scmUrl=https://github.com/eclipse-dataspaceconnector/GradlePlugins.git

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail