diff --git a/cms-test-commons/pom.xml b/cms-test-commons/pom.xml
index 340eb5b..d410134 100644
--- a/cms-test-commons/pom.xml
+++ b/cms-test-commons/pom.xml
@@ -114,6 +114,30 @@
             <artifactId>log4j-slf4j18-impl</artifactId>
             <version>2.13.3</version>
         </dependency>
+
+
+        <!-- Missing in JDK 11 -->
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+        </dependency>
+
+
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml
index 65bd31b..3cbfabb 100644
--- a/geoportal-service/pom.xml
+++ b/geoportal-service/pom.xml
@@ -143,24 +143,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-core</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>activation</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 		<!-- Plugins related tests -->
 
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 0aec16e..da4b9d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,13 +207,20 @@
 			<dependency>
 				<groupId>javax.xml.bind</groupId>
 				<artifactId>jaxb-api</artifactId>
-				<version>2.3.0</version>
+				<version>2.4.0-b180830.0359</version>
 			</dependency>
 
 			<dependency>
 				<groupId>com.sun.xml.bind</groupId>
 				<artifactId>jaxb-impl</artifactId>
-				<version>2.3.0.1</version>
+				<version>2.4.0-b180830.0438</version>
+			</dependency>
+
+			<!-- https://mvnrepository.com/artifact/org.glassfish.jaxb/jaxb-runtime -->
+			<dependency>
+				<groupId>org.glassfish.jaxb</groupId>
+				<artifactId>jaxb-runtime</artifactId>
+				<version>2.4.0-b180830.0438</version>
 			</dependency>
 
 			<dependency>
@@ -223,6 +230,14 @@
 			</dependency>
 
 
+			<!-- https://mvnrepository.com/artifact/com.sun.istack/istack-commons-runtime -->
+			<dependency>
+				<groupId>com.sun.istack</groupId>
+				<artifactId>istack-commons-runtime</artifactId>
+				<version>2.4</version>
+			</dependency>
+
+
 			<dependency>
 				<groupId>javax.activation</groupId>
 				<artifactId>activation</artifactId>