You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/11/23 05:37:57 UTC
[incubator-iotdb] branch rel/0.9 updated (414495a -> 96f4747)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch rel/0.9
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 414495a [maven-release-plugin] prepare for next development iteration
new 9f8a133 allow using user defined JAVA_HOME and allow blank space in the JAVA_HOME (#579)
new 96f4747 [IOTDB-308]switch jdk in travis from jdk8 to jdk11 (#574)
The 2 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.
Summary of changes:
.travis.yml | 12 +++---
.../src/assembly/resources/sbin/start-server.bat | 44 +++++++++++-----------
2 files changed, 29 insertions(+), 27 deletions(-)
[incubator-iotdb] 01/02: allow using user defined JAVA_HOME and
allow blank space in the JAVA_HOME (#579)
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.9
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 9f8a133a235a2687fffd437bdbe08a3dab917781
Author: Xiangdong Huang <hx...@qq.com>
AuthorDate: Sat Nov 23 13:32:04 2019 +0800
allow using user defined JAVA_HOME and allow blank space in the JAVA_HOME (#579)
(cherry picked from commit 3c02aff9bda1b85a001c7f178683f1cdebb805b5)
---
.../src/assembly/resources/sbin/start-server.bat | 44 +++++++++++-----------
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/server/src/assembly/resources/sbin/start-server.bat b/server/src/assembly/resources/sbin/start-server.bat
index 534bdf2..57ba10d 100755
--- a/server/src/assembly/resources/sbin/start-server.bat
+++ b/server/src/assembly/resources/sbin/start-server.bat
@@ -22,30 +22,14 @@ echo ````````````````````````
echo Starting IoTDB
echo ````````````````````````
-PATH %PATH%;%JAVA_HOME%\bin\
+
+set PATH="%JAVA_HOME%\bin\";%PATH%
set "FULL_VERSION="
set "MAJOR_VERSION="
set "MINOR_VERSION="
-if "%OS%" == "Windows_NT" setlocal
-
-pushd %~dp0..
-if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%cd%
-popd
-
-set IOTDB_CONF=%IOTDB_HOME%\conf
-set IOTDB_LOGS=%IOTDB_HOME%\logs
-
-IF EXIST "%IOTDB_CONF%\iotdb-env.bat" (
- CALL "%IOTDB_CONF%\iotdb-env.bat"
- ) ELSE (
- echo "can't find %IOTDB_CONF%\iotdb-env.bat"
- )
-
-if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.db.service.IoTDB
-if NOT DEFINED JAVA_HOME goto :err
-for /f tokens^=2-5^ delims^=.-_+^" %%j in ('%JAVA_HOME%\bin\java -fullversion 2^>^&1') do (
+for /f tokens^=2-5^ delims^=.-_+^" %%j in ('java -fullversion 2^>^&1') do (
set "FULL_VERSION=%%j-%%k-%%l-%%m"
IF "%%j" == "1" (
set "MAJOR_VERSION=%%k"
@@ -65,6 +49,24 @@ IF NOT %JAVA_VERSION% == 8 (
)
)
+if "%OS%" == "Windows_NT" setlocal
+
+pushd %~dp0..
+if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%cd%
+popd
+
+set IOTDB_CONF=%IOTDB_HOME%\conf
+set IOTDB_LOGS=%IOTDB_HOME%\logs
+
+IF EXIST "%IOTDB_CONF%\iotdb-env.bat" (
+ CALL "%IOTDB_CONF%\iotdb-env.bat"
+ ) ELSE (
+ echo "can't find %IOTDB_CONF%\iotdb-env.bat"
+ )
+
+if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.db.service.IoTDB
+if NOT DEFINED JAVA_HOME goto :err
+
@REM -----------------------------------------------------------------------------
@REM JVM Opts we'll use in legacy run or installation
set JAVA_OPTS=-ea^
@@ -78,7 +80,7 @@ set JAVA_OPTS=-ea^
set CLASSPATH="%IOTDB_HOME%\lib"
@REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable.
-set CLASSPATH=%CLASSPATH%;"%IOTDB_HOME%\lib\*"
+for %%i in ("%IOTDB_HOME%\lib\*.jar") do call :append "%%i"
set CLASSPATH=%CLASSPATH%;iotdb.IoTDB
goto okClasspath
@@ -104,4 +106,4 @@ pause
pause
-ENDLOCAL
\ No newline at end of file
+ENDLOCAL
[incubator-iotdb] 02/02: [IOTDB-308]switch jdk in travis from jdk8
to jdk11 (#574)
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.9
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 96f47476c5cfdc51639754b23f82fa28c2c8ce87
Author: Xiangdong Huang <hx...@qq.com>
AuthorDate: Fri Nov 22 19:05:23 2019 +0800
[IOTDB-308]switch jdk in travis from jdk8 to jdk11 (#574)
* switch jdk in travis from jdk8 to jdk11
(cherry picked from commit 7f2df2e406cd68e7990b5c6e6481017018d21812)
---
.travis.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 2a2b2a4..3fefbe4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,9 +91,9 @@ matrix:
- os: windows
language: c
- name: win-oraclejdk8
+ name: win-openjdk11
before_install:
- - choco install jdk8 -params 'installdir=c:\\jdk8'
+ - choco install openjdk11 --version=11.0.4.111 -y
- wget --no-check-certificate https://www-eu.apache.org/dist/maven/maven-3/3.6.2/binaries/apache-maven-3.6.2-bin.zip
- /C/Progra~1/7-Zip/7z.exe x apache-maven-3.6.2-bin.zip -o/c/mvn362
- mkdir C:\hadoop\bin
@@ -120,9 +120,9 @@ matrix:
- wget --no-check-certificate https://github.com/cdarlint/winutils/raw/master/hadoop-2.7.3/bin/yarn.cmd -o C:\hadoop\bin
before_script:
- - export "JAVA_HOME=/c/jdk8"
- - export "PATH=/c/jdk8/bin:$PATH"
- - export "PATH=/c/jdk8/jre/bin:$PATH"
+ - export "JAVA_HOME=/C/Program Files/OpenJDK/openjdk-11u-11.0.4_11"
+ - export "PATH=$JAVA_HOME/bin:$PATH"
+ - export "PATH=$JAVA_HOME/jre/bin:$PATH"
- export "MAVEN_HOME=/c/mvn362/apache-maven-3.6.2"
- export "M2_HOME=/c/mvn362/apache-maven-3.6.2"
- export "PATH=/c/mvn362/apache-maven-3.6.2/bin:$PATH"
@@ -133,7 +133,7 @@ matrix:
- mvn -version
# Output something every 10 minutes or Travis kills the job
- while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
- - mvn -B clean integration-test
+ - travis_wait 40 mvn -B clean integration-test
# Killing background sleep loop
- kill %1