Skip to content

sync versions for GeoTools 34.0 bill-of-materials, and GeoServer 2.28.0 release #40

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.

Sign up for GitHub

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

Merged
jodygarnett merged 1 commit into from
Oct 12, 2025
Merged

sync versions for GeoTools 34.0 bill-of-materials, and GeoServer 2.28.0 release #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions ReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Mapfish Print 2 Release notes

## Release 2.4.0

Release notes:

* Java 17 minium
* GeoTools 34.0
* Use GeoTools bill-of-materials to manage dependencies
* ImageN 0.9.0
* jackson dataformat 2.19.0
* guava 33.4.8-jre
* Xalan 2.7.3

## Release 2.4-M0

Release notes:
Expand Down
94 changes: 21 additions & 73 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,105 +38,58 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<log4j-version>2.24.3</log4j-version>
<spring-version>5.3.39</spring-version>
<gt-version>34-SNAPSHOT</gt-version>
<imagen.version>0.9.0-SNAPSHOT</imagen.version>
<pdfbox-version>2.0.34</pdfbox-version>
<!--log4j-version>2.24.3</log4j-version-->
<spring.version>5.3.39</spring.version>
<gt.version>34.0</gt.version>
<imagen.version>0.9.0</imagen.version> <!-- sync with gt-platform-dependences -->
<pdfbox.version>2.0.34</pdfbox.version>
<metrics-version>4.2.30</metrics-version>
<jackson2.version>2.18.2</jackson2.version>
<!--jackson2.version>2.18.2</jackson2.version-->
<fork.javac>true</fork.javac>
<javac.maxHeapSize>512m</javac.maxHeapSize>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j-version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j-version}</version>
<groupId>org.geotools</groupId>
<artifactId>gt-bom</artifactId>
<version>${gt.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j-version}</version>
<groupId>org.geotools</groupId>
<artifactId>gt-platform-dependencies</artifactId>
<version>${gt.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring-version}</version>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring-version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-epsg-hsql</artifactId>
<version>${gt-version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-render</artifactId>
<version>${gt-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson2.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.annotations</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson2.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson2.version}</version>
<version>${spring.version}</version>
</dependency>
<!-- transitive dependency -->
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.19.0</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>15.0</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>${pdfbox-version}</version>
<version>${pdfbox.version}</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox-tools</artifactId>
<version>${pdfbox-version}</version>
<version>${pdfbox.version}</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
Expand All @@ -146,12 +99,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-transcoder</artifactId>
<version>1.7</version>
<version>5.15.2</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/mapfish/print/PDFUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@
import com.lowagie.text.pdf.PdfPTable;
import com.lowagie.text.pdf.PdfTemplate;

import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.DocumentLoader;
import org.apache.batik.bridge.GVTBuilder;
import org.apache.batik.bridge.UserAgent;
import org.apache.batik.bridge.UserAgentAdapter;
import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
import org.apache.batik.dom.svg.SVGDocumentFactory;
import java.io.ByteArrayOutputStream;
import org.apache.batik.gvt.GraphicsNode;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/mapfish/print/map/renderers/vector/LabelRendererTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import java.awt.geom.AffineTransform;
import java.io.FileNotFoundException;

import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

Expand Down