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

Upgrade Gradle, Java, Tomcat and SpotBugs #1530

Merged
merged 1 commit into from
Oct 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions BREAKING-CHANGES.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand All @@ -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'
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion checkstyle_checks.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions core/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/*

Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down