[incubator-iotdb] branch remove_jdk_detect created (now efb2539)

[hx...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hxd pushed a change to branch remove_jdk_detect
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


      at efb2539  remove jdk version constrain for jdk8 and 11. (now only jdk<1.8u40 is forbidden)

This branch includes the following new commits:

     new efb2539  remove jdk version constrain for jdk8 and 11. (now only jdk<1.8u40 is forbidden)

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[incubator-iotdb] 01/01: remove jdk version constrain for jdk8 and 11. (now only jdk<1.8u40 is forbidden)

[hx...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hxd pushed a commit to branch remove_jdk_detect
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit efb25391692a9e17ec10ee5aee3ef7e6d33e1bc0
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Sep 29 21:17:43 2019 +0800

    remove jdk version constrain for jdk8 and 11. (now only jdk<1.8u40 is forbidden)
---
 README.md                                       | 4 ++--
 server/src/assembly/resources/conf/iotdb-env.sh | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 1a5e3fc..129620a 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ This short guide will walk you through the basic process of using IoTDB. For a m
 
 To use IoTDB, you need to have:
 
-1. Java >= 1.8 (Please make sure the environment path has been set)
+1. Java >= 1.8 (1.8, 11, and 13 are verified. Please make sure the environment path has been set)
 2. Maven >= 3.1 (If you want to compile and install IoTDB from source code)
 3. Set the max open files num as 65535 to avoid "too many open files" problem.
 
@@ -301,4 +301,4 @@ Under the root path of incubator-iotdb:
 > mvn clean package -pl client -am -DskipTests
 ```
 
-After build, the IoTDB client will be at the folder "client/target/iotdb-client-{project.version}".
\ No newline at end of file
+After build, the IoTDB client will be at the folder "client/target/iotdb-client-{project.version}".
diff --git a/server/src/assembly/resources/conf/iotdb-env.sh b/server/src/assembly/resources/conf/iotdb-env.sh
index 80069cc..df4a574 100755
--- a/server/src/assembly/resources/conf/iotdb-env.sh
+++ b/server/src/assembly/resources/conf/iotdb-env.sh
@@ -117,10 +117,6 @@ else
   IOTDB_JMX_OPTS="$IOTDB_JMX_OPTS -Xloggc:${IOTDB_HOME}/gc.log"
 fi
 
-if [ "$MAJOR_VERSION" -ne "8" ] && [ "$MAJOR_VERSION" -ne "11" ] ; then
-  echo "IoTDB only supports jdk8 or jdk11, please check your java version."
-  exit 1;
-fi
 
 
 calculate_heap_sizes
@@ -147,4 +143,4 @@ IOTDB_JMX_OPTS="$IOTDB_JMX_OPTS -Xms${HEAP_NEWSIZE}"
 IOTDB_JMX_OPTS="$IOTDB_JMX_OPTS -Xmx${MAX_HEAP_SIZE}"
 
 echo "Maximum memory allocation pool = ${MAX_HEAP_SIZE}B, initial memory allocation pool = ${HEAP_NEWSIZE}B"
-echo "If you want to change this configuration, please check conf/iotdb-env.sh(Unix or OS X, if you use Windows, check conf/iotdb-env.bat)."
\ No newline at end of file
+echo "If you want to change this configuration, please check conf/iotdb-env.sh(Unix or OS X, if you use Windows, check conf/iotdb-env.bat)."