diff --git a/BREAKING-CHANGES.md b/BREAKING-CHANGES.md
index 4040926129..0d41ec1e4f 100644
--- a/BREAKING-CHANGES.md
+++ b/BREAKING-CHANGES.md
@@ -1,5 +1,9 @@
# Known breaking changes
+## Version 3.26
+
+- Upgrade to Java 11 and Tomcat 9.0
+
## Version 3.25
- The allowTransparency property is renamed to pdfA. It is now also possible to pass that value
diff --git a/Dockerfile b/Dockerfile
index 855f70e59d..dfbe919b31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:5.5.1-jdk8 AS builder
+FROM gradle:6.6-jdk11 AS builder
RUN apt update
RUN apt install --yes fonts-liberation gettext curl
diff --git a/build.gradle b/build.gradle
index 44795a7d46..8a031cfe27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
}
dependencies {
- classpath "gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:2.0.0"
+ classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.5.1"
classpath "se.bjurr.violations:violations-gradle-plugin:1.47"
classpath 'org.owasp:dependency-check-gradle:6.0.2'
}
@@ -26,7 +26,7 @@ allprojects {
version = '3.25.0'
ext.junitVersion = "4.13.1"
ext.groovyVersion = "3.0.6"
- ext.spotbugVersion = '3.1.12'
+ ext.spotbugsVersion = '4.1.4'
ext.jasperreportVersion = "6.15.0"
apply plugin: 'org.owasp.dependencycheck'
@@ -76,7 +76,7 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) {
checkstyleTest.enabled = false
spotbugs {
- toolVersion = "${project.spotbugVersion}"
+ toolVersion = "${project.spotbugsVersion}"
ignoreFailures = true
reportsDir = file("$project.buildDir/reports/spotbugsReports")
effort = "max"
diff --git a/checkstyle_checks.xml b/checkstyle_checks.xml
index 97f70df8a9..f370ac8341 100644
--- a/checkstyle_checks.xml
+++ b/checkstyle_checks.xml
@@ -52,7 +52,7 @@
+ value="/^ar\./,/^ch\./,/^com\./,/^io\./,/^net\./,/^org\./,/^si\./,/^java\./,/^javax\./"/>
diff --git a/core/Dockerfile b/core/Dockerfile
index 9f722604a1..f0ff741912 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -1,12 +1,13 @@
FROM mapfish_print_builder AS builder
-FROM camptocamp/tomcat-logback:8.5-jre8 AS runner
+FROM camptocamp/tomcat-logback:9.0-jre11 AS runner
LABEL maintainer="info@camptocamp.com"
RUN \
apt-get update && \
- apt-get install --assume-yes --no-install-recommends fonts-liberation fonts-dejavu && \
+ apt-get install --assume-yes --no-install-recommends curl \
+ fonts-liberation fonts-dejavu libfreetype6 libfontconfig1 && \
apt-get clean && \
rm --recursive --force /var/lib/apt/lists/*
diff --git a/core/build.gradle b/core/build.gradle
index 514e810ef9..38e9572790 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -192,7 +192,7 @@ dependencies {
)
providedCompile('javax.servlet:javax.servlet-api:4.0.1')
- compileOnly "com.github.spotbugs:spotbugs-annotations:$project.spotbugVersion"
+ compileOnly "com.github.spotbugs:spotbugs-annotations:$project.spotbugsVersion"
testCompile group: 'de.saly', name: 'javamail-mock2-fullmock', version: '0.5-beta4'
}
diff --git a/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java b/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java
index 9a3d629c66..b252b01587 100644
--- a/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java
+++ b/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java
@@ -173,8 +173,7 @@ protected String getExpectedImageName(String classifier, String baseDir) {
} else if (fullVersion.startsWith("1.8")) {
javaVersion = 8;
} else {
- throw new RuntimeException(
- fullVersion + " is not yet supported in the tests. Update this switch");
+ javaVersion = Integer.parseInt(fullVersion);
}
String platformVersionName = "expectedSimpleImage" + classifier + "-" + normalizedOSName() +
diff --git a/core/src/test/java/org/mapfish/print/output/JasperReportSvgOutputFormatTest.java b/core/src/test/java/org/mapfish/print/output/JasperReportSvgOutputFormatTest.java
index 52cd030f4c..186abbcf3f 100644
--- a/core/src/test/java/org/mapfish/print/output/JasperReportSvgOutputFormatTest.java
+++ b/core/src/test/java/org/mapfish/print/output/JasperReportSvgOutputFormatTest.java
@@ -43,6 +43,6 @@ public void testPrint() throws Exception {
writer.close();
String expected = getFileContent(BASE_DIR + "expectedReport.svg");
- assertEquals(expected, outputStream.toString());
+ assertEquals(actual.toString(), expected, outputStream.toString());
}
}
diff --git a/core/src/test/resources/org/mapfish/print/output/simple_map/expectedReport.svg b/core/src/test/resources/org/mapfish/print/output/simple_map/expectedReport.svg
index 89242c83d1..3d20b11f47 100644
--- a/core/src/test/resources/org/mapfish/print/output/simple_map/expectedReport.svg
+++ b/core/src/test/resources/org/mapfish/print/output/simple_map/expectedReport.svg
@@ -35,31 +35,45 @@
>