From 3375950ad847937dd30242972b1ad2e2c0bc4dd1 Mon Sep 17 00:00:00 2001 From: sebr72 Date: Mon, 28 Aug 2023 12:08:23 +0200 Subject: [PATCH] Move files to expected location --- Dockerfile | 5 ++--- core/build.gradle | 16 ++++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 10fa3e0d7c..0c886d9958 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,14 +22,14 @@ COPY core ./core COPY publish ./publish COPY examples ./examples COPY docs ./docs -COPY m2 /root/.m2 +COPY m2 /root/.m2/ ARG GIT_HEAD ENV GIT_HEAD=${GIT_HEAD} # Exclude the tasks that will run out of the docker build (in a docker run) RUN --mount=type=cache,target=/home/gradle/.gradle \ - gradle --parallel --exclude-task=:core:test \ + gradle --parallel \ --exclude-task=:core:spotbugsMain --exclude-task=:core:checkstyleMain \ --exclude-task=:core:spotbugsTest --exclude-task=:core:checkstyleTest --exclude-task=:core:testCLI \ :core:build :core:explodedWar :publish:build :examples:build :docs:buildDocs @@ -46,6 +46,5 @@ RUN mv /home/gradle/.gradle-backup /home/gradle/.gradle # Be able to use the container with a different user ENV GRADLE_USER_HOME=/home/gradle/ RUN chmod -R go+rw /home/gradle/ -RUN chmod -R go+rw /root/.m2/ COPY checkstyle_* ./ diff --git a/core/build.gradle b/core/build.gradle index 200d74f8b8..ee268e12e2 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -163,14 +163,14 @@ dependencies { "io.dropwizard.metrics:metrics-logback:4.2.19", ) 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:30-SNAPSHOT", + "org.geotools:gt-render:30-SNAPSHOT", + "org.geotools:gt-geojson:30-SNAPSHOT", + "org.geotools:gt-geotiff:30-SNAPSHOT", + "org.geotools:gt-wms:30-SNAPSHOT", + "org.geotools.xsd:gt-xsd-gml3:30-SNAPSHOT", + "org.geotools:gt-svg:30-SNAPSHOT", + "org.geotools:gt-cql:30-SNAPSHOT" ) jasper( "net.sf.jasperreports:jasperreports:6.20.5",