From 4dec9bb26dfcdb5a93a191356321d5e3be20c267 Mon Sep 17 00:00:00 2001
From: HoaPhan <s50600822@gmail.com>
Date: Wed, 3 May 2023 16:46:19 +1000
Subject: [PATCH] make some module Java 11 friendly - where package
 javax.xml.bind was removed

---
 modules/swagger-generator/pom.xml                        | 3 ++-
 samples/server/petstore/jaxrs-datelib-j8/pom.xml         | 6 ++++++
 samples/server/petstore/spring-mvc-j8-async/pom.xml      | 7 +++++++
 .../server/petstore/spring-mvc-j8-localdatetime/pom.xml  | 9 +++++++++
 samples/server/petstore/springboot-delegate-j8/pom.xml   | 6 ++++++
 5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml
index 59d128ef74d..57d6b78b59e 100644
--- a/modules/swagger-generator/pom.xml
+++ b/modules/swagger-generator/pom.xml
@@ -276,7 +276,7 @@
         <dependency>
            <groupId>javax.xml.bind</groupId>
            <artifactId>jaxb-api</artifactId>
-           <version>2.3.0</version>
+           <version>${jaxb-api.version}</version>
          </dependency>
          <dependency>
            <groupId>com.sun.xml.bind</groupId>
@@ -333,6 +333,7 @@
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <servlet-api-version>2.5</servlet-api-version>
         <zip-version>2.11.5</zip-version>
+        <jaxb-api.version>2.3.0</jaxb-api.version>
         <jetty-version>9.4.51.v20230217</jetty-version>
         <jersey2-version>2.39.1</jersey2-version>
     </properties>
diff --git a/samples/server/petstore/jaxrs-datelib-j8/pom.xml b/samples/server/petstore/jaxrs-datelib-j8/pom.xml
index ce059001691..6c402953b30 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/pom.xml
+++ b/samples/server/petstore/jaxrs-datelib-j8/pom.xml
@@ -123,6 +123,11 @@
       <artifactId>servlet-api</artifactId>
       <version>${servlet-api-version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-api.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.containers</groupId>
       <artifactId>jersey-container-servlet-core</artifactId>
@@ -171,6 +176,7 @@
   </repositories>
   <properties>
     <java.version>1.8</java.version>
+    <jaxb-api.version>2.3.0</jaxb-api.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <swagger-core-version>1.5.24</swagger-core-version>
diff --git a/samples/server/petstore/spring-mvc-j8-async/pom.xml b/samples/server/petstore/spring-mvc-j8-async/pom.xml
index c964f3c165f..92d4fd2ce98 100644
--- a/samples/server/petstore/spring-mvc-j8-async/pom.xml
+++ b/samples/server/petstore/spring-mvc-j8-async/pom.xml
@@ -113,6 +113,12 @@
             <version>${jackson-version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-api.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -160,6 +166,7 @@
     </dependencies>
     <properties>
         <java.version>1.8</java.version>
+        <jaxb-api.version>2.3.0</jaxb-api.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <jetty-version>9.3.27.v20190418</jetty-version>
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml b/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml
index a607f891c81..c366a20a74a 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml
@@ -129,6 +129,7 @@
             <artifactId>servlet-api</artifactId>
             <version>${servlet-api-version}</version>
         </dependency>
+
     <!-- Bean Validation API support -->
     <dependency>
         <groupId>javax.validation</groupId>
@@ -136,6 +137,13 @@
         <version>1.1.0.Final</version>
         <scope>provided</scope>
     </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-api.version}</version>
+        </dependency>
+
     <dependency>
         <groupId>org.testng</groupId>
         <artifactId>testng</artifactId>
@@ -165,6 +173,7 @@
     </dependencies>
     <properties>
         <java.version>1.8</java.version>
+        <jaxb-api.version>2.3.0</jaxb-api.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <jetty-version>9.3.27.v20190418</jetty-version>
diff --git a/samples/server/petstore/springboot-delegate-j8/pom.xml b/samples/server/petstore/springboot-delegate-j8/pom.xml
index 5bf29c050eb..0a60f8423b8 100644
--- a/samples/server/petstore/springboot-delegate-j8/pom.xml
+++ b/samples/server/petstore/springboot-delegate-j8/pom.xml
@@ -7,6 +7,7 @@
     <version>1.0.0</version>
     <properties>
         <java.version>1.8</java.version>
+        <jaxb-api.version>2.3.0</jaxb-api.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <springfox-version>2.7.0</springfox-version>
@@ -63,6 +64,11 @@
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-api.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>