diff --git a/Dockerfile b/Dockerfile index 4905a930ef..755e4e8baa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.6-jdk11 AS builder +FROM gradle:8.10.2-jdk11 AS builder RUN --mount=type=cache,target=/var/cache,sharing=locked \ --mount=type=cache,target=/root/.cache \ diff --git a/build.gradle b/build.gradle index e147bccb31..87c3bd9b6a 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { defaultTasks 'build' wrapper { - gradleVersion = '8.6' + gradleVersion = '8.10.2' distributionType = Wrapper.DistributionType.ALL } diff --git a/core/build.gradle b/core/build.gradle index 4cc1a86bd0..dfc4d103d6 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -168,20 +168,20 @@ dependencies { 'net.sf.jasperreports:jasperreports-functions:6.21.3', 'org.codehaus.groovy:groovy-all:3.0.22', 'ar.com.fdvs:DynamicJasper:5.3.9', - 'joda-time:joda-time:2.12.7', + 'joda-time:joda-time:2.13.0', ) implementation( 'org.slf4j:slf4j-api:2.0.16', 'org.slf4j:jcl-over-slf4j:2.0.16', 'org.slf4j:jul-to-slf4j:2.0.16', 'ch.qos.logback:logback-classic:1.5.8', - 'ch.qos.logback:logback-access:1.4.14', + 'ch.qos.logback:logback-access:1.5.8', 'org.json:json:20240303', - 'org.yaml:snakeyaml:2.2', + 'org.yaml:snakeyaml:2.3', 'com.github.spullara.cli-parser:cli-parser:1.1.6', 'com.sun.mail:javax.mail:1.6.2', 'com.amazonaws:aws-java-sdk-s3:1.12.772', - 'io.sentry:sentry-logback:7.5.0', + 'io.sentry:sentry-logback:7.14.0', // For JSON logs 'net.logstash.logback:logstash-logback-encoder:8.0', // For PDF/A diff --git a/docs/build.gradle b/docs/build.gradle index 5f676ace12..6ae67c0dda 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -20,8 +20,8 @@ dependencies { "org.springframework:spring-test:5.3.39", 'org.ccil.cowan.tagsoup:tagsoup:1.2.1', 'com.samskivert:jmustache:1.16', - 'com.google.guava:guava:33.0.0-jre', - 'commons-io:commons-io:2.15.1', + 'com.google.guava:guava:33.3.1-jre', + 'commons-io:commons-io:2.17.0', "org.springframework:spring-beans:5.3.39", "org.springframework:spring-web:5.3.39", "org.springframework:spring-context:5.3.39", diff --git a/docs/src/main/resources/templates/_main.html b/docs/src/main/resources/templates/_main.html index 034aede72e..4f999dbb43 100644 --- a/docs/src/main/resources/templates/_main.html +++ b/docs/src/main/resources/templates/_main.html @@ -169,8 +169,8 @@

{{pageTitle}}

> diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49177..a4b76b9530 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 2ea3535dc0..79eb9d003f 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.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4269..f5feea6d6b 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 25da30dbde..9d21a21834 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 ##########################################################################