diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 160209e..7dd8f9a 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -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:
diff --git a/pom.xml b/pom.xml
index 50d6f5c..a9a1620 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,13 +38,13 @@
   
   <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>
@@ -52,91 +52,44 @@
   <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>
@@ -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>
diff --git a/src/main/java/org/mapfish/print/PDFUtils.java b/src/main/java/org/mapfish/print/PDFUtils.java
index 9410b65..778a04e 100644
--- a/src/main/java/org/mapfish/print/PDFUtils.java
+++ b/src/main/java/org/mapfish/print/PDFUtils.java
@@ -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;
diff --git a/src/test/java/org/mapfish/print/map/renderers/vector/LabelRendererTest.java b/src/test/java/org/mapfish/print/map/renderers/vector/LabelRendererTest.java
index 11c5e49..7d83c85 100644
--- a/src/test/java/org/mapfish/print/map/renderers/vector/LabelRendererTest.java
+++ b/src/test/java/org/mapfish/print/map/renderers/vector/LabelRendererTest.java
@@ -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;