diff --git a/pom.xml b/pom.xml
index fe30c53..a26bcb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,18 +55,17 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
 
     <!-- Versions - Third-party libraries -->
-    <version.antlr4>4.9.3</version.antlr4>
+    <version.antlr4>4.13.1</version.antlr4>
     <version.commons-collections>3.2.2</version.commons-collections>
     <version.commons-io>2.11.0</version.commons-io>
     <version.commons-lang3>3.12.0</version.commons-lang3>
     <version.jackson>2.15.1</version.jackson>
+    <version.jaxb-impl>4.0.4</version.jaxb-impl>
     <version.jool>0.9.15</version.jool>
-    <version.jsr305>3.0.2</version.jsr305>
     <version.junit>5.7.2</version.junit>
-    <version.logback>1.4.14</version.logback>
     <version.maven>3.8.6</version.maven>
-    <version.ph>10.0.0</version.ph>
-    <version.ph-genericode>6.2.0</version.ph-genericode>
+    <version.ph-jaxb>11.1.3</version.ph-jaxb>
+    <version.ph-genericode>7.1.1</version.ph-genericode>
     <version.reflections>0.10.2</version.reflections>
     <version.resolver>1.8.2</version.resolver>
     <version.semver4j>3.1.0</version.semver4j>
@@ -81,7 +80,7 @@
     <version.javadoc.plugin>3.4.0</version.javadoc.plugin>
     <version.source.plugin>3.2.1</version.source.plugin>
     <version.jar.plugin>3.3.0</version.jar.plugin>
-    <version.surefire.plugin>3.0.0-M7</version.surefire.plugin> <!-- Versions prior to 3.0.x do not pick up Junit 5 tests correctly. -->
+    <version.surefire.plugin>3.2.5</version.surefire.plugin>
     <version.nexus-staging.plugin>1.6.7</version.nexus-staging.plugin>
   </properties>
 
@@ -179,10 +178,16 @@
       </dependency>
 
       <!-- PH -->
+      <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <version>${version.jaxb-impl}</version>
+        <scope>runtime</scope>
+      </dependency>
       <dependency>
         <groupId>com.helger.commons</groupId>
-        <artifactId>ph-commons</artifactId>
-        <version>${version.ph}</version>
+        <artifactId>ph-jaxb</artifactId>
+        <version>${version.ph-jaxb}</version>
       </dependency>
       <dependency>
         <!-- For genericode .gc files (SDK codelist related) -->
@@ -199,21 +204,6 @@
       </dependency>
 
       <!-- Other -->
-      <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-classic</artifactId>
-        <version>${version.logback}</version>
-      </dependency>
-      <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-core</artifactId>
-        <version>${version.logback}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.code.findbugs</groupId>
-        <artifactId>jsr305</artifactId>
-        <version>${version.jsr305}</version>
-      </dependency>
       <dependency>
         <groupId>org.antlr</groupId>
         <artifactId>antlr4-runtime</artifactId>
@@ -320,9 +310,13 @@
     </dependency>
 
     <!-- PH -->
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.helger.commons</groupId>
-      <artifactId>ph-commons</artifactId>
+      <artifactId>ph-jaxb</artifactId>
     </dependency>
     <dependency>
       <!-- For genericode .gc files (SDK codelist related) -->
@@ -331,21 +325,6 @@
     </dependency>
 
     <!-- Other -->
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr4-runtime</artifactId>