diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 53b9e380..f371643e 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gretl/build.gradle b/gretl/build.gradle index 6a490ba6..c174f5b7 100755 --- a/gretl/build.gradle +++ b/gretl/build.gradle @@ -284,3 +284,9 @@ processResources{ duplicatesStrategy = DuplicatesStrategy.INCLUDE } +// init_postgresql.sql seems to be copied multiple times. +// Starting with 7.0.0 there is no default strategy anymore. So it has to be explicitly set. +processIntegrationTestResources { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE +} + diff --git a/runtimeImage/gretl/Dockerfile b/runtimeImage/gretl/Dockerfile index d5fde0be..80054989 100755 --- a/runtimeImage/gretl/Dockerfile +++ b/runtimeImage/gretl/Dockerfile @@ -18,8 +18,8 @@ RUN apk add --no-cache bash ca-certificates java-cacerts curl \ ENV JAVA_TOOL_OPTIONS=-Duser.home=${HOME} ENV GRADLE_HOME /opt/gradle -ENV GRADLE_VERSION 6.9.4 -ARG GRADLE_DOWNLOAD_SHA256=3e240228538de9f18772a574e99a0ba959e83d6ef351014381acd9631781389a +ENV GRADLE_VERSION 7.0 +ARG GRADLE_DOWNLOAD_SHA256=eb8b89184261025b0430f5b2233701ff1377f96da1ef5e278af6ae8bac5cc305 RUN set -o errexit -o nounset \ && echo "Downloading Gradle" \ && wget --no-verbose --output-document=gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \