From 76b89dd9a6096f62043c5d783530e84b08264923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Tue, 13 Apr 2021 10:18:48 +0200 Subject: [PATCH 01/26] Add maven plugin. --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 107b562324..d5577679b2 100644 --- a/build.gradle +++ b/build.gradle @@ -41,6 +41,7 @@ configurations.all { apply plugin: 'org.owasp.dependencycheck' configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) { + apply plugin: 'maven' apply plugin: 'java' apply plugin: 'com.github.spotbugs' apply plugin: 'eclipse' From cc816dffeb4981952cd9fb30defdc2630de39268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 21 Apr 2021 12:48:03 +0200 Subject: [PATCH 02/26] core: Add pom.xml. --- core/pom.xml | 755 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 755 insertions(+) create mode 100644 core/pom.xml diff --git a/core/pom.xml b/core/pom.xml new file mode 100644 index 0000000000..9a852e538d --- /dev/null +++ b/core/pom.xml @@ -0,0 +1,755 @@ + + + 4.0.0 + org.mapfish.print + print-servlet + 3.29.0-SNAPSHOT + war + + + org.springframework + spring-context + 5.2.2.RELEASE + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.springframework + spring-web + 5.2.2.RELEASE + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.springframework + spring-webmvc + 5.2.2.RELEASE + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.springframework.security + spring-security-config + 5.2.2.RELEASE + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.springframework.security + spring-security-web + 5.2.2.RELEASE + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + com.thetransactioncompany + cors-filter + 2.10 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.hibernate + hibernate-core + 5.4.30.Final + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.postgresql + postgresql + 42.2.19 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + com.vladmihalcea + hibernate-types-52 + 2.10.4 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + com.mchange + c3p0 + 0.9.5.5 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.springframework + spring-orm + 5.2.2.RELEASE + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.springframework + spring-jdbc + 5.2.2.RELEASE + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.springframework + spring-tx + 5.2.2.RELEASE + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.springframework + spring-test + 5.2.2.RELEASE + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + com.google.guava + guava + 30.1.1-jre + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.slf4j + slf4j-api + 1.7.30 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.slf4j + jcl-over-slf4j + 1.7.30 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.slf4j + jul-to-slf4j + 1.7.30 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + ch.qos.logback + logback-classic + 1.2.3 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + ch.qos.logback + logback-access + 1.2.3 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.json + json + 20210307 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.yaml + snakeyaml + 1.28 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + com.github.spullara.cli-parser + cli-parser + 1.1.5 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.apache.httpcomponents + httpclient + 4.5.13 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + com.sun.mail + javax.mail + 1.6.2 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + com.amazonaws + aws-java-sdk-s3 + 1.11.1000 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + com.adobe.xmp + xmpcore + 6.1.11 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + io.sentry + sentry-logback + 4.3.0 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + net.logstash.logback + logstash-logback-encoder + 6.6 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.apache.xmlgraphics + xmlgraphics-commons + 2.6 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.apache.xmlgraphics + batik-transcoder + 1.14 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.apache.xmlgraphics + batik-bridge + 1.14 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.apache.xmlgraphics + batik-codec + 1.14 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + org.apache.xmlgraphics + batik-svg-dom + 1.14 + compile + + + xercesImpl + * + + + * + commons-logging + + + jai_core + * + + + + + javax.servlet + javax.servlet-api + 4.0.1 + provided + + + xercesImpl + * + + + * + commons-logging + + + + + junit + junit + 4.13.2 + test + + + xercesImpl + * + + + * + commons-logging + + + + + org.mockito + mockito-core + 3.9.0 + test + + + xercesImpl + * + + + * + commons-logging + + + + + de.saly + javamail-mock2-fullmock + 0.5-beta4 + test + + + xercesImpl + * + + + * + commons-logging + + + + + From f100dec3379eaffdd89f59a22085db01ffe27bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 21 Apr 2021 12:52:03 +0200 Subject: [PATCH 03/26] pom.xml: Setting Java version and source encoding. --- core/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/pom.xml b/core/pom.xml index 9a852e538d..af2f1c6d9e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,6 +6,13 @@ print-servlet 3.29.0-SNAPSHOT war + + + 11 + 11 + UTF-8 + + org.springframework From d4e26cddfe1763702b440463f53fbf5c71b14c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 21 Apr 2021 12:58:35 +0200 Subject: [PATCH 04/26] pom.xml: Add geotools. --- core/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/pom.xml b/core/pom.xml index af2f1c6d9e..40120beb53 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -11,9 +11,17 @@ 11 11 UTF-8 + + 24.2 + + org.geotools + gt-epsg-hsql + ${geotools.version} + + org.springframework spring-context From 29b69f2d3184e6cf45042d915b89a88bba0e82fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 21 Apr 2021 13:41:38 +0200 Subject: [PATCH 05/26] pom.xml: More dependencies. --- core/pom.xml | 140 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/core/pom.xml b/core/pom.xml index 40120beb53..520f219193 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -15,6 +15,38 @@ 24.2 + + + osgeo-release + OSGeo Repository + https://repo.osgeo.org/repository/release/ + + + + + + false + + + true + + + + + + org.geotools @@ -22,6 +54,114 @@ ${geotools.version} + + org.geotools + gt-render + ${geotools.version} + + + + org.geotools + gt-coverage + ${geotools.version} + + + + org.geotools + gt-geojson + ${geotools.version} + + + + org.geotools + gt-geotiff + ${geotools.version} + + + + org.geotools + gt-wms + ${geotools.version} + + + + org.geotools + gt-svg + ${geotools.version} + + + + org.geotools + gt-cql + ${geotools.version} + + + + org.geotools.xsd + gt-xsd-gml3 + ${geotools.version} + + + + io.dropwizard.metrics + metrics-core + 4.1.19 + + + + io.dropwizard.metrics + metrics-healthchecks + 4.1.19 + + + + io.dropwizard.metrics + metrics-servlets + 4.1.19 + + + + io.dropwizard.metrics + metrics-servlet + 4.1.19 + + + + io.dropwizard.metrics + metrics-httpclient + 4.1.19 + + + + io.dropwizard.metrics + metrics-jmx + 4.1.19 + + + + io.dropwizard.metrics + metrics-logback + 4.1.19 + + + + com.readytalk + metrics3-statsd + 4.1.0 + + + + commons-collections + commons-collections + 3.2.2 + + + + org.apache.commons + commons-collections4 + 4.4 + + org.springframework spring-context From 956e6f12eb0cc59d81e7d5a122c83f449f25ef98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 21 Apr 2021 13:46:04 +0200 Subject: [PATCH 06/26] pom.xml: More dependencies. --- core/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/pom.xml b/core/pom.xml index 520f219193..796f20e252 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -144,6 +144,7 @@ 4.1.19 + com.readytalk metrics3-statsd @@ -162,6 +163,14 @@ 4.4 + + net.sf.jasperreports + jasperreports + 6.16.0 + + + + org.springframework spring-context From 9f771e3e52f3278916bfefbc31353fc63e66df27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 21 Apr 2021 15:16:43 +0200 Subject: [PATCH 07/26] pom.xml: More dependencies. --- core/pom.xml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 796f20e252..1d44660524 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -13,6 +13,9 @@ UTF-8 24.2 + 5.2.2.RELEASE + 1.14 + 4.1.4 @@ -32,11 +35,11 @@ - - spring-plugins + readytalk Spring Plugins - https://repo.spring.io/plugins-release/ + https://dl.bintray.com/readytalk/maven false @@ -44,7 +47,7 @@ true - --> + @@ -102,6 +105,13 @@ ${geotools.version} + + com.github.spotbugs + spotbugs-annotations + ${spotbugsVersion} + compile + + io.dropwizard.metrics metrics-core @@ -144,11 +154,10 @@ 4.1.19 - com.readytalk metrics3-statsd - 4.1.0 + 4.2.0 From b3deb5b1439e9cee600f0d48f4f4d5bb2ffe3cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 21 Apr 2021 16:36:34 +0200 Subject: [PATCH 08/26] pom.xml: Remove exclusions. --- core/pom.xml | 526 +-------------------------------------------------- 1 file changed, 5 insertions(+), 521 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 1d44660524..3d47a2c7aa 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -15,7 +15,7 @@ 24.2 5.2.2.RELEASE 1.14 - 4.1.4 + 4.1.4 @@ -117,13 +117,13 @@ metrics-core 4.1.19 - + io.dropwizard.metrics metrics-healthchecks 4.1.19 - + io.dropwizard.metrics metrics-servlets @@ -141,7 +141,7 @@ metrics-httpclient 4.1.19 - + io.dropwizard.metrics metrics-jmx @@ -185,744 +185,228 @@ spring-context 5.2.2.RELEASE compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - - + org.springframework spring-web 5.2.2.RELEASE compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.springframework spring-webmvc 5.2.2.RELEASE compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.springframework.security spring-security-config 5.2.2.RELEASE compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.springframework.security spring-security-web 5.2.2.RELEASE compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - com.thetransactioncompany cors-filter 2.10 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.hibernate hibernate-core 5.4.30.Final compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.postgresql postgresql 42.2.19 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - com.vladmihalcea hibernate-types-52 2.10.4 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - com.mchange c3p0 0.9.5.5 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.springframework spring-orm 5.2.2.RELEASE compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.springframework spring-jdbc 5.2.2.RELEASE compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.springframework spring-tx 5.2.2.RELEASE compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.springframework spring-test 5.2.2.RELEASE compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - com.google.guava guava 30.1.1-jre compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.slf4j slf4j-api 1.7.30 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.slf4j jcl-over-slf4j 1.7.30 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.slf4j jul-to-slf4j 1.7.30 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - ch.qos.logback logback-classic 1.2.3 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - ch.qos.logback logback-access 1.2.3 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.json json 20210307 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.yaml snakeyaml 1.28 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - com.github.spullara.cli-parser cli-parser 1.1.5 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.apache.httpcomponents httpclient 4.5.13 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - com.sun.mail javax.mail 1.6.2 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - com.amazonaws aws-java-sdk-s3 1.11.1000 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - com.adobe.xmp xmpcore 6.1.11 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - io.sentry sentry-logback 4.3.0 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - net.logstash.logback logstash-logback-encoder 6.6 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.apache.xmlgraphics xmlgraphics-commons 2.6 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.apache.xmlgraphics batik-transcoder 1.14 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.apache.xmlgraphics batik-bridge 1.14 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.apache.xmlgraphics batik-codec 1.14 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - org.apache.xmlgraphics batik-svg-dom 1.14 compile - - - xercesImpl - * - - - * - commons-logging - - - jai_core - * - - javax.servlet javax.servlet-api 4.0.1 provided - - - xercesImpl - * - - - * - commons-logging - - junit junit 4.13.2 test - - - xercesImpl - * - - - * - commons-logging - - org.mockito mockito-core 3.9.0 test - - - xercesImpl - * - - - * - commons-logging - - de.saly javamail-mock2-fullmock 0.5-beta4 test - - - xercesImpl - * - - - * - commons-logging - - From cbefb2a1b5940339c872cf335fd7ab38a0cbe7f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 7 Jul 2021 18:55:08 +0200 Subject: [PATCH 09/26] XXX: Add exclusions for dependencies. Cause: Caused by: java.lang.Error: Unresolved compilation problems: The package org.xml.sax is accessible from more than one module: , java.xml --- core/pom.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 9 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 3d47a2c7aa..a6a0499806 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,6 +1,8 @@ - + 4.0.0 org.mapfish.print print-servlet @@ -14,19 +16,20 @@ 24.2 5.2.2.RELEASE - 1.14 + 1.14 4.1.4 - + osgeo-release OSGeo Repository https://repo.osgeo.org/repository/release/ - - + + - + false @@ -35,7 +38,7 @@ - + readytalk Spring Plugins @@ -185,7 +188,7 @@ spring-context 5.2.2.RELEASE compile - + org.springframework spring-web @@ -365,12 +368,36 @@ batik-transcoder 1.14 compile + + + xml-apis + xml-apis + + + + xml-apis + xml-apis-ext + + + org.apache.xmlgraphics batik-bridge 1.14 compile + + + xml-apis + xml-apis + + + + xml-apis + xml-apis-ext + + + org.apache.xmlgraphics @@ -383,6 +410,19 @@ batik-svg-dom 1.14 compile + + + xml-apis + xml-apis + + + + xml-apis + xml-apis-ext + + + + javax.servlet From 5445abe9062809e3d1d74610b6042cb7b43f5e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 7 Jul 2021 18:57:21 +0200 Subject: [PATCH 10/26] Exclusions: Remove xml-apis-ext. This was too much excluded. --- core/pom.xml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index a6a0499806..75c37f3dea 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -374,11 +374,6 @@ xml-apis - - xml-apis - xml-apis-ext - - @@ -392,11 +387,6 @@ xml-apis - - xml-apis - xml-apis-ext - - @@ -416,11 +406,6 @@ xml-apis - - xml-apis - xml-apis-ext - - From 00a700bdf17b3b6f8c980e7642aaa9c1267e4a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Mon, 23 May 2022 18:33:08 +0200 Subject: [PATCH 11/26] Update Dependencies. --- core/pom.xml | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 75c37f3dea..b38f6a38c7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -14,10 +14,11 @@ 11 UTF-8 - 24.2 - 5.2.2.RELEASE + 26.4 + 5.3.20 + 5.7.1 1.14 - 4.1.4 + 4.6.0 @@ -25,7 +26,7 @@ osgeo-release OSGeo Repository https://repo.osgeo.org/repository/release/ - @@ -178,7 +179,7 @@ net.sf.jasperreports jasperreports - 6.16.0 + 6.19.1 @@ -186,31 +187,31 @@ org.springframework spring-context - 5.2.2.RELEASE + ${spring.version} compile org.springframework spring-web - 5.2.2.RELEASE + ${spring.version} compile org.springframework spring-webmvc - 5.2.2.RELEASE + ${spring.version} compile org.springframework.security spring-security-config - 5.2.2.RELEASE + ${spring-security.version} compile org.springframework.security spring-security-web - 5.2.2.RELEASE + ${spring-security.version} compile @@ -222,13 +223,13 @@ org.hibernate hibernate-core - 5.4.30.Final + 5.6.9.Final compile org.postgresql postgresql - 42.2.19 + 42.3.5 compile @@ -246,25 +247,25 @@ org.springframework spring-orm - 5.2.2.RELEASE + ${spring.version} compile org.springframework spring-jdbc - 5.2.2.RELEASE + ${spring.version} compile org.springframework spring-tx - 5.2.2.RELEASE + ${spring.version} compile org.springframework spring-test - 5.2.2.RELEASE + ${spring.version} compile From 8e657ae60f4e9b8bf918f417aafe32515a5783df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Tue, 24 May 2022 12:13:02 +0200 Subject: [PATCH 12/26] pom: Add dependency. --- core/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/pom.xml b/core/pom.xml index b38f6a38c7..9cc497ee17 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -55,6 +55,13 @@ + + + ar.com.fdvs + DynamicJasper + 5.3.4 + + org.geotools gt-epsg-hsql From 3e33dc2ed7dc9f04962c6f791d53527f20ee0e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Tue, 24 May 2022 18:20:38 +0200 Subject: [PATCH 13/26] pom.xml: Rename. Output jar instead of war. --- core/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 9cc497ee17..c0c42e15d4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,9 +5,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.mapfish.print - print-servlet + print-lib 3.29.0-SNAPSHOT - war + jar 11 From 8efb09e17c051d90c4417ac8907c0a777ac836e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 25 May 2022 08:41:18 +0200 Subject: [PATCH 14/26] Add Parent. --- core/pom.xml | 10 +- pom.xml | 452 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 461 insertions(+), 1 deletion(-) create mode 100644 pom.xml diff --git a/core/pom.xml b/core/pom.xml index c0c42e15d4..e49f0c9fcb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,11 +4,19 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + org.mapfish.print print-lib - 3.29.0-SNAPSHOT jar + + org.mapfish.print + mapfish-print + 3.29.0-SNAPSHOT + + + + 11 11 diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000000..5674af7e1e --- /dev/null +++ b/pom.xml @@ -0,0 +1,452 @@ + + + 4.0.0 + org.mapfish.print + mapfish-print + 3.29.0-SNAPSHOT + pom + + + 11 + 11 + UTF-8 + + 26.4 + 5.3.20 + 5.7.1 + 1.14 + 4.6.0 + + + + + osgeo-release + OSGeo Repository + https://repo.osgeo.org/repository/release/ + + + + + + false + + + true + + + + + + readytalk + Spring Plugins + https://dl.bintray.com/readytalk/maven + + false + + + true + + + + + + + + + + ar.com.fdvs + DynamicJasper + 5.3.4 + + + + org.geotools + gt-epsg-hsql + ${geotools.version} + + + + org.geotools + gt-render + ${geotools.version} + + + + org.geotools + gt-coverage + ${geotools.version} + + + + org.geotools + gt-geojson + ${geotools.version} + + + + org.geotools + gt-geotiff + ${geotools.version} + + + + org.geotools + gt-wms + ${geotools.version} + + + + org.geotools + gt-svg + ${geotools.version} + + + + org.geotools + gt-cql + ${geotools.version} + + + + org.geotools.xsd + gt-xsd-gml3 + ${geotools.version} + + + + com.github.spotbugs + spotbugs-annotations + ${spotbugsVersion} + compile + + + + io.dropwizard.metrics + metrics-core + 4.1.19 + + + + io.dropwizard.metrics + metrics-healthchecks + 4.1.19 + + + + io.dropwizard.metrics + metrics-servlets + 4.1.19 + + + + io.dropwizard.metrics + metrics-servlet + 4.1.19 + + + + io.dropwizard.metrics + metrics-httpclient + 4.1.19 + + + + io.dropwizard.metrics + metrics-jmx + 4.1.19 + + + + io.dropwizard.metrics + metrics-logback + 4.1.19 + + + + com.readytalk + metrics3-statsd + 4.2.0 + + + + commons-collections + commons-collections + 3.2.2 + + + + org.apache.commons + commons-collections4 + 4.4 + + + + net.sf.jasperreports + jasperreports + 6.19.1 + + + + + + org.springframework + spring-context + ${spring.version} + compile + + + org.springframework + spring-web + ${spring.version} + compile + + + org.springframework + spring-webmvc + ${spring.version} + compile + + + org.springframework.security + spring-security-config + ${spring-security.version} + compile + + + org.springframework.security + spring-security-web + ${spring-security.version} + compile + + + com.thetransactioncompany + cors-filter + 2.10 + compile + + + org.hibernate + hibernate-core + 5.6.9.Final + compile + + + org.postgresql + postgresql + 42.3.5 + compile + + + com.vladmihalcea + hibernate-types-52 + 2.10.4 + compile + + + com.mchange + c3p0 + 0.9.5.5 + compile + + + org.springframework + spring-orm + ${spring.version} + compile + + + org.springframework + spring-jdbc + ${spring.version} + compile + + + org.springframework + spring-tx + ${spring.version} + compile + + + org.springframework + spring-test + ${spring.version} + compile + + + com.google.guava + guava + 30.1.1-jre + compile + + + org.slf4j + slf4j-api + 1.7.30 + compile + + + org.slf4j + jcl-over-slf4j + 1.7.30 + compile + + + org.slf4j + jul-to-slf4j + 1.7.30 + compile + + + ch.qos.logback + logback-classic + 1.2.3 + compile + + + ch.qos.logback + logback-access + 1.2.3 + compile + + + org.json + json + 20210307 + compile + + + org.yaml + snakeyaml + 1.28 + compile + + + com.github.spullara.cli-parser + cli-parser + 1.1.5 + compile + + + org.apache.httpcomponents + httpclient + 4.5.13 + compile + + + com.sun.mail + javax.mail + 1.6.2 + compile + + + com.amazonaws + aws-java-sdk-s3 + 1.11.1000 + compile + + + com.adobe.xmp + xmpcore + 6.1.11 + compile + + + io.sentry + sentry-logback + 4.3.0 + compile + + + net.logstash.logback + logstash-logback-encoder + 6.6 + compile + + + org.apache.xmlgraphics + xmlgraphics-commons + 2.6 + compile + + + org.apache.xmlgraphics + batik-transcoder + 1.14 + compile + + + xml-apis + xml-apis + + + + + + org.apache.xmlgraphics + batik-bridge + 1.14 + compile + + + xml-apis + xml-apis + + + + + + org.apache.xmlgraphics + batik-codec + 1.14 + compile + + + org.apache.xmlgraphics + batik-svg-dom + 1.14 + compile + + + xml-apis + xml-apis + + + + + + + javax.servlet + javax.servlet-api + 4.0.1 + provided + + + junit + junit + 4.13.2 + test + + + org.mockito + mockito-core + 3.9.0 + test + + + de.saly + javamail-mock2-fullmock + 0.5-beta4 + test + + + + + + core + + + From 321c774089bf3b9b0f7cd6218184062289799202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 25 May 2022 15:52:02 +0200 Subject: [PATCH 15/26] Add servlet module. Move webapp folder there. --- pom.xml | 2 + servlet/pom.xml | 453 ++++++++++++++++++ .../main/webapp/WEB-INF/classes/logback.xml | 0 .../WEB-INF/mapfish-print-printer-factory.xml | 0 .../webapp/WEB-INF/mapfish-print-servlet.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 {core => servlet}/src/main/webapp/favicon.ico | Bin {core => servlet}/src/main/webapp/index.html | 0 .../src/main/webapp/mapfish_transparent.png | Bin 9 files changed, 455 insertions(+) create mode 100644 servlet/pom.xml rename {core => servlet}/src/main/webapp/WEB-INF/classes/logback.xml (100%) rename {core => servlet}/src/main/webapp/WEB-INF/mapfish-print-printer-factory.xml (100%) rename {core => servlet}/src/main/webapp/WEB-INF/mapfish-print-servlet.xml (100%) rename {core => servlet}/src/main/webapp/WEB-INF/web.xml (100%) rename {core => servlet}/src/main/webapp/favicon.ico (100%) rename {core => servlet}/src/main/webapp/index.html (100%) rename {core => servlet}/src/main/webapp/mapfish_transparent.png (100%) diff --git a/pom.xml b/pom.xml index 5674af7e1e..3bd77d9376 100644 --- a/pom.xml +++ b/pom.xml @@ -447,6 +447,8 @@ core + servlet + diff --git a/servlet/pom.xml b/servlet/pom.xml new file mode 100644 index 0000000000..1347c7a33b --- /dev/null +++ b/servlet/pom.xml @@ -0,0 +1,453 @@ + + + 4.0.0 + + org.mapfish.print + print-servlet + war + + + org.mapfish.print + mapfish-print + 3.29.0-SNAPSHOT + + + + + + 11 + 11 + UTF-8 + + 26.4 + 5.3.20 + 5.7.1 + 1.14 + 4.6.0 + + + + + osgeo-release + OSGeo Repository + https://repo.osgeo.org/repository/release/ + + + + + + false + + + true + + + + + + readytalk + Spring Plugins + https://dl.bintray.com/readytalk/maven + + false + + + true + + + + + + + + + ar.com.fdvs + DynamicJasper + 5.3.4 + + + + org.geotools + gt-epsg-hsql + ${geotools.version} + + + + org.geotools + gt-render + ${geotools.version} + + + + org.geotools + gt-coverage + ${geotools.version} + + + + org.geotools + gt-geojson + ${geotools.version} + + + + org.geotools + gt-geotiff + ${geotools.version} + + + + org.geotools + gt-wms + ${geotools.version} + + + + org.geotools + gt-svg + ${geotools.version} + + + + org.geotools + gt-cql + ${geotools.version} + + + + org.geotools.xsd + gt-xsd-gml3 + ${geotools.version} + + + + com.github.spotbugs + spotbugs-annotations + ${spotbugsVersion} + compile + + + + io.dropwizard.metrics + metrics-core + 4.1.19 + + + + io.dropwizard.metrics + metrics-healthchecks + 4.1.19 + + + + io.dropwizard.metrics + metrics-servlets + 4.1.19 + + + + io.dropwizard.metrics + metrics-servlet + 4.1.19 + + + + io.dropwizard.metrics + metrics-httpclient + 4.1.19 + + + + io.dropwizard.metrics + metrics-jmx + 4.1.19 + + + + io.dropwizard.metrics + metrics-logback + 4.1.19 + + + + com.readytalk + metrics3-statsd + 4.2.0 + + + + commons-collections + commons-collections + 3.2.2 + + + + org.apache.commons + commons-collections4 + 4.4 + + + + net.sf.jasperreports + jasperreports + 6.19.1 + + + + + + org.springframework + spring-context + ${spring.version} + compile + + + org.springframework + spring-web + ${spring.version} + compile + + + org.springframework + spring-webmvc + ${spring.version} + compile + + + org.springframework.security + spring-security-config + ${spring-security.version} + compile + + + org.springframework.security + spring-security-web + ${spring-security.version} + compile + + + com.thetransactioncompany + cors-filter + 2.10 + compile + + + org.hibernate + hibernate-core + 5.6.9.Final + compile + + + org.postgresql + postgresql + 42.3.5 + compile + + + com.vladmihalcea + hibernate-types-52 + 2.10.4 + compile + + + com.mchange + c3p0 + 0.9.5.5 + compile + + + org.springframework + spring-orm + ${spring.version} + compile + + + org.springframework + spring-jdbc + ${spring.version} + compile + + + org.springframework + spring-tx + ${spring.version} + compile + + + org.springframework + spring-test + ${spring.version} + compile + + + com.google.guava + guava + 30.1.1-jre + compile + + + org.slf4j + slf4j-api + 1.7.30 + compile + + + org.slf4j + jcl-over-slf4j + 1.7.30 + compile + + + org.slf4j + jul-to-slf4j + 1.7.30 + compile + + + ch.qos.logback + logback-classic + 1.2.3 + compile + + + ch.qos.logback + logback-access + 1.2.3 + compile + + + org.json + json + 20210307 + compile + + + org.yaml + snakeyaml + 1.28 + compile + + + com.github.spullara.cli-parser + cli-parser + 1.1.5 + compile + + + org.apache.httpcomponents + httpclient + 4.5.13 + compile + + + com.sun.mail + javax.mail + 1.6.2 + compile + + + com.amazonaws + aws-java-sdk-s3 + 1.11.1000 + compile + + + com.adobe.xmp + xmpcore + 6.1.11 + compile + + + io.sentry + sentry-logback + 4.3.0 + compile + + + net.logstash.logback + logstash-logback-encoder + 6.6 + compile + + + org.apache.xmlgraphics + xmlgraphics-commons + 2.6 + compile + + + org.apache.xmlgraphics + batik-transcoder + 1.14 + compile + + + xml-apis + xml-apis + + + + + + org.apache.xmlgraphics + batik-bridge + 1.14 + compile + + + xml-apis + xml-apis + + + + + + org.apache.xmlgraphics + batik-codec + 1.14 + compile + + + org.apache.xmlgraphics + batik-svg-dom + 1.14 + compile + + + xml-apis + xml-apis + + + + + + + javax.servlet + javax.servlet-api + 4.0.1 + provided + + + junit + junit + 4.13.2 + test + + + org.mockito + mockito-core + 3.9.0 + test + + + de.saly + javamail-mock2-fullmock + 0.5-beta4 + test + + + diff --git a/core/src/main/webapp/WEB-INF/classes/logback.xml b/servlet/src/main/webapp/WEB-INF/classes/logback.xml similarity index 100% rename from core/src/main/webapp/WEB-INF/classes/logback.xml rename to servlet/src/main/webapp/WEB-INF/classes/logback.xml diff --git a/core/src/main/webapp/WEB-INF/mapfish-print-printer-factory.xml b/servlet/src/main/webapp/WEB-INF/mapfish-print-printer-factory.xml similarity index 100% rename from core/src/main/webapp/WEB-INF/mapfish-print-printer-factory.xml rename to servlet/src/main/webapp/WEB-INF/mapfish-print-printer-factory.xml diff --git a/core/src/main/webapp/WEB-INF/mapfish-print-servlet.xml b/servlet/src/main/webapp/WEB-INF/mapfish-print-servlet.xml similarity index 100% rename from core/src/main/webapp/WEB-INF/mapfish-print-servlet.xml rename to servlet/src/main/webapp/WEB-INF/mapfish-print-servlet.xml diff --git a/core/src/main/webapp/WEB-INF/web.xml b/servlet/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from core/src/main/webapp/WEB-INF/web.xml rename to servlet/src/main/webapp/WEB-INF/web.xml diff --git a/core/src/main/webapp/favicon.ico b/servlet/src/main/webapp/favicon.ico similarity index 100% rename from core/src/main/webapp/favicon.ico rename to servlet/src/main/webapp/favicon.ico diff --git a/core/src/main/webapp/index.html b/servlet/src/main/webapp/index.html similarity index 100% rename from core/src/main/webapp/index.html rename to servlet/src/main/webapp/index.html diff --git a/core/src/main/webapp/mapfish_transparent.png b/servlet/src/main/webapp/mapfish_transparent.png similarity index 100% rename from core/src/main/webapp/mapfish_transparent.png rename to servlet/src/main/webapp/mapfish_transparent.png From 00ac02bb3ec4660691587c5127d854dcf746af81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 25 May 2022 15:52:56 +0200 Subject: [PATCH 16/26] Add more to .gitignore. --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 7cef82ca7e..e0d09cd6ca 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,9 @@ /build/ /*/build/ +target +core/target +servlet/target /examples/geoserver-data/.updatepassword.lock /examples/geoserver-data/controlflow.properties @@ -20,3 +23,5 @@ /examples/geoserver-data/wps.xml /CI.asc +*~ + From 5b847f7e058ebd55428c2aaf8924922b932b3f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Fri, 27 May 2022 20:39:25 +0200 Subject: [PATCH 17/26] servlet: Remove dependencies. Add print-lib as dependency. --- servlet/pom.xml | 387 +----------------------------------------------- 1 file changed, 3 insertions(+), 384 deletions(-) diff --git a/servlet/pom.xml b/servlet/pom.xml index 1347c7a33b..2668a81f0a 100644 --- a/servlet/pom.xml +++ b/servlet/pom.xml @@ -63,391 +63,10 @@ - - - ar.com.fdvs - DynamicJasper - 5.3.4 - - - - org.geotools - gt-epsg-hsql - ${geotools.version} - - - - org.geotools - gt-render - ${geotools.version} - - - - org.geotools - gt-coverage - ${geotools.version} - - - - org.geotools - gt-geojson - ${geotools.version} - - - - org.geotools - gt-geotiff - ${geotools.version} - - - - org.geotools - gt-wms - ${geotools.version} - - - - org.geotools - gt-svg - ${geotools.version} - - - - org.geotools - gt-cql - ${geotools.version} - - - - org.geotools.xsd - gt-xsd-gml3 - ${geotools.version} - - - - com.github.spotbugs - spotbugs-annotations - ${spotbugsVersion} - compile - - - - io.dropwizard.metrics - metrics-core - 4.1.19 - - - - io.dropwizard.metrics - metrics-healthchecks - 4.1.19 - - - - io.dropwizard.metrics - metrics-servlets - 4.1.19 - - - - io.dropwizard.metrics - metrics-servlet - 4.1.19 - - - - io.dropwizard.metrics - metrics-httpclient - 4.1.19 - - - - io.dropwizard.metrics - metrics-jmx - 4.1.19 - - - - io.dropwizard.metrics - metrics-logback - 4.1.19 - - - - com.readytalk - metrics3-statsd - 4.2.0 - - - - commons-collections - commons-collections - 3.2.2 - - - - org.apache.commons - commons-collections4 - 4.4 - - - - net.sf.jasperreports - jasperreports - 6.19.1 - - - - - - org.springframework - spring-context - ${spring.version} - compile - - - org.springframework - spring-web - ${spring.version} - compile - - - org.springframework - spring-webmvc - ${spring.version} - compile - - - org.springframework.security - spring-security-config - ${spring-security.version} - compile - - - org.springframework.security - spring-security-web - ${spring-security.version} - compile - - - com.thetransactioncompany - cors-filter - 2.10 - compile - - - org.hibernate - hibernate-core - 5.6.9.Final - compile - - - org.postgresql - postgresql - 42.3.5 - compile - - - com.vladmihalcea - hibernate-types-52 - 2.10.4 - compile - - - com.mchange - c3p0 - 0.9.5.5 - compile - - - org.springframework - spring-orm - ${spring.version} - compile - - - org.springframework - spring-jdbc - ${spring.version} - compile - - - org.springframework - spring-tx - ${spring.version} - compile - - - org.springframework - spring-test - ${spring.version} - compile - - - com.google.guava - guava - 30.1.1-jre - compile - - - org.slf4j - slf4j-api - 1.7.30 - compile - - - org.slf4j - jcl-over-slf4j - 1.7.30 - compile - - - org.slf4j - jul-to-slf4j - 1.7.30 - compile - - - ch.qos.logback - logback-classic - 1.2.3 - compile - - - ch.qos.logback - logback-access - 1.2.3 - compile - - - org.json - json - 20210307 - compile - - - org.yaml - snakeyaml - 1.28 - compile - - - com.github.spullara.cli-parser - cli-parser - 1.1.5 - compile - - - org.apache.httpcomponents - httpclient - 4.5.13 - compile - - - com.sun.mail - javax.mail - 1.6.2 - compile - - - com.amazonaws - aws-java-sdk-s3 - 1.11.1000 - compile - - - com.adobe.xmp - xmpcore - 6.1.11 - compile - - - io.sentry - sentry-logback - 4.3.0 - compile - - - net.logstash.logback - logstash-logback-encoder - 6.6 - compile - - - org.apache.xmlgraphics - xmlgraphics-commons - 2.6 - compile - - - org.apache.xmlgraphics - batik-transcoder - 1.14 - compile - - - xml-apis - xml-apis - - - - - - org.apache.xmlgraphics - batik-bridge - 1.14 - compile - - - xml-apis - xml-apis - - - - - - org.apache.xmlgraphics - batik-codec - 1.14 - compile - - - org.apache.xmlgraphics - batik-svg-dom - 1.14 - compile - - - xml-apis - xml-apis - - - - - - - javax.servlet - javax.servlet-api - 4.0.1 - provided - - - junit - junit - 4.13.2 - test - - - org.mockito - mockito-core - 3.9.0 - test - - de.saly - javamail-mock2-fullmock - 0.5-beta4 - test + org.mapfish.print + print-lib + 3.29.0-SNAPSHOT From acfff575b77c49a4a5aeeb2dc337cc17adbe01be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Fri, 27 May 2022 20:42:01 +0200 Subject: [PATCH 18/26] Add Dockerfile from 'core' project. --- docker/Dockerfile | 67 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 docker/Dockerfile diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000000..874a759311 --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,67 @@ +FROM mapfish_print_builder AS builder + + + +FROM tomcat:9.0-jdk17-openjdk-slim-bullseye AS runner +LABEL maintainer="Camptocamp " + +RUN perl -0777 -i -pe 's/(]*>)//s' "${CATALINA_HOME}/conf/server.xml" && \ + echo "tomcat.util.scan.StandardJarScanFilter.jarsToSkip=*" >> "${CATALINA_HOME}/conf/catalina.properties" && \ + echo "org.apache.catalina.startup.TldConfig.jarsToSkip=*" >> "${CATALINA_HOME}/conf/catalina.properties" && \ + echo "tomcat.util.scan.DefaultJarScanner.jarsToSkip=*" >> "${CATALINA_HOME}/conf/catalina.properties" && \ + perl -0777 -i -pe 's/<\/Context>/<\/Context>/' "${CATALINA_HOME}/conf/context.xml" && \ + mkdir --parent /usr/local/tomcat/conf/Catalina /usr/local/tomcat/work/Catalina && \ + chmod -R g+rwx /usr/local/tomcat/conf/Catalina /usr/local/tomcat/work && \ + chgrp -R root /usr/local/tomcat/conf/Catalina /usr/local/tomcat/work && \ + chmod g+r /usr/local/tomcat/conf/* && \ + apt-get update && \ + apt-get upgrade --assume-yes && \ + apt-get install --assume-yes --no-install-recommends curl \ + fonts-liberation fonts-dejavu fontconfig && \ + apt-get clean && \ + rm --recursive --force /var/lib/apt/lists/* + +COPY --from=builder /src/core/build/webapp "${CATALINA_HOME}/webapps/ROOT/" +COPY --from=builder /src/examples/build/classes/java/test/org/mapfish/print/HumanAlphaSerie.class "${CATALINA_HOME}/webapps/ROOT/WEB-INF/classes/org/mapfish/print/" +COPY docker / + +RUN mkdir -p "${CATALINA_HOME}/extlib/classes/org/mapfish/print" && \ + cp -r "${CATALINA_HOME}/webapps/ROOT/WEB-INF/classes/org/mapfish/print/url" "${CATALINA_HOME}/extlib/classes/org/mapfish/print/" && \ + perl -0777 -i -pe 's///s' "${CATALINA_HOME}/conf/server.xml" && \ + chmod g+r -R /usr/local/tomcat/conf/ && \ + chmod g+rw /usr/local/tomcat/temp/ /usr/local/tomcat/webapps/ROOT/WEB-INF/lib && \ + chmod g+rw /usr/local/tomcat/webapps/ROOT/WEB-INF/classes /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/*.xml && \ + adduser www-data root + +ENV LOG_LEVEL=INFO \ + SPRING_LOG_LEVEL=WARN \ + JASPER_LOG_LEVEL=WARN \ + APACHE_LOG_LEVEL=WARN \ + SQL_LOG_LEVEL=WARN \ + CATALINA_OPTS= \ + DEFAULT_LOG_LEVEL=INFO \ + TOMCAT_LOG_LEVEL=INFO \ + SENTRY_LOG_LEVEL=ERROR \ + SENTRY_REPORTING_LOG_LEVEL=WARN \ + TOMCAT_LOG_TYPE=classic \ + EXTRA_JARS= \ + PRINT_YAML_MAX_ALIASES=50 \ + JAVA_OPTS=-Dsun.net.inetaddr.ttl=30 \ + SENTRY_DSN= + +CMD ["/usr/local/tomcat/bin/docker-start-print"] + +FROM runner AS tester + +COPY jettyRunExtraFiles/mapfish-spring-application-context-override-acceptencetests.xml \ + webapps/ROOT/WEB-INF/classes/mapfish-spring-application-context-override.xml + +FROM runner AS watcher + +RUN apt-get update && \ + apt-get install --yes --no-install-recommends python3-pip rsync python3-setuptools && \ + apt-get clean && \ + rm --recursive --force /var/lib/apt/lists/* && \ + python3 -m pip --disable-pip-version-check --no-cache-dir install inotify + +FROM runner AS final From dc65f09ab7b987fc3e4e2ccc5d7a1f88f07e8c74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Tue, 31 May 2022 10:35:47 +0200 Subject: [PATCH 19/26] Maven: Update versions. But needs to be sorted out. --- core/pom.xml | 8 +++++++ pom.xml | 64 ++++++++++++++++++++++++++++++++++------------------ 2 files changed, 50 insertions(+), 22 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index e49f0c9fcb..112197fecb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -64,6 +64,14 @@ + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + 2.13.2 + + ar.com.fdvs DynamicJasper diff --git a/pom.xml b/pom.xml index 3bd77d9376..6d2dd72d53 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,8 @@ 5.3.20 5.7.1 1.14 - 4.6.0 + 4.7.0 + 4.2.9 @@ -63,6 +64,25 @@ 5.3.4 + + net.sf.jasperreports + jasperreports-fonts + 6.19.1 + + + + net.sf.jasperreports + jasperreports-functions + 6.19.1 + + + + + joda-time + joda-time + 2.10.14 + + org.geotools gt-epsg-hsql @@ -127,43 +147,43 @@ io.dropwizard.metrics metrics-core - 4.1.19 + ${dropvizard.version} io.dropwizard.metrics metrics-healthchecks - 4.1.19 + ${dropvizard.version} io.dropwizard.metrics metrics-servlets - 4.1.19 + ${dropvizard.version} io.dropwizard.metrics metrics-servlet - 4.1.19 + ${dropvizard.version} io.dropwizard.metrics metrics-httpclient - 4.1.19 + ${dropvizard.version} io.dropwizard.metrics metrics-jmx - 4.1.19 + ${dropvizard.version} io.dropwizard.metrics metrics-logback - 4.1.19 + ${dropvizard.version} @@ -237,13 +257,13 @@ org.postgresql postgresql - 42.3.5 + 42.3.6 compile com.vladmihalcea hibernate-types-52 - 2.10.4 + 2.16.2 compile @@ -285,49 +305,49 @@ org.slf4j slf4j-api - 1.7.30 + 1.7.36 compile org.slf4j jcl-over-slf4j - 1.7.30 + 1.7.36 compile org.slf4j jul-to-slf4j - 1.7.30 + 1.7.36 compile ch.qos.logback logback-classic - 1.2.3 + 1.2.11 compile ch.qos.logback logback-access - 1.2.3 + 1.2.11 compile org.json json - 20210307 + 20220320 compile org.yaml snakeyaml - 1.28 + 1.30 compile com.github.spullara.cli-parser cli-parser - 1.1.5 + 1.1.6 compile @@ -345,7 +365,7 @@ com.amazonaws aws-java-sdk-s3 - 1.11.1000 + 1.12.230 compile @@ -357,19 +377,19 @@ io.sentry sentry-logback - 4.3.0 + 5.7.4 compile net.logstash.logback logstash-logback-encoder - 6.6 + 7.2 compile org.apache.xmlgraphics xmlgraphics-commons - 2.6 + 2.7 compile From b87f4889dd5e03ed136cf42a09a01faf599ca1bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Tue, 14 Jun 2022 16:18:42 +0200 Subject: [PATCH 20/26] XXX: comment-out. --- docker/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 874a759311..50ed2a4727 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -21,8 +21,8 @@ RUN perl -0777 -i -pe 's/( Date: Tue, 14 Jun 2022 17:25:36 +0200 Subject: [PATCH 21/26] Change URL for metrics3-statsd repository. --- core/pom.xml | 2 +- pom.xml | 2 +- servlet/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 112197fecb..d47898d805 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -51,7 +51,7 @@ readytalk Spring Plugins - https://dl.bintray.com/readytalk/maven + https://repo.spring.io/plugins-release/ false diff --git a/pom.xml b/pom.xml index 6d2dd72d53..c3281286d5 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ readytalk Spring Plugins - https://dl.bintray.com/readytalk/maven + https://repo.spring.io/plugins-release/ false diff --git a/servlet/pom.xml b/servlet/pom.xml index 2668a81f0a..0232a4bacd 100644 --- a/servlet/pom.xml +++ b/servlet/pom.xml @@ -51,7 +51,7 @@ readytalk Spring Plugins - https://dl.bintray.com/readytalk/maven + https://repo.spring.io/plugins-release/ false From d371567698adf877c46d7f37e802979c23379361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Tue, 14 Jun 2022 17:25:56 +0200 Subject: [PATCH 22/26] WIP: Dockerfile with Maven. --- Dockerfile | 47 ++++++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5064cfee81..f6e154cd12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,38 +1,47 @@ -FROM gradle:6.9-jdk11 AS builder +#FROM maven:3.8.5-eclipse-temurin-11-alpine@sha256:b4083a13f534f6256179802b3deaeadccf4b8eb9bcb4c8a35b78919624b18448 AS builder +FROM maven:3.8.5-eclipse-temurin-11-focal@sha256:a5a8b7b6ae4b7045c42ab9c21b72cdffe43db8eebf8bbf5a741f2660453c86ba AS base RUN apt-get update && \ apt-get install --yes --no-install-recommends fonts-liberation gettext curl && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ - gradle --version + mvn --version WORKDIR /src -COPY gradle/ ./gradle/ -COPY gradle.properties build.gradle settings.gradle CI.asc ./ -COPY examples/build.gradle ./examples/ -COPY docs/build.gradle ./docs/ -COPY publish/build.gradle ./publish/ +COPY pom.xml ./ COPY core ./core -COPY checkstyle_* ./ +COPY servlet ./servlet + +FROM base AS builder +RUN mvn -B dependency:resolve + +FROM builder AS cachedbuiler + +# COPY checkstyle_* ./ +# COPY gradle.properties build.gradle settings.gradle CI.asc ./ +# COPY examples/build.gradle ./examples/ +# COPY docs/build.gradle ./docs/ +# COPY publish/build.gradle ./publish/ # '&& touch success || true' is a trick to be able to get out some artifacts -RUN (gradle :core:build :core:explodedWar :core:libSourcesJar :core:libJavadocJar && touch success) || true +#RUN (gradle :core:build :core:explodedWar :core:libSourcesJar :core:libJavadocJar && touch success) || true +RUN mvn clean verify -ARG GIT_HEAD -ENV GIT_HEAD=${GIT_HEAD} +# ARG GIT_HEAD +# ENV GIT_HEAD=${GIT_HEAD} -COPY publish ./publish +# COPY publish ./publish -RUN ([ -e success ] && (gradle :publish:build && touch success-publish)) || true +# RUN ([ -e success ] && (gradle :publish:build && touch success-publish)) || true -COPY examples ./examples -COPY docs ./docs +# COPY examples ./examples +# COPY docs ./docs -RUN ([ -e success ] && (gradle :examples:build buildDocs && touch success-examples-docs)) || true +# RUN ([ -e success ] && (gradle :examples:build buildDocs && touch success-examples-docs)) || true -FROM builder AS test-builder +# FROM builder AS test-builder -RUN [ -e success ] && [ -e success-publish ] && [ -e success-examples-docs ] +# RUN [ -e success ] && [ -e success-publish ] && [ -e success-examples-docs ] -VOLUME [ "/src/core" ] +# VOLUME [ "/src/core" ] From 949bba2523684a43dd481d1e3f8a2b090c330b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 29 Jun 2022 09:32:25 +0200 Subject: [PATCH 23/26] more --- Dockerfile | 4 ++-- core/pom.xml | 2 +- pom.xml | 2 +- servlet/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index f6e154cd12..ca7a7e22f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ COPY core ./core COPY servlet ./servlet FROM base AS builder -RUN mvn -B dependency:resolve +RUN mvn -B dependency:resolve -projects core FROM builder AS cachedbuiler @@ -26,7 +26,7 @@ FROM builder AS cachedbuiler # '&& touch success || true' is a trick to be able to get out some artifacts #RUN (gradle :core:build :core:explodedWar :core:libSourcesJar :core:libJavadocJar && touch success) || true -RUN mvn clean verify +RUN mvn -B clean install # ARG GIT_HEAD # ENV GIT_HEAD=${GIT_HEAD} diff --git a/core/pom.xml b/core/pom.xml index d47898d805..5b3d22f1cc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -51,7 +51,7 @@ readytalk Spring Plugins - https://repo.spring.io/plugins-release/ + https://artifactory.georchestra.org/artifactory/bintray-readytalk-cache/ false diff --git a/pom.xml b/pom.xml index c3281286d5..2f52863c50 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ readytalk Spring Plugins - https://repo.spring.io/plugins-release/ + https://artifactory.georchestra.org/artifactory/bintray-readytalk-cache/ false diff --git a/servlet/pom.xml b/servlet/pom.xml index 0232a4bacd..f0a48db248 100644 --- a/servlet/pom.xml +++ b/servlet/pom.xml @@ -51,7 +51,7 @@ readytalk Spring Plugins - https://repo.spring.io/plugins-release/ + https://artifactory.georchestra.org/artifactory/bintray-readytalk-cache/ false From f1753d6b3764118549be6e9d53e34eebf4414ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 29 Jun 2022 09:53:48 +0200 Subject: [PATCH 24/26] pom.xml: Reformat. --- pom.xml | 849 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 440 insertions(+), 409 deletions(-) diff --git a/pom.xml b/pom.xml index 2f52863c50..dc385f2bbf 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ osgeo-release OSGeo Repository https://repo.osgeo.org/repository/release/ - @@ -52,417 +52,448 @@ true - - - - - ar.com.fdvs - DynamicJasper - 5.3.4 - - - - net.sf.jasperreports - jasperreports-fonts - 6.19.1 - - - - net.sf.jasperreports - jasperreports-functions - 6.19.1 - - - - - joda-time - joda-time - 2.10.14 - - - - org.geotools - gt-epsg-hsql - ${geotools.version} - - - - org.geotools - gt-render - ${geotools.version} - - - - org.geotools - gt-coverage - ${geotools.version} - - - - org.geotools - gt-geojson - ${geotools.version} - - - - org.geotools - gt-geotiff - ${geotools.version} - - - - org.geotools - gt-wms - ${geotools.version} - - - - org.geotools - gt-svg - ${geotools.version} - - - - org.geotools - gt-cql - ${geotools.version} - - - - org.geotools.xsd - gt-xsd-gml3 - ${geotools.version} - - - - com.github.spotbugs - spotbugs-annotations - ${spotbugsVersion} - compile - - - - io.dropwizard.metrics - metrics-core - ${dropvizard.version} - - - - io.dropwizard.metrics - metrics-healthchecks - ${dropvizard.version} - - - - io.dropwizard.metrics - metrics-servlets - ${dropvizard.version} - - - - io.dropwizard.metrics - metrics-servlet - ${dropvizard.version} - - - - io.dropwizard.metrics - metrics-httpclient - ${dropvizard.version} - - - - io.dropwizard.metrics - metrics-jmx - ${dropvizard.version} - - - - io.dropwizard.metrics - metrics-logback - ${dropvizard.version} - - - - com.readytalk - metrics3-statsd - 4.2.0 - - - - commons-collections - commons-collections - 3.2.2 - - - - org.apache.commons - commons-collections4 - 4.4 - - - - net.sf.jasperreports - jasperreports - 6.19.1 - - - - - - org.springframework - spring-context - ${spring.version} - compile - - - org.springframework - spring-web - ${spring.version} - compile - - - org.springframework - spring-webmvc - ${spring.version} - compile - - - org.springframework.security - spring-security-config - ${spring-security.version} - compile - - - org.springframework.security - spring-security-web - ${spring-security.version} - compile - - - com.thetransactioncompany - cors-filter - 2.10 - compile - - - org.hibernate - hibernate-core - 5.6.9.Final - compile - - - org.postgresql - postgresql - 42.3.6 - compile - - - com.vladmihalcea - hibernate-types-52 - 2.16.2 - compile - - - com.mchange - c3p0 - 0.9.5.5 - compile - - - org.springframework - spring-orm - ${spring.version} - compile - - - org.springframework - spring-jdbc - ${spring.version} - compile - - - org.springframework - spring-tx - ${spring.version} - compile - - - org.springframework - spring-test - ${spring.version} - compile - - - com.google.guava - guava - 30.1.1-jre - compile - - - org.slf4j - slf4j-api - 1.7.36 - compile - - - org.slf4j - jcl-over-slf4j - 1.7.36 - compile - - - org.slf4j - jul-to-slf4j - 1.7.36 - compile - - - ch.qos.logback - logback-classic - 1.2.11 - compile - - - ch.qos.logback - logback-access - 1.2.11 - compile - - - org.json - json - 20220320 - compile - - - org.yaml - snakeyaml - 1.30 - compile - - - com.github.spullara.cli-parser - cli-parser - 1.1.6 - compile - - - org.apache.httpcomponents - httpclient - 4.5.13 - compile - - - com.sun.mail - javax.mail - 1.6.2 - compile - - - com.amazonaws - aws-java-sdk-s3 - 1.12.230 - compile - - - com.adobe.xmp - xmpcore - 6.1.11 - compile - - - io.sentry - sentry-logback - 5.7.4 - compile - - - net.logstash.logback - logstash-logback-encoder - 7.2 - compile - - - org.apache.xmlgraphics - xmlgraphics-commons - 2.7 - compile - - - org.apache.xmlgraphics - batik-transcoder - 1.14 - compile - - - xml-apis - xml-apis - - - - - - org.apache.xmlgraphics - batik-bridge - 1.14 - compile - - - xml-apis - xml-apis - - - - - - org.apache.xmlgraphics - batik-codec - 1.14 - compile - - - org.apache.xmlgraphics - batik-svg-dom - 1.14 - compile - - - xml-apis - xml-apis - - - - - - - javax.servlet - javax.servlet-api - 4.0.1 - provided - - - junit - junit - 4.13.2 - test - - - org.mockito - mockito-core - 3.9.0 - test - - - de.saly - javamail-mock2-fullmock - 0.5-beta4 - test - - + + + + ar.com.fdvs + DynamicJasper + 5.3.4 + + + + net.sf.jasperreports + jasperreports-fonts + 6.19.1 + + + + net.sf.jasperreports + jasperreports-functions + 6.19.1 + + + + joda-time + joda-time + 2.10.14 + + + + org.geotools + gt-epsg-hsql + ${geotools.version} + + + + org.geotools + gt-render + ${geotools.version} + + + + org.geotools + gt-coverage + ${geotools.version} + + + + org.geotools + gt-geojson + ${geotools.version} + + + + org.geotools + gt-geotiff + ${geotools.version} + + + + org.geotools + gt-wms + ${geotools.version} + + + + org.geotools + gt-svg + ${geotools.version} + + + + org.geotools + gt-cql + ${geotools.version} + + + + org.geotools.xsd + gt-xsd-gml3 + ${geotools.version} + + + + com.github.spotbugs + spotbugs-annotations + ${spotbugsVersion} + compile + + + + io.dropwizard.metrics + metrics-core + ${dropvizard.version} + + + + io.dropwizard.metrics + metrics-healthchecks + ${dropvizard.version} + + + + io.dropwizard.metrics + metrics-servlets + ${dropvizard.version} + + + + io.dropwizard.metrics + metrics-servlet + ${dropvizard.version} + + + + io.dropwizard.metrics + metrics-httpclient + ${dropvizard.version} + + + + io.dropwizard.metrics + metrics-jmx + ${dropvizard.version} + + + + io.dropwizard.metrics + metrics-logback + ${dropvizard.version} + + + + com.readytalk + metrics3-statsd + 4.2.0 + + + + commons-collections + commons-collections + 3.2.2 + + + + org.apache.commons + commons-collections4 + 4.4 + + + + net.sf.jasperreports + jasperreports + 6.19.1 + + + + org.springframework + spring-context + ${spring.version} + compile + + + org.springframework + spring-web + ${spring.version} + compile + + + + org.springframework + spring-webmvc + ${spring.version} + compile + + + + org.springframework.security + spring-security-config + ${spring-security.version} + compile + + + + org.springframework.security + spring-security-web + ${spring-security.version} + compile + + + + com.thetransactioncompany + cors-filter + 2.10 + compile + + + + org.hibernate + hibernate-core + 5.6.9.Final + compile + + + + org.postgresql + postgresql + 42.3.6 + compile + + + + com.vladmihalcea + hibernate-types-52 + 2.16.2 + compile + + + + com.mchange + c3p0 + 0.9.5.5 + compile + + + + org.springframework + spring-orm + ${spring.version} + compile + + + + org.springframework + spring-jdbc + ${spring.version} + compile + + + + org.springframework + spring-tx + ${spring.version} + compile + + + + org.springframework + spring-test + ${spring.version} + compile + + + + com.google.guava + guava + 30.1.1-jre + compile + + + + org.slf4j + slf4j-api + 1.7.36 + compile + + + + org.slf4j + jcl-over-slf4j + 1.7.36 + compile + + + + org.slf4j + jul-to-slf4j + 1.7.36 + compile + + + + ch.qos.logback + logback-classic + 1.2.11 + compile + + + + ch.qos.logback + logback-access + 1.2.11 + compile + + + + org.json + json + 20220320 + compile + + + + org.yaml + snakeyaml + 1.30 + compile + + + + com.github.spullara.cli-parser + cli-parser + 1.1.6 + compile + + + + org.apache.httpcomponents + httpclient + 4.5.13 + compile + + + + com.sun.mail + javax.mail + 1.6.2 + compile + + + + com.amazonaws + aws-java-sdk-s3 + 1.12.230 + compile + + + + com.adobe.xmp + xmpcore + 6.1.11 + compile + + + + io.sentry + sentry-logback + 5.7.4 + compile + + + + net.logstash.logback + logstash-logback-encoder + 7.2 + compile + + + + org.apache.xmlgraphics + xmlgraphics-commons + 2.7 + compile + + + + org.apache.xmlgraphics + batik-transcoder + 1.14 + compile + + + xml-apis + xml-apis + + + + + + + org.apache.xmlgraphics + batik-bridge + 1.14 + compile + + + xml-apis + xml-apis + + + + + + + org.apache.xmlgraphics + batik-codec + 1.14 + compile + + + + org.apache.xmlgraphics + batik-svg-dom + 1.14 + compile + + + xml-apis + xml-apis + + + + + + + javax.servlet + javax.servlet-api + 4.0.1 + provided + + + + junit + junit + 4.13.2 + test + + + + org.mockito + mockito-core + 3.9.0 + test + + + + de.saly + javamail-mock2-fullmock + 0.5-beta4 + test + + From 69aa460bfab0718897c73d684fc0f0b0ef0296c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 29 Jun 2022 10:00:07 +0200 Subject: [PATCH 25/26] reformat, remove double-versions. --- core/pom.xml | 152 +++++++++++++-------------------------------------- 1 file changed, 39 insertions(+), 113 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 5b3d22f1cc..80c4fc75c4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.mapfish.print print-lib jar @@ -15,57 +14,10 @@ 3.29.0-SNAPSHOT - - - - 11 - 11 - UTF-8 - - 26.4 - 5.3.20 - 5.7.1 - 1.14 - 4.6.0 - - - - - osgeo-release - OSGeo Repository - https://repo.osgeo.org/repository/release/ - - - - - - false - - - true - - - - - - readytalk - Spring Plugins - https://artifactory.georchestra.org/artifactory/bintray-readytalk-cache/ - - false - - - true - - - - - - + com.fasterxml.jackson.dataformat jackson-dataformat-xml @@ -75,322 +27,297 @@ ar.com.fdvs DynamicJasper - 5.3.4 org.geotools gt-epsg-hsql - ${geotools.version} org.geotools gt-render - ${geotools.version} org.geotools gt-coverage - ${geotools.version} org.geotools gt-geojson - ${geotools.version} org.geotools gt-geotiff - ${geotools.version} org.geotools gt-wms - ${geotools.version} org.geotools gt-svg - ${geotools.version} org.geotools gt-cql - ${geotools.version} org.geotools.xsd gt-xsd-gml3 - ${geotools.version} com.github.spotbugs spotbugs-annotations - ${spotbugsVersion} compile io.dropwizard.metrics metrics-core - 4.1.19 io.dropwizard.metrics metrics-healthchecks - 4.1.19 io.dropwizard.metrics metrics-servlets - 4.1.19 io.dropwizard.metrics metrics-servlet - 4.1.19 io.dropwizard.metrics metrics-httpclient - 4.1.19 io.dropwizard.metrics metrics-jmx - 4.1.19 io.dropwizard.metrics metrics-logback - 4.1.19 com.readytalk metrics3-statsd - 4.2.0 commons-collections commons-collections - 3.2.2 org.apache.commons commons-collections4 - 4.4 net.sf.jasperreports jasperreports - 6.19.1 - - org.springframework spring-context - ${spring.version} compile + org.springframework spring-web - ${spring.version} compile + org.springframework spring-webmvc - ${spring.version} compile + org.springframework.security spring-security-config - ${spring-security.version} compile + org.springframework.security spring-security-web - ${spring-security.version} compile + com.thetransactioncompany cors-filter - 2.10 compile + org.hibernate hibernate-core - 5.6.9.Final compile + org.postgresql postgresql - 42.3.5 compile + com.vladmihalcea hibernate-types-52 - 2.10.4 compile + com.mchange c3p0 - 0.9.5.5 compile + org.springframework spring-orm - ${spring.version} compile + org.springframework spring-jdbc - ${spring.version} compile + org.springframework spring-tx - ${spring.version} compile + org.springframework spring-test - ${spring.version} compile + com.google.guava guava - 30.1.1-jre compile + org.slf4j slf4j-api - 1.7.30 compile + org.slf4j jcl-over-slf4j - 1.7.30 compile + org.slf4j jul-to-slf4j - 1.7.30 compile + ch.qos.logback logback-classic - 1.2.3 compile + ch.qos.logback logback-access - 1.2.3 compile + org.json json - 20210307 compile + org.yaml snakeyaml - 1.28 compile + com.github.spullara.cli-parser cli-parser - 1.1.5 compile + org.apache.httpcomponents httpclient - 4.5.13 compile + com.sun.mail javax.mail - 1.6.2 compile + com.amazonaws aws-java-sdk-s3 - 1.11.1000 compile + com.adobe.xmp xmpcore - 6.1.11 compile + io.sentry sentry-logback - 4.3.0 compile + net.logstash.logback logstash-logback-encoder - 6.6 compile + org.apache.xmlgraphics xmlgraphics-commons - 2.6 compile + org.apache.xmlgraphics batik-transcoder - 1.14 compile @@ -400,10 +327,10 @@ + org.apache.xmlgraphics batik-bridge - 1.14 compile @@ -413,16 +340,16 @@ + org.apache.xmlgraphics batik-codec - 1.14 compile + org.apache.xmlgraphics batik-svg-dom - 1.14 compile @@ -431,30 +358,29 @@ - + javax.servlet javax.servlet-api - 4.0.1 provided + junit junit - 4.13.2 test + org.mockito mockito-core - 3.9.0 test + de.saly javamail-mock2-fullmock - 0.5-beta4 test From bdacc892218f502326bb540116815cfcaaa42692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 29 Jun 2022 10:00:45 +0200 Subject: [PATCH 26/26] reformat, remove double-versions. --- servlet/pom.xml | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/servlet/pom.xml b/servlet/pom.xml index f0a48db248..fd7c377aff 100644 --- a/servlet/pom.xml +++ b/servlet/pom.xml @@ -5,7 +5,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.mapfish.print print-servlet war @@ -15,53 +14,6 @@ 3.29.0-SNAPSHOT - - - - 11 - 11 - UTF-8 - - 26.4 - 5.3.20 - 5.7.1 - 1.14 - 4.6.0 - - - - - osgeo-release - OSGeo Repository - https://repo.osgeo.org/repository/release/ - - - - - - false - - - true - - - - - - readytalk - Spring Plugins - https://artifactory.georchestra.org/artifactory/bintray-readytalk-cache/ - - false - - - true - - - - - org.mapfish.print