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 geotools to 30.3 #3541

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
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
16 changes: 8 additions & 8 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,14 @@ dependencies {
'io.dropwizard.metrics:metrics-logback:4.2.29',
)
geotools(
'org.geotools:gt-epsg-hsql:30.2',
'org.geotools:gt-render:30.2',
'org.geotools:gt-geojson:30.2',
'org.geotools:gt-geotiff:30.2',
'org.geotools:gt-wms:30.2',
'org.geotools.xsd:gt-xsd-gml3:30.2',
'org.geotools:gt-svg:30.2',
'org.geotools:gt-cql:30.2',
'org.geotools:gt-epsg-hsql:30.3',
'org.geotools:gt-render:30.3',
'org.geotools:gt-geojson:30.3',
'org.geotools:gt-geotiff:30.3',
'org.geotools:gt-wms:30.3',
'org.geotools.xsd:gt-xsd-gml3:30.3',
'org.geotools:gt-svg:30.3',
'org.geotools:gt-cql:30.3',
)
jasper(
'net.sf.jasperreports:jasperreports:6.21.4',
Expand Down
11 changes: 5 additions & 6 deletions examples/src/test/java/org/mapfish/print/ExamplesTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
import java.net.URL;
import java.net.URLConnection;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.TreeMap;
import java.util.regex.Pattern;
import javax.imageio.ImageIO;
import org.apache.commons.io.IOUtils;
Expand Down Expand Up @@ -202,7 +202,7 @@ public void testExampleDirectoryNames() {

@Test
public void testAllExamples() {
Map<String, Throwable> errors = new HashMap<>();
Map<String, Throwable> errors = new TreeMap<>();

int testsRan = 0;
final File examplesDir = getFile(ExamplesTest.class, "/examples");
Expand Down Expand Up @@ -304,7 +304,7 @@ private int runExample(File example, Map<String, Throwable> errors) {
compareImages(errors, http.getInputStream(), example, requestFile, outputFormat);
}
}
} catch (RuntimeException e) {
} catch (IOException | AssertionError | RuntimeException e) {
errors.put(String.format("%s (%s)", example.getName(), requestFile.getName()), e);
}
}
Expand All @@ -329,7 +329,7 @@ private void compareImages(
if (!expectedOutput.exists()) {
errors.put(
example.getName() + " (" + requestFile.getName() + ")",
new Exception("File not found: " + expectedOutput.toString()));
new Exception("File not found: " + expectedOutput));
}

if (!"bmp".equals(outputFormat)) {
Expand All @@ -345,8 +345,7 @@ private void pdfaValidate(
String exampleName,
String requestFileName) {
PDFAFlavour flavour = PDFAFlavour.PDFA_1_A;
PDFAValidator validator = ValidatorFactory.createValidator(flavour, false);
try {
try (PDFAValidator validator = ValidatorFactory.createValidator(flavour, false)) {
GFModelParser parser = GFModelParser.createModelWithFlavour(http.getInputStream(), flavour);
ValidationResult result = validator.validate(parser);
LOGGER.warn("Example {} is PDF/A conform: {}", exampleName, result.isCompliant());
Expand Down
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