Upgrade Gradle, Java, Tomcat and SpotBugs

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

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

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"

checkstyle_checks.xml

@@ -52,7 +52,7 @@
         <module name="UnusedImports"/>
         <module name="ImportOrder">
             <property name="groups"
-                      value="/^ar\./,/^ch\./,/^com\./,/^net\./,/^org\./,/^si\./,/^java\./,/^javax\./"/>
+                      value="/^ar\./,/^ch\./,/^com\./,/^io\./,/^net\./,/^org\./,/^si\./,/^java\./,/^javax\./"/>
             <property name="option" value="bottom"/>
             <property name="sortStaticImportsAlphabetically" value="true"/>
         </module>

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/*
 

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'
 }

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() +

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());
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

gradlew.bat

@@ -5,7 +5,7 @@
 @rem you may not use this file except in compliance with the License.
 @rem You may obtain a copy of the License at
 @rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem Unless required by applicable law or agreed to in writing, software
 @rem distributed under the License is distributed on an "AS IS" BASIS,