From 2daba944733536b98228163900541a0df317304d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 19 May 2020 21:57:21 +0200
Subject: [PATCH] Consolidate jaxb version

---
 pom.xml            | 6 +++---
 scm-core/pom.xml   | 4 ++--
 scm-webapp/pom.xml | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2ffec23a48..2231e1dab0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -437,8 +437,8 @@
       <!-- xml -->
 
       <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
+      <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
         <version>${jaxb.version}</version>
       </dependency>
 
@@ -908,7 +908,7 @@
     <jersey-client.version>1.19.4</jersey-client.version>
     <jackson.version>2.11.0</jackson.version>
     <guice.version>4.2.3</guice.version>
-    <jaxb.version>2.3.1</jaxb.version>
+    <jaxb.version>2.3.2</jaxb.version>
     <hibernate-validator.version>6.1.4.Final</hibernate-validator.version>
 
     <!-- event bus -->
diff --git a/scm-core/pom.xml b/scm-core/pom.xml
index f15b77cded..7d78979d96 100644
--- a/scm-core/pom.xml
+++ b/scm-core/pom.xml
@@ -173,8 +173,8 @@
     <!-- xml -->
 
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
     </dependency>
 
     <dependency>
diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index f1f097b8c3..f024ec62ec 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -203,15 +203,15 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>2.3.1</version>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>${jaxb.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
-      <version>2.3.0</version>
+      <version>${jaxb.version}</version>
     </dependency>
 
     <!-- injection -->