diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 60dca56417..c8cb745570 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,7 +6,7 @@ ci: - jsonschema-validator repos: - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks - rev: v2.10.0 + rev: v2.11.0 hooks: - id: pretty-format-java args: diff --git a/Dockerfile b/Dockerfile index 94ef131f9d..9fe991cbf2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.3.0-jdk11 AS builder +FROM gradle:8.4-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 44634ecc00..8c41a0b815 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { defaultTasks 'build' wrapper { - gradleVersion = '8.3' + gradleVersion = '8.4' distributionType = Wrapper.DistributionType.ALL } diff --git a/ci/requirements.txt b/ci/requirements.txt index 703c8f78a3..d9b79e4eab 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,2 +1,2 @@ c2cciutils[checks,publish]==1.6.11 -pre-commit==3.4.0 +pre-commit==3.5.0 diff --git a/core/build.gradle b/core/build.gradle index 076870a7f8..39097b4bb0 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -154,14 +154,14 @@ dependencies { "io.dropwizard.metrics:metrics-logback:4.2.21", ) geotools( - "org.geotools:gt-epsg-hsql:29.2", - "org.geotools:gt-render:29.2", - "org.geotools:gt-geojson:29.2", - "org.geotools:gt-geotiff:29.2", - "org.geotools:gt-wms:29.2", - "org.geotools.xsd:gt-xsd-gml3:29.2", - "org.geotools:gt-svg:29.2", - "org.geotools:gt-cql:29.2" + "org.geotools:gt-epsg-hsql:29.3", + "org.geotools:gt-render:29.3", + "org.geotools:gt-geojson:29.3", + "org.geotools:gt-geotiff:29.3", + "org.geotools:gt-wms:29.3", + "org.geotools.xsd:gt-xsd-gml3:29.3", + "org.geotools:gt-svg:29.3", + "org.geotools:gt-cql:29.3" ) jasper( "net.sf.jasperreports:jasperreports:6.20.6", @@ -185,7 +185,7 @@ dependencies { 'com.sun.mail:javax.mail:1.6.2', 'com.amazonaws:aws-java-sdk-s3:1.12.578', 'com.adobe.xmp:xmpcore:6.1.11', - 'io.sentry:sentry-logback:6.30.0', + 'io.sentry:sentry-logback:6.33.0', 'net.logstash.logback:logstash-logback-encoder:7.4', ) diff --git a/core/src/test/resources/org/mapfish/print/processor/map/opacity_center_wmts_fixedscale/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/opacity_center_wmts_fixedscale/expectedSimpleImage.png index 2f19c51fad..63c119f436 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/opacity_center_wmts_fixedscale/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/opacity_center_wmts_fixedscale/expectedSimpleImage.png differ diff --git a/docs/build.gradle b/docs/build.gradle index 4effa906f0..90f4d75851 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -21,7 +21,7 @@ dependencies { 'org.ccil.cowan.tagsoup:tagsoup:1.2.1', 'com.samskivert:jmustache:1.15', 'com.google.guava:guava:32.1.3-jre', - 'commons-io:commons-io:2.14.0', + 'commons-io:commons-io:2.15.0', "org.springframework:spring-beans:5.3.30", "org.springframework:spring-web:5.3.30", "org.springframework:spring-context:5.3.30", diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d11cdd907d..8838ba97ba 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.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 0adc8e1a53..1aa94a4269 100755 --- a/gradlew +++ b/gradlew @@ -145,7 +145,7 @@ 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 @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | 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 @@ -202,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" \