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

Add canoeing layer test currently failing with tomcat on JDK 17 #2999

Merged
merged 6 commits into from
Aug 2, 2023
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
1 change: 0 additions & 1 deletion BREAKING-CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
## Version 3.30

- Add support of MapServer 8.0, remove support of MapServer <= 7.4 (MAP_ANGLE => ANGLE).
- Upgrade to Java 17.

## Version 3.26

Expand Down
2 changes: 1 addition & 1 deletion core/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM mapfish_print_builder AS builder

FROM tomcat:9.0.62-jdk17-openjdk-slim-bullseye AS runner
FROM tomcat:9.0.78-jdk11-temurin-jammy AS runner
LABEL maintainer="Camptocamp <info@camptocamp.com>"

RUN --mount=type=cache,target=/var/cache,sharing=locked \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,12 @@ private ClientHttpResponse fetchWithRetry() throws IOException, InterruptedExcep
} catch (final IOException e) {
if (counter.incrementAndGet() < HttpRequestFetcher.this.maxNumberFetchRetry) {
TimeUnit.MILLISECONDS.sleep(HttpRequestFetcher.this.fetchRetryIntervalMillis);
LOGGER.debug("Fetching URI {} failed. Retrying.", this.originalRequest.getURI());
} else {
LOGGER.debug("Fetching failed after {}", this.originalRequest.getURI());
LOGGER.debug(
"Fetching URI {} failed after {} attempts.",
this.originalRequest.getURI(),
HttpRequestFetcher.this.maxNumberFetchRetry);
throw e;
}
}
Expand Down
7 changes: 7 additions & 0 deletions docker-compose.override.sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,10 @@ services:
- 5005:5005
environment:
JAVA_OPTS: -Dsun.net.inetaddr.ttl=30 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005

tests:
environment:
JAVA_OPTS: -Dsun.net.inetaddr.ttl=30 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
ports:
# Forward the port for Java remote debugging defined in the JAVA_OPTS environment variable
- 5006:5005
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.1.1.final using JasperReports Library version 6.1.1 -->
<!-- 2017-05-08T10:59:01 -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="803" leftMargin="39" rightMargin="0" topMargin="17" bottomMargin="0" uuid="9a3e59f5-6675-48cf-ad74-9c42b5a5b290">
<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/>
<property name="com.jaspersoft.studio.unit." value="mm"/>
<property name="com.jaspersoft.studio.unit.pageHeight" value="mm"/>
<property name="com.jaspersoft.studio.unit.pageWidth" value="mm"/>
<property name="com.jaspersoft.studio.unit.topMargin" value="mm"/>
<property name="com.jaspersoft.studio.unit.bottomMargin" value="mm"/>
<property name="com.jaspersoft.studio.unit.leftMargin" value="mm"/>
<property name="com.jaspersoft.studio.unit.rightMargin" value="mm"/>
<property name="com.jaspersoft.studio.unit.columnWidth" value="mm"/>
<property name="com.jaspersoft.studio.unit.columnSpacing" value="mm"/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
<parameter name="mapSubReport" class="java.lang.String"/>
<parameter name="mapContext" class="org.mapfish.print.attribute.map.MapfishMapContext"/>
<detail>
<band height="482">
<property name="com.jaspersoft.studio.unit.height" value="mm"/>
<subreport>
<reportElement x="0" y="0" width="762" height="481" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d">
<property name="local_mesure_unitwidth" value="pixel"/>
<property name="local_mesure_unitheight" value="pixel"/>
<property name="com.jaspersoft.studio.unit.height" value="mm"/>
</reportElement>
<subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression>
</subreport>
</band>
</detail>
</jasperReport>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This folder tests if the image layer stored as base 64 can be printed.
Using jdk 17 the line is not generated but requestData-layer-base64 is not reporting a failed test.
Using jdk 17 the line is not generated, so we use 2 layers requestData-2layers-base64 to report a failed test.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
throwErrorOnExtraParameters: true
defaultToSvg: true

templates:
# ==========================
# LANDSCAPE Templates
# ==========================
# --------------------------
A4 landscape: !template
# -------------------------
reportTemplate: A4_Landscape.jrxml
outputFilename: schweizmobilmap
attributes:
map: !map
maxDpi: 400
width: 762
height: 481

processors:
- !reportBuilder
directory: '.'
- !createMap {}
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.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading