build(deps): bump edc from 0.9.1 to 0.10.0 (#331)

* build(deps): bump edc from 0.9.1 to 0.10.0 Bumps `edc` from 0.9.1 to 0.10.0. Updates `org.eclipse.edc:api-observability` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:auth-tokenbased` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:boot` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc.edc-build:org.eclipse.edc.edc-build.gradle.plugin` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/GradlePlugins/releases) - [Commits](eclipse-edc/GradlePlugins@v0.9.1...v0.10.0) Updates `org.eclipse.edc:configuration-filesystem` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:connector-core` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:control-api-configuration` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:control-plane-api-client` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:control-plane-api` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:control-plane-core` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:control-plane-spi` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:data-plane-signaling-api` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:data-plane-signaling-client` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:data-plane-public-api-v2` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc.aws:data-plane-aws-s3` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Technology-Aws/releases) - [Commits](eclipse-edc/Technology-Aws@v0.9.1...v0.10.0) Updates `org.eclipse.edc.azure:data-plane-azure-storage` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Technology-Azure/releases) - [Commits](eclipse-edc/Technology-Azure@v0.9.1...v0.10.0) Updates `org.eclipse.edc:data-plane-core` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:data-plane-http` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:data-plane-iam` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:data-plane-kafka` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:data-plane-selector-api` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:data-plane-selector-core` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:data-plane-self-registration` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:data-plane-spi` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:dsp` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:edr-cache-api` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:edr-store-core` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:edr-store-receiver` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:http` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:iam-mock` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:json-ld-lib` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:json-ld-spi` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:junit` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:management-api` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:management-api-test-fixtures` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:monitor-jdk-logger` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:transfer-data-plane-signaling` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:transfer-pull-http-dynamic-receiver` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:vault-hashicorp` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) Updates `org.eclipse.edc:validator-data-address-http-data` from 0.9.1 to 0.10.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](eclipse-edc/Connector@v0.9.1...v0.10.0) --- updated-dependencies: - dependency-name: org.eclipse.edc:api-observability dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:auth-tokenbased dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:boot dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc.edc-build:org.eclipse.edc.edc-build.gradle.plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:configuration-filesystem dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:connector-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:control-api-configuration dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:control-plane-api-client dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:control-plane-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:control-plane-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:control-plane-spi dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-signaling-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-signaling-client dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-public-api-v2 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc.aws:data-plane-aws-s3 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc.azure:data-plane-azure-storage dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-http dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-iam dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-kafka dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-selector-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-selector-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-self-registration dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-spi dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:dsp dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:edr-cache-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:edr-store-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:edr-store-receiver dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:http dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:iam-mock dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:json-ld-lib dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:json-ld-spi dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:junit dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:management-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:management-api-test-fixtures dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:monitor-jdk-logger dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:transfer-data-plane-signaling dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:transfer-pull-http-dynamic-receiver dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:vault-hashicorp dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:validator-data-address-http-data dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * fix compilation errors * upgrade wrapper --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ndr_brt <[email protected]>
eclipse-edc · Oct 28, 2024 · 915e0f6 · 915e0f6
1 parent 2bd0d2e
commit 915e0f6
Show file tree

Hide file tree

Showing 31 changed files with 226 additions and 154 deletions.
diff --git a/advanced/advanced-01-open-telemetry/docker-compose.yaml b/advanced/advanced-01-open-telemetry/docker-compose.yaml
@@ -28,6 +28,8 @@ services:
       WEB_HTTP_MANAGEMENT_PATH: /management
       WEB_HTTP_PROTOCOL_PORT: 29194
       WEB_HTTP_PROTOCOL_PATH: /protocol
+      WEB_HTTP_VERSION_PORT: 29195
+      WEB_HTTP_VERSION_PATH: /version
       EDC_CONTROL_ENDPOINT: http://consumer:29192/control
       EDC_DSP_CALLBACK_ADDRESS: http://consumer:29194/protocol
       EDC_PARTICIPANT_ID: consumer
@@ -65,6 +67,8 @@ services:
       WEB_HTTP_MANAGEMENT_PATH: /management
       WEB_HTTP_PROTOCOL_PORT: 19194
       WEB_HTTP_PROTOCOL_PATH: /protocol
+      WEB_HTTP_VERSION_PORT: 19195
+      WEB_HTTP_VERSION_PATH: /version
       EDC_CONTROL_ENDPOINT: http://provider:19192/control
       EDC_DSP_CALLBACK_ADDRESS: http://provider:19194/protocol
       EDC_PARTICIPANT_ID: provider

diff --git a/advanced/advanced-01-open-telemetry/open-telemetry-runtime/build.gradle.kts b/advanced/advanced-01-open-telemetry/open-telemetry-runtime/build.gradle.kts
@@ -29,6 +29,8 @@ dependencies {
     implementation(libs.edc.control.plane.api.client)
     implementation(libs.edc.control.plane.api)
     implementation(libs.edc.control.plane.core)
+    implementation(libs.edc.edr.store.core)
+    implementation(libs.edc.token.core)
 
     implementation(libs.edc.dsp)
     implementation(libs.edc.http)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ format.version = "1.1"
 
 [versions]
 awaitility = "4.2.2"
-edc = "0.9.1"
+edc = "0.10.0"
 jupiter = "5.11.3"
 okhttp-mockwebserver = "5.0.0-alpha.14"
 restAssured = "5.5.0"
@@ -16,6 +16,8 @@ awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility"
 edc-api-observability = { module = "org.eclipse.edc:api-observability", version.ref = "edc" }
 edc-auth-tokenbased = { module = "org.eclipse.edc:auth-tokenbased", version.ref = "edc" }
 edc-boot = { module = "org.eclipse.edc:boot", version.ref = "edc" }
+edc-bom-controlplane-base = { module = "org.eclipse.edc:controlplane-base-bom", version.ref = "edc" }
+edc-bom-dataplane-base = { module = "org.eclipse.edc:dataplane-base-bom", version.ref = "edc" }
 edc-build-plugin = { module = "org.eclipse.edc.edc-build:org.eclipse.edc.edc-build.gradle.plugin", version.ref = "edc" }
 edc-configuration-filesystem = { module = "org.eclipse.edc:configuration-filesystem", version.ref = "edc" }
 edc-connector-core = { module = "org.eclipse.edc:connector-core", version.ref = "edc" }
@@ -49,6 +51,7 @@ edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" }
 edc-management-api = { module = "org.eclipse.edc:management-api", version.ref = "edc" }
 edc-management-api-test-fixtures = { module = "org.eclipse.edc:management-api-test-fixtures", version.ref = "edc" }
 edc-monitor-jdk-logger = { module = "org.eclipse.edc:monitor-jdk-logger", version.ref = "edc" }
+edc-token-core = { module = "org.eclipse.edc:token-core", version.ref = "edc" }
 edc-transfer-data-plane-signaling = { module = "org.eclipse.edc:transfer-data-plane-signaling", version.ref = "edc" }
 edc-transfer-pull-http-receiver = { module = "org.eclipse.edc:transfer-pull-http-dynamic-receiver", version.ref = "edc" }
 edc-transfer-pull-http-dynamic-receiver = { module = "org.eclipse.edc:transfer-pull-http-dynamic-receiver", version.ref = "edc" }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# 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"'
+# 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
@@ -133,22 +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=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=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# 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.
+
+# 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, 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" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

diff --git a/gradlew.bat b/gradlew.bat
@@ -1,89 +1,92 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "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.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-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.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+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
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+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
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega