From 38ce7145038049e157417f631d28410e736d10db Mon Sep 17 00:00:00 2001
From: wd-kang <emeroad@gmail.com>
Date: Wed, 8 Dec 2021 15:29:21 +0900
Subject: [PATCH] [#8470] Update Java11

---
 batch/pom.xml                          |  6 +++---
 collector/pom.xml                      |  6 +++---
 commons-hbase/pom.xml                  |  6 +++---
 commons-server/pom.xml                 |  6 +++---
 flink/pom.xml                          |  7 ++++---
 hbase/hbase-schema-definition/pom.xml  | 21 +++++++++++++++++++++
 hbase/pom.xml                          |  7 ++++---
 hbase2-module/hbase2-batch/pom.xml     |  6 +++---
 hbase2-module/hbase2-collector/pom.xml |  6 +++---
 hbase2-module/hbase2-flink/pom.xml     |  6 +++---
 hbase2-module/hbase2-web/pom.xml       |  7 ++++---
 pom.xml                                |  2 +-
 web/pom.xml                            |  7 ++++---
 13 files changed, 59 insertions(+), 34 deletions(-)

diff --git a/batch/pom.xml b/batch/pom.xml
index b5c2c8cdb206..fc5c34efb293 100644
--- a/batch/pom.xml
+++ b/batch/pom.xml
@@ -12,9 +12,9 @@
     <artifactId>pinpoint-batch</artifactId>
 
     <properties>
-        <jdk.version>1.8</jdk.version>
-        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
+        <jdk.version>11</jdk.version>
+        <jdk.home>${env.JAVA_11_HOME}</jdk.home>
+        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
 
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
         <thrift.version>${thrift-jdk8.version}</thrift.version>
diff --git a/collector/pom.xml b/collector/pom.xml
index 8cdca03968ac..c980c2891343 100644
--- a/collector/pom.xml
+++ b/collector/pom.xml
@@ -29,9 +29,9 @@
     <packaging>jar</packaging>
 
     <properties>
-        <jdk.version>1.8</jdk.version>
-        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
+        <jdk.version>11</jdk.version>
+        <jdk.home>${env.JAVA_11_HOME}</jdk.home>
+        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
 
         <guava.version>${guava-jdk8.version}</guava.version>
         <javax.servlet.version>${javax.servlet4.version}</javax.servlet.version>
diff --git a/commons-hbase/pom.xml b/commons-hbase/pom.xml
index a3d8230db35a..b85b0fdcb5bc 100644
--- a/commons-hbase/pom.xml
+++ b/commons-hbase/pom.xml
@@ -29,9 +29,9 @@
     <packaging>jar</packaging>
 
     <properties>
-        <jdk.version>1.8</jdk.version>
-        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
+        <jdk.version>11</jdk.version>
+        <jdk.home>${env.JAVA_11_HOME}</jdk.home>
+        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
 
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
     </properties>
diff --git a/commons-server/pom.xml b/commons-server/pom.xml
index 47cbcfe72489..875234e21c4f 100644
--- a/commons-server/pom.xml
+++ b/commons-server/pom.xml
@@ -29,10 +29,10 @@
     <packaging>jar</packaging>
 
     <properties>
-        <jdk.version>1.8</jdk.version>
-        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
+        <jdk.version>11</jdk.version>
+        <jdk.home>${env.JAVA_11_HOME}</jdk.home>
+        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
         <test.jdk.home>${jdk.home}</test.jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
 
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
         <guava.version>${guava-jdk8.version}</guava.version>
diff --git a/flink/pom.xml b/flink/pom.xml
index a394807c4fbe..187c7e9e4c21 100644
--- a/flink/pom.xml
+++ b/flink/pom.xml
@@ -30,9 +30,10 @@
     <name>pinpoint-flink</name>
 
     <properties>
-        <jdk.version>1.8</jdk.version>
-        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
+        <jdk.version>11</jdk.version>
+        <jdk.home>${env.JAVA_11_HOME}</jdk.home>
+        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
+
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
         <thrift.version>${thrift-jdk8.version}</thrift.version>
     </properties>
diff --git a/hbase/hbase-schema-definition/pom.xml b/hbase/hbase-schema-definition/pom.xml
index 7b26e59d13fe..af32204080a4 100644
--- a/hbase/hbase-schema-definition/pom.xml
+++ b/hbase/hbase-schema-definition/pom.xml
@@ -38,4 +38,25 @@
         </plugins>
     </build>
 
+    <dependencies>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>2.3.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.3.3</version>
+            <scope>runtime</scope>
+        </dependency>
+  </dependencies>
+
+
 </project>
\ No newline at end of file
diff --git a/hbase/pom.xml b/hbase/pom.xml
index 1c5c3ea15268..69abcab6781c 100644
--- a/hbase/pom.xml
+++ b/hbase/pom.xml
@@ -14,9 +14,10 @@
     <packaging>pom</packaging>
 
     <properties>
-        <jdk.version>1.8</jdk.version>
-        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
+        <jdk.version>11</jdk.version>
+        <jdk.home>${env.JAVA_11_HOME}</jdk.home>
+        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
+
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
     </properties>
 
diff --git a/hbase2-module/hbase2-batch/pom.xml b/hbase2-module/hbase2-batch/pom.xml
index 5d4dd08f405a..706402868300 100644
--- a/hbase2-module/hbase2-batch/pom.xml
+++ b/hbase2-module/hbase2-batch/pom.xml
@@ -13,9 +13,9 @@
     <packaging>jar</packaging>
 
     <properties>
-        <jdk.version>1.8</jdk.version>
-        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
+        <jdk.version>11</jdk.version>
+        <jdk.home>${env.JAVA_11_HOME}</jdk.home>
+        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
 
         <pinpoint.batch.executable.name>${project.artifactId}-${project.version}</pinpoint.batch.executable.name>
diff --git a/hbase2-module/hbase2-collector/pom.xml b/hbase2-module/hbase2-collector/pom.xml
index 3be492b146c7..37636f6dedf4 100644
--- a/hbase2-module/hbase2-collector/pom.xml
+++ b/hbase2-module/hbase2-collector/pom.xml
@@ -28,9 +28,9 @@
     <packaging>jar</packaging>
 
     <properties>
-        <jdk.version>1.8</jdk.version>
-        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
+        <jdk.version>11</jdk.version>
+        <jdk.home>${env.JAVA_11_HOME}</jdk.home>
+        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
 
         <guava.version>${guava-jdk8.version}</guava.version>
         <javax.servlet.version>${javax.servlet4.version}</javax.servlet.version>
diff --git a/hbase2-module/hbase2-flink/pom.xml b/hbase2-module/hbase2-flink/pom.xml
index 684f3a2254ac..959ad8d61134 100644
--- a/hbase2-module/hbase2-flink/pom.xml
+++ b/hbase2-module/hbase2-flink/pom.xml
@@ -28,9 +28,9 @@
     <artifactId>pinpoint-hbase2-flink</artifactId>
 
     <properties>
-        <jdk.version>1.8</jdk.version>
-        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
+        <jdk.version>11</jdk.version>
+        <jdk.home>${env.JAVA_11_HOME}</jdk.home>
+        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
     </properties>
 
diff --git a/hbase2-module/hbase2-web/pom.xml b/hbase2-module/hbase2-web/pom.xml
index 11eba66c8781..94c76fdb0596 100644
--- a/hbase2-module/hbase2-web/pom.xml
+++ b/hbase2-module/hbase2-web/pom.xml
@@ -28,9 +28,10 @@
     <packaging>jar</packaging>
 
     <properties>
-        <jdk.version>1.8</jdk.version>
-        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
+        <jdk.version>11</jdk.version>
+        <jdk.home>${env.JAVA_11_HOME}</jdk.home>
+        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
+
         <grunt.build.command>build_release_without_lint</grunt.build.command>
 
         <!-- java back-end development option -->
diff --git a/pom.xml b/pom.xml
index c93d92bb537f..2b7f9c3a373a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,7 +198,7 @@
         <plugin.pmd.version>3.14.0</plugin.pmd.version>
 
         <plugin.enforcer.version>3.0.0</plugin.enforcer.version>
-        <plugin.animal-sniffer.version>1.19</plugin.animal-sniffer.version>
+        <plugin.animal-sniffer.version>1.20</plugin.animal-sniffer.version>
 
         <sniffer.artifactid>java17</sniffer.artifactid>
 
diff --git a/web/pom.xml b/web/pom.xml
index 281c852d5134..7fa82e5b4f92 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -29,9 +29,10 @@
     <packaging>jar</packaging>
 
     <properties>
-        <jdk.version>1.8</jdk.version>
-        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
+        <jdk.version>11</jdk.version>
+        <jdk.home>${env.JAVA_11_HOME}</jdk.home>
+        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
+
         <grunt.build.command>build_release_without_lint</grunt.build.command>
 
         <!-- java back-end development option -->