From 6ecf4f2bd9d8013f83948f58715ee758842bb470 Mon Sep 17 00:00:00 2001
From: Bipin kumar <sayy2bipin@gmail.com>
Date: Wed, 29 Nov 2023 17:54:00 +0530
Subject: [PATCH] JAVA-26778: Changes made for Upgrade jaxb2-maven-plugin to
 latest version (#15220)

---
 feign/pom.xml | 14 +++++++++++++-
 pom.xml       |  4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/feign/pom.xml b/feign/pom.xml
index edb55e7da5..127f6c490c 100644
--- a/feign/pom.xml
+++ b/feign/pom.xml
@@ -74,6 +74,17 @@
             <version>${wire.mock.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>4.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>4.0.0</version>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -85,7 +96,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxb2-maven-plugin</artifactId>
-                <version>2.5.0</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>xjc</id>
@@ -131,6 +142,7 @@
         <feign.form.spring.version>3.8.0</feign.form.spring.version>
         <spring.cloud.openfeign.version>3.1.2</spring.cloud.openfeign.version>
         <wire.mock.version>2.33.2</wire.mock.version>
+        <jakarta.xml.bind.version>4.0.0</jakarta.xml.bind.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f5aedd091e..32b8e8c8c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -726,7 +726,7 @@
                 <module>dozer</module>
                 <module>drools</module>
                 <module>dubbo</module>
-                <!-- <module>feign</module> --> <!-- JAVA-20337 -->
+                <module>feign</module>
                 <module>gcp-firebase</module>
                 <module>geotools</module>
                 <module>google-auto-project</module>
@@ -970,7 +970,7 @@
                 <module>dozer</module>
                 <module>drools</module>
                 <module>dubbo</module>
-                <!-- <module>feign</module> --> <!-- JAVA-20337 -->
+                <module>feign</module>
                 <module>gcp-firebase</module>
                 <module>geotools</module>
                 <module>google-auto-project</module>