[#8470] Update Java11

pinpoint-apm · Dec 8, 2021 · 840e9dd · 840e9dd
1 parent df0e202
commit 840e9dd
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -74,15 +74,15 @@ For a more intimate guide, please check out our *[Introduction to Pinpoint](http
 
 Java version required to run Pinpoint:
 <!-- <compatibilityJava.md> -->
-Pinpoint Version | Agent | Collector | Web
----------------- | ----- | --------- | ---
-1.8.0  | 6-10 | 8   | 8 
-1.8.1+ | 6-11 | 8   | 8 
-2.0.x  | 6-13 | 8   | 8
-2.1.x  | 6-14 | 8   | 8
-2.2.x  | 7-14 | 8   | 8
-2.3.x  | 7-17 | 8   | 8
-2.4.x  | 7-18 | 8   | 8
+Pinpoint Version | Agent | Collector | Web | Flink
+---------------- | ----- | --------- | --- | ---
+1.8.0  | 6-10 | 8   | 8 | 8
+1.8.1+ | 6-11 | 8   | 8 | 8
+2.0.x  | 6-13 | 8   | 8 | 8
+2.1.x  | 6-14 | 8   | 8 | 8
+2.2.x  | 7-14 | 8   | 8 | 8
+2.3.x  | 7-17 | 8   | 8 | 8
+2.4.x  | 7-18 | 11  | 11 | 11
 <!-- </compatibilityJava.md> -->
 HBase compatibility table:
 <!-- <compatibilityHbase.md> -->

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 -->