diff --git a/build.gradle.kts b/build.gradle.kts index ab4a409..caf5e1d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,7 @@ plugins { `java-gradle-plugin` groovy - kotlin("jvm") version "1.9.21" + kotlin("jvm") version "1.9.25" // test coverage jacoco @@ -36,13 +36,13 @@ plugins { signing // plugin for documentation - id("org.asciidoctor.jvm.convert") version "3.3.2" + id("org.asciidoctor.jvm.convert") version "4.0.3" // documentation - id("org.jetbrains.dokka") version "1.9.10" + id("org.jetbrains.dokka") version "1.9.20" // plugin for publishing to Gradle Portal - id("com.gradle.plugin-publish") version "1.2.1" + id("com.gradle.plugin-publish") version "1.3.0" } group = "com.intershop.gradle.isml" @@ -92,14 +92,14 @@ testing { suites.withType { useSpock() dependencies { - implementation("com.intershop.gradle.test:test-gradle-plugin:5.0.1") + implementation("com.intershop.gradle.test:test-gradle-plugin:5.1.0") implementation(gradleTestKit()) } targets { all { testTask.configure { - systemProperty("intershop.gradle.versions", "8.5") + systemProperty("intershop.gradle.versions", "8.5,8.10.2") testLogging { showStandardStreams = true } @@ -145,21 +145,21 @@ tasks { setBackends(listOf("html5", "docbook")) } - options = mapOf( - "doctype" to "article", - "ruby" to "erubis" - ) - attributes = mapOf( - "latestRevision" to project.version, - "toc" to "left", - "toclevels" to "2", - "source-highlighter" to "coderay", - "icons" to "font", - "setanchors" to "true", - "idprefix" to "asciidoc", - "idseparator" to "-", - "docinfo1" to "true" - ) + setOptions(mapOf( + "doctype" to "article", + "ruby" to "erubis" + )) + setAttributes(mapOf( + "latestRevision" to project.version, + "toc" to "left", + "toclevels" to "2", + "source-highlighter" to "coderay", + "icons" to "font", + "setanchors" to "true", + "idprefix" to "asciidoc", + "idseparator" to "-", + "docinfo1" to "true" + )) } withType { @@ -262,11 +262,11 @@ signing { } dependencies { - implementation(gradleKotlinDsl()) + compileOnly("org.apache.tomcat:tomcat-jasper:10.1.30") + compileOnly("org.apache.tomcat:tomcat-api:10.1.30") - compileOnly("org.apache.tomcat:tomcat-jasper:10.1.25") - compileOnly("org.apache.tomcat:tomcat-api:10.1.25") + compileOnly("com.intershop.icm:isml-parser:12.0.1") - compileOnly("com.intershop.icm:isml-parser:12.0.0") - implementation("com.intershop.gradle.resourcelist:resourcelist-gradle-plugin:5.0.1") + implementation(gradleKotlinDsl()) + implementation("com.intershop.gradle.resourcelist:resourcelist-gradle-plugin:5.0.2") } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..df97d72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # 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 +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 6689b85..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,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 +59,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 diff --git a/settings.gradle.kts b/settings.gradle.kts index 9c2a110..a022c9f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,19 +1,11 @@ -pluginManagement { - repositories { - gradlePluginPortal() - mavenCentral() - mavenLocal() - } -} - plugins { - id("com.gradle.enterprise") version "3.16.1" + id("com.gradle.develocity") version "3.18.1" } -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use" + termsOfUseAgree = "yes" } }