Skip to content

Commit e9beb19

Browse files
committed
Merge branch 'master' into GSMFP-45-2
2 parents fbb015f + 430cf17 commit e9beb19

File tree

4 files changed

+19
-18
lines changed

4 files changed

+19
-18
lines changed

.github/renovate.json5

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
extends: [
3-
'github>camptocamp/gs-renovate-config-preset:base.json5#1.2.3',
4-
'github>camptocamp/gs-renovate-config-preset:group.json5#1.2.3',
5-
'github>camptocamp/gs-renovate-config-preset:ci.json5#1.2.3',
6-
'github>camptocamp/gs-renovate-config-preset:preset.json5#1.2.3',
7-
'github>camptocamp/gs-renovate-config-preset:pre-commit.json5#1.2.3',
8-
'github>camptocamp/gs-renovate-config-preset:docker.json5#1.2.3',
9-
'github>camptocamp/gs-renovate-config-preset:json-schema.json5#1.2.3',
10-
'github>camptocamp/gs-renovate-config-preset:shellcheck.json5#1.2.3',
11-
'github>camptocamp/gs-renovate-config-preset:python.json5#1.2.3',
12-
'github>camptocamp/gs-renovate-config-preset:stabilization-branches.json5#1.2.3',
13-
'github>camptocamp/gs-renovate-config-preset:own.json5#1.2.3',
14-
'github>camptocamp/gs-renovate-config-preset:security.json5#1.2.3',
3+
'github>camptocamp/gs-renovate-config-preset:base.json5#1.3.2',
4+
'github>camptocamp/gs-renovate-config-preset:group.json5#1.3.2',
5+
'github>camptocamp/gs-renovate-config-preset:ci.json5#1.3.2',
6+
'github>camptocamp/gs-renovate-config-preset:preset.json5#1.3.2',
7+
'github>camptocamp/gs-renovate-config-preset:pre-commit.json5#1.3.2',
8+
'github>camptocamp/gs-renovate-config-preset:docker.json5#1.3.2',
9+
'github>camptocamp/gs-renovate-config-preset:json-schema.json5#1.3.2',
10+
'github>camptocamp/gs-renovate-config-preset:shellcheck.json5#1.3.2',
11+
'github>camptocamp/gs-renovate-config-preset:python.json5#1.3.2',
12+
'github>camptocamp/gs-renovate-config-preset:stabilization-branches.json5#1.3.2',
13+
'github>camptocamp/gs-renovate-config-preset:own.json5#1.3.2',
14+
'github>camptocamp/gs-renovate-config-preset:security.json5#1.3.2',
1515
],
1616
baseBranches: ['3.28', '3.29', '3.30', '3.31', 'master'],
1717
customManagers: [

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
3-
rev: v2.14.0
3+
rev: v2.15.0
44
hooks:
55
- id: pretty-format-java
66
args:
@@ -29,10 +29,10 @@ repos:
2929
hooks:
3030
- id: canonicalize
3131
- repo: https://github.com/astral-sh/ruff-pre-commit
32-
rev: v0.11.8
32+
rev: v0.12.1
3333
hooks:
3434
- id: ruff-format
3535
- repo: https://github.com/sbrunner/python-versions-hook
36-
rev: 1.0.0
36+
rev: 1.1.2
3737
hooks:
3838
- id: python-versions

core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,8 @@ private Tile handleNonOkStatus(final ClientHttpResponse response, final String b
296296
Status message: {}
297297
Server:{}
298298
Body:
299-
{}""",
299+
{}\
300+
""",
300301
this.tileRequest.getURI(),
301302
httpStatusCode,
302303
response.getStatusText(),

core/src/main/java/org/mapfish/print/output/JRPdfExporterWeakHashMap.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import java.util.WeakHashMap;
44
import net.sf.jasperreports.engine.JasperReportsContext;
5+
import net.sf.jasperreports.engine.export.JRPdfExporter;
56
import net.sf.jasperreports.engine.util.ExifOrientationEnum;
67
import net.sf.jasperreports.engine.util.Pair;
7-
import net.sf.jasperreports.pdf.JRPdfExporter;
8-
import net.sf.jasperreports.pdf.common.PdfImage;
8+
import net.sf.jasperreports.export.pdf.PdfImage;
99

1010
public class JRPdfExporterWeakHashMap extends JRPdfExporter {
1111

0 commit comments

Comments
 (0)