[pinpoint-apm#2788] Bump required jdk version to 8

likeonechild · Apr 14, 2017 · 1c4b3d3 · 1c4b3d3
1 parent 33794b5
commit 1c4b3d3
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -78,28 +78,31 @@ Java version required to run Pinpoint:
 
 Pinpoint Version | Agent | Collector | Web
 ---------------- | ----- | --------- | ---
-1.0.x | 6+ | 6+ | 6+
-1.1.x | 6+ | 7+ | 7+
-1.5.x | 6+ | 7+ | 7+
-1.6.x | 6+ | 7+ | 7+
+1.0.x | 6-8 | 6+ | 6+
+1.1.x | 6-8 | 7+ | 7+
+1.5.x | 6-8 | 7+ | 7+
+1.6.x | 6-8 | 7+ | 7+
+1.7.x | 6-8 | 8+ | 8+
 
 HBase compatibility table:
 
 Pinpoint Version | HBase 0.94.x | HBase 0.98.x | HBase 1.0.x | HBase 1.1.x | HBase 1.2.x
 ---------------- | ------------ | ------------ | ----------- | ----------- | -----------
-1.0.x | yes | no | no | no | no |
+1.0.x | yes | no | no | no | no
 1.1.x | no | not tested | yes | not tested | not tested
 1.5.x | no | not tested | yes | not tested | not tested
 1.6.x | no | not tested | not tested | not tested | yes
+1.7.x | no | not tested | not tested | not tested | yes
 
 Agent compatibility table:
 
-Agent Version | Collector 1.0.x | Collector 1.1.x | Collector 1.5.x | Collector 1.6.x
-------------- | --------------- | --------------- | --------------- | --------------- 
-1.0.x | yes | yes | yes | yes
-1.1.x | not tested | yes | yes | yes
-1.5.x | no | no | yes | yes
-1.6.x | no | no | not tested | yes
+Agent Version | Collector 1.0.x | Collector 1.1.x | Collector 1.5.x | Collector 1.6.x | Collector 1.7.x
+------------- | --------------- | --------------- | --------------- | --------------- | ---------------
+1.0.x | yes | yes | yes | yes | yes
+1.1.x | not tested | yes | yes | yes | yes
+1.5.x | no | no | yes | yes | yes
+1.6.x | no | no | not tested | yes | yes
+1.7.x | no | no | no | no | yes
 
 Pinpoint Web Supported Browsers:
 

diff --git a/collector/pom.xml b/collector/pom.xml
@@ -12,9 +12,9 @@
     <packaging>war</packaging>
 
     <properties>
-        <jdk.version>1.7</jdk.version>
-        <jdk.home>${env.JAVA_7_HOME}</jdk.home>
-        <sniffer.artifactid>java17</sniffer.artifactid>
+        <jdk.version>1.8</jdk.version>
+        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
+        <sniffer.artifactid>java18</sniffer.artifactid>
         <fastxml.jackson.version>2.8.5</fastxml.jackson.version>
     </properties>
 

diff --git a/commons-hbase/pom.xml b/commons-hbase/pom.xml
@@ -12,8 +12,8 @@
     <packaging>jar</packaging>
 
     <properties>
-        <jdk.version>1.7</jdk.version>
-        <jdk.home>${env.JAVA_7_HOME}</jdk.home>
+        <jdk.version>1.8</jdk.version>
+        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
     </properties>
 
     <dependencies>

diff --git a/commons-server/pom.xml b/commons-server/pom.xml
@@ -13,9 +13,9 @@
 
     <properties>
         <!-- jdk.version 1.6 : for profiler-test compatibility -->
-        <!-- jdk.home 1.7 : for hbase compatibility -->
+        <!-- jdk.home 1.8 : for hbase compatibility -->
         <jdk.version>1.6</jdk.version>
-        <jdk.home>${env.JAVA_7_HOME}</jdk.home>
+        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
         <test.jdk.home>${jdk.home}</test.jdk.home>
         <sniffer.artifactid>java16</sniffer.artifactid>
     </properties>

diff --git a/doc/installation.md b/doc/installation.md
@@ -37,11 +37,13 @@ Pinpoint uses HBase as its storage backend for the Collector and the Web.
 
 To set up your own cluster, take a look at the [HBase website](http://hbase.apache.org) for instructions. The HBase compatibility table is given below:
 
-Pinpoint Version | HBase 0.94.x | HBase 0.98.x | HBase 1.0.x | HBase 1.1.x
----------------- | ------------ | ------------ | ----------- | -----------
-1.0.x | yes | no | no | no 
-1.1.x | no | not tested | yes | not tested
-1.5.x | no | not tested | yes | not tested
+Pinpoint Version | HBase 0.94.x | HBase 0.98.x | HBase 1.0.x | HBase 1.1.x | HBase 1.2.x
+---------------- | ------------ | ------------ | ----------- | ----------- | -----------
+1.0.x | yes | no | no | no | no
+1.1.x | no | not tested | yes | not tested | not tested
+1.5.x | no | not tested | yes | not tested | not tested
+1.6.x | no | not tested | not tested | not tested | yes
+1.7.x | no | not tested | not tested | not tested | yes
 
 Once you have HBase up and running, make sure the Collector and the Web are configured properly and are able to connect to HBase.
 
@@ -77,9 +79,11 @@ There are two options:
 
 	Pinpoint Version | Agent | Collector | Web
 	---------------- | ----- | --------- | ---
-	1.0.x | 6+ | 6+ | 6+
-	1.1.x | 6+ | 7+ | 7+
-	1.5.x | 6+ | 7+ | 7+
+	1.0.x | 6-8 | 6+ | 6+
+	1.1.x | 6-8 | 7+ | 7+
+	1.5.x | 6-8 | 7+ | 7+
+	1.6.x | 6-8 | 7+ | 7+
+	1.7.x | 6-8 | 8+ | 8+
 
 	Once the above requirements are met, simply run the command below :
 

diff --git a/web/pom.xml b/web/pom.xml
@@ -12,10 +12,10 @@
     <packaging>war</packaging>
 
     <properties>
-        <jdk.version>1.7</jdk.version>
-        <jdk.home>${env.JAVA_7_HOME}</jdk.home>
+        <jdk.version>1.8</jdk.version>
+        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
         <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
-        <sniffer.artifactid>java17</sniffer.artifactid>
+        <sniffer.artifactid>java18</sniffer.artifactid>
         <fastxml.jackson.version>2.8.5</fastxml.jackson.version>
         <grunt.build.command>build_release_without_lint</grunt.build.command>
     </properties>