Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Not for merge] Use local mvn repo to get changes for opengis-migration #3032

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/reports/
/build/
/*/build/

/m2/repository
/docker-compose.override.yaml
/.env

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ COPY core ./core
COPY publish ./publish
COPY examples ./examples
COPY docs ./docs
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
Expand All @@ -43,7 +44,6 @@ RUN --mount=type=cache,target=/home/gradle/.gradle \
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/

COPY checkstyle_* ./
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
buildscript {
repositories {
mavenLocal()
mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
}
Expand Down
27 changes: 18 additions & 9 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,22 @@ apply plugin: 'distribution'
defaultTasks 'build'

repositories {
mavenLocal() {
content {
excludeModule("javax.media", "jai_core")
}
}
mavenCentral {
content {
excludeModule("javax.media", "jai_core")
}
}
maven { url "https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts" }
maven { url "https://repo.osgeo.org/repository/release/" }
maven { url "https://repo.osgeo.org/repository/release/"
content {
excludeGroup("org.geotools")
}
}
}

// the task `run` of the gretty plugin conflicts with the task with the same
Expand Down Expand Up @@ -154,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",
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@ services:

tests:
image: mapfish_print_builder
user: ${USER_ID}
command: tail --follow /dev/null
volumes:
- ./examples/src:/src/examples/src:ro
- ./examples/build/reports:/src/examples/build/reports
- ./examples/build/resources:/src/examples/build/resources
environment:
PRINT_YAML_MAX_ALIASES: '200'
GRADLE_USER_HOME: /home/gradle/.gradle
5 changes: 5 additions & 0 deletions docs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ apply plugin: 'idea'
defaultTasks 'build'

repositories {
mavenLocal() {
content {
excludeModule("javax.media", "jai_core")
}
}
mavenCentral {
content {
excludeModule("javax.media", "jai_core")
Expand Down
5 changes: 5 additions & 0 deletions examples/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import org.gradle.api.tasks.testing.logging.TestLogEvent

repositories {
mavenLocal() {
content {
excludeModule("javax.media", "jai_core")
}
}
mavenCentral {
content {
excludeModule("javax.media", "jai_core")
Expand Down
Empty file added m2/Readme.txt
Empty file.