Skip to content

Commit c9d3adf

Browse files
jodygarnettjodygarnett
committed
sync versions for GeoTools 34.0 bill-of-materials, and geoserver 2.28.0 release
1 parent 731d2bd commit c9d3adf

File tree

4 files changed

+37
-77
lines changed

4 files changed

+37
-77
lines changed

‎ReleaseNotes.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Mapfish Print 2 Release notes
22

3+
## Release 2.4.0
4+
5+
Release notes:
6+
7+
* Java 17 minium
8+
* GeoTools 34.0
9+
* Use GeoTools bill-of-materials to manage dependencies
10+
* ImageN 0.9.0
11+
* jackson dataformat 2.19.0
12+
* guava 33.4.8-jre
13+
* Xalan 2.7.3
14+
315
## Release 2.4-M0
416

517
Release notes:

‎pom.xml‎

Lines changed: 23 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -38,105 +38,58 @@
3838

3939
<properties>
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41-
<log4j-version>2.24.3</log4j-version>
42-
<spring-version>5.3.39</spring-version>
43-
<gt-version>34-SNAPSHOT</gt-version>
44-
<imagen.version>0.9.0-SNAPSHOT</imagen.version>
45-
<pdfbox-version>2.0.34</pdfbox-version>
41+
<!--log4j-version>2.24.3</log4j-version-->
42+
<spring.version>5.3.39</spring.version>
43+
<gt.version>34.0</gt.version>
44+
<imagen.version>0.9.0</imagen.version> <!-- sync with gt-platform-dependences -->
45+
<pdfbox.version>2.0.34</pdfbox.version>
4646
<metrics-version>4.2.30</metrics-version>
47-
<jackson2.version>2.18.2</jackson2.version>
47+
<!--jackson2.version>2.18.2</jackson2.version-->
4848
<fork.javac>true</fork.javac>
4949
<javac.maxHeapSize>512m</javac.maxHeapSize>
5050
</properties>
5151

5252
<dependencyManagement>
5353
<dependencies>
5454
<dependency>
55-
<groupId>org.apache.httpcomponents</groupId>
56-
<artifactId>httpclient</artifactId>
57-
<version>4.5.13</version>
58-
</dependency>
59-
<dependency>
60-
<groupId>org.apache.logging.log4j</groupId>
61-
<artifactId>log4j-core</artifactId>
62-
<version>${log4j-version}</version>
63-
</dependency>
64-
<dependency>
65-
<groupId>org.apache.logging.log4j</groupId>
66-
<artifactId>log4j-api</artifactId>
67-
<version>${log4j-version}</version>
55+
<groupId>org.geotools</groupId>
56+
<artifactId>gt-bom</artifactId>
57+
<version>${gt.version}</version>
58+
<type>pom</type>
59+
<scope>import</scope>
6860
</dependency>
6961
<dependency>
70-
<groupId>org.apache.logging.log4j</groupId>
71-
<artifactId>log4j-slf4j-impl</artifactId>
72-
<version>${log4j-version}</version>
62+
<groupId>org.geotools</groupId>
63+
<artifactId>gt-platform-dependencies</artifactId>
64+
<version>${gt.version}</version>
65+
<type>pom</type>
66+
<scope>import</scope>
7367
</dependency>
7468
<dependency>
7569
<groupId>org.springframework</groupId>
7670
<artifactId>spring-context</artifactId>
77-
<version>${spring-version}</version>
71+
<version>${spring.version}</version>
7872
</dependency>
7973
<dependency>
8074
<groupId>org.springframework</groupId>
8175
<artifactId>spring-web</artifactId>
82-
<version>${spring-version}</version>
83-
</dependency>
84-
<dependency>
85-
<groupId>org.geotools</groupId>
86-
<artifactId>gt-epsg-hsql</artifactId>
87-
<version>${gt-version}</version>
88-
</dependency>
89-
<dependency>
90-
<groupId>org.geotools</groupId>
91-
<artifactId>gt-render</artifactId>
92-
<version>${gt-version}</version>
93-
</dependency>
94-
<dependency>
95-
<groupId>com.fasterxml.jackson.core</groupId>
96-
<artifactId>jackson-databind</artifactId>
97-
<version>${jackson2.version}</version>
98-
</dependency>
99-
<dependency>
100-
<groupId>com.fasterxml.jackson.annotations</groupId>
101-
<artifactId>jackson-databind</artifactId>
102-
<version>${jackson2.version}</version>
103-
</dependency>
104-
<dependency>
105-
<groupId>com.fasterxml.jackson.dataformat</groupId>
106-
<artifactId>jackson-dataformat-yaml</artifactId>
107-
<version>${jackson2.version}</version>
76+
<version>${spring.version}</version>
10877
</dependency>
10978
<!-- transitive dependency -->
110-
<dependency>
111-
<groupId>org.locationtech.jts</groupId>
112-
<artifactId>jts-core</artifactId>
113-
<version>1.19.0</version>
114-
<exclusions>
115-
<exclusion>
116-
<groupId>xerces</groupId>
117-
<artifactId>xercesImpl</artifactId>
118-
</exclusion>
119-
</exclusions>
120-
</dependency>
12179
<dependency>
12280
<groupId>javax.servlet</groupId>
12381
<artifactId>servlet-api</artifactId>
12482
<version>2.5</version>
12583
</dependency>
126-
<dependency>
127-
<groupId>com.google.guava</groupId>
128-
<artifactId>guava</artifactId>
129-
<version>15.0</version>
130-
</dependency>
13184
<dependency>
13285
<groupId>org.apache.pdfbox</groupId>
13386
<artifactId>pdfbox</artifactId>
134-
<version>${pdfbox-version}</version>
87+
<version>${pdfbox.version}</version>
13588
</dependency>
13689
<dependency>
13790
<groupId>org.apache.pdfbox</groupId>
13891
<artifactId>pdfbox-tools</artifactId>
139-
<version>${pdfbox-version}</version>
92+
<version>${pdfbox.version}</version>
14093
</dependency>
14194
<dependency>
14295
<groupId>commons-httpclient</groupId>
@@ -146,17 +99,12 @@
14699
<dependency>
147100
<groupId>org.mockito</groupId>
148101
<artifactId>mockito-core</artifactId>
149-
<version>1.9.5</version>
150-
</dependency>
151-
<dependency>
152-
<groupId>org.apache.xmlgraphics</groupId>
153-
<artifactId>batik-transcoder</artifactId>
154-
<version>1.7</version>
102+
<version>5.15.2</version>
155103
</dependency>
156104
<dependency>
157105
<groupId>xerces</groupId>
158106
<artifactId>xercesImpl</artifactId>
159-
<version>2.7.1</version>
107+
<version>2.12.2</version>
160108
</dependency>
161109
<dependency>
162110
<groupId>com.github.librepdf</groupId>
@@ -182,7 +130,7 @@
182130
<dependency>
183131
<groupId>xalan</groupId>
184132
<artifactId>xalan</artifactId>
185-
<version>2.7.0</version>
133+
<version>2.7.3</version>
186134
</dependency>
187135
<dependency>
188136
<groupId>io.dropwizard.metrics</groupId>

‎src/main/java/org/mapfish/print/PDFUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
import com.lowagie.text.pdf.PdfPTable;
4141
import com.lowagie.text.pdf.PdfTemplate;
4242

43+
import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
4344
import org.apache.batik.bridge.BridgeContext;
4445
import org.apache.batik.bridge.DocumentLoader;
4546
import org.apache.batik.bridge.GVTBuilder;
4647
import org.apache.batik.bridge.UserAgent;
4748
import org.apache.batik.bridge.UserAgentAdapter;
48-
import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
4949
import org.apache.batik.dom.svg.SVGDocumentFactory;
5050
import java.io.ByteArrayOutputStream;
5151
import org.apache.batik.gvt.GraphicsNode;

‎src/test/java/org/mapfish/print/map/renderers/vector/LabelRendererTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import java.awt.geom.AffineTransform;
3434
import java.io.FileNotFoundException;
3535

36-
import static org.mockito.Matchers.any;
36+
import static org.mockito.Mockito.any;
3737
import static org.mockito.Mockito.times;
3838
import static org.mockito.Mockito.verify;
3939

0 commit comments

Comments
 (0)