diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 11cd38556..90c2a2a02 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -73,6 +73,17 @@
             <scope>provided</scope>
         </dependency>
         
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <!--
             Flyway framework for database schema migrations
         -->
diff --git a/pom.xml b/pom.xml
index 7abd84a06..73e7b16d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -447,6 +447,21 @@
                 <artifactId>flyway-core</artifactId>
                 <version>4.0.3</version>
             </dependency>
+            
+            <!-- 
+                Since Java 11 jaxb is not longer part of the standard JDK.
+                Java EE implementations must provide an implementation.
+            -->
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.4.0-b180830.0359</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jaxb</groupId>
+                <artifactId>jaxb-runtime</artifactId>
+                <version>2.4.0-b180830.0438</version>
+            </dependency>
 
             <!-- Shiro lib for security stuff -->
             <dependency>