Commit fc2bc3e3cdc423032a4c262b71ca5e067972d9ee

Authored by Igor Kulikov
1 parent 58e2affa

JDK11 for windows services

... ... @@ -7,11 +7,11 @@ setlocal ENABLEEXTENSIONS
7 7 for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "jver=%%j%%k"
8 8 @ECHO CurrentVersion %jver%
9 9
10   -if %jver% NEQ 18 GOTO JAVA_NOT_INSTALLED
  10 +if %jver% NEQ 110 GOTO JAVA_NOT_INSTALLED
11 11
12 12 :JAVA_INSTALLED
13 13
14   -@ECHO Java 1.8 found!
  14 +@ECHO Java 11 found!
15 15 @ECHO Installing thingsboard ...
16 16
17 17 SET loadDemo=false
... ... @@ -50,8 +50,8 @@ POPD
50 50 GOTO END
51 51
52 52 :JAVA_NOT_INSTALLED
53   -@ECHO Java 1.8 is not installed. Only Java 1.8 is supported
54   -@ECHO Please go to https://adoptopenjdk.net/index.html and install Java 1.8. Then retry installation.
  53 +@ECHO Java 11 is not installed. Only Java 11 is supported
  54 +@ECHO Please go to https://adoptopenjdk.net/index.html and install Java 11. Then retry installation.
55 55 PAUSE
56 56 GOTO END
57 57
... ...
... ... @@ -10,29 +10,18 @@
10 10 <executable>java</executable>
11 11 <startargument>-Dplatform=windows</startargument>
12 12 <startargument>-Dinstall.data_dir=%BASE%\data</startargument>
13   - <startargument>-Xloggc:%BASE%\logs\gc.log</startargument>
  13 + <startargument>-Xlog:gc*,heap*,age*,safepoint=debug:file=%BASE%\logs\gc.log:time,uptime,level,tags:filecount=10,filesize=10M</startargument>
14 14 <startargument>-XX:+HeapDumpOnOutOfMemoryError</startargument>
15   - <startargument>-XX:+PrintGCDetails</startargument>
16   - <startargument>-XX:+PrintGCDateStamps</startargument>
17   - <startargument>-XX:+PrintHeapAtGC</startargument>
18   - <startargument>-XX:+PrintTenuringDistribution</startargument>
19   - <startargument>-XX:+PrintGCApplicationStoppedTime</startargument>
20   - <startargument>-XX:+UseGCLogFileRotation</startargument>
21   - <startargument>-XX:NumberOfGCLogFiles=10</startargument>
22   - <startargument>-XX:GCLogFileSize=10M</startargument>
23 15 <startargument>-XX:-UseBiasedLocking</startargument>
24 16 <startargument>-XX:+UseTLAB</startargument>
25 17 <startargument>-XX:+ResizeTLAB</startargument>
26 18 <startargument>-XX:+PerfDisableSharedMem</startargument>
27 19 <startargument>-XX:+UseCondCardMark</startargument>
28   - <startargument>-XX:CMSWaitDuration=10000</startargument>
29   - <startargument>-XX:+UseParNewGC</startargument>
30   - <startargument>-XX:+UseConcMarkSweepGC</startargument>
31   - <startargument>-XX:+CMSParallelRemarkEnabled</startargument>
32   - <startargument>-XX:+CMSParallelInitialMarkEnabled</startargument>
33   - <startargument>-XX:+CMSEdenChunksRecordAlways</startargument>
34   - <startargument>-XX:CMSInitiatingOccupancyFraction=75</startargument>
35   - <startargument>-XX:+UseCMSInitiatingOccupancyOnly</startargument>
  20 + <startargument>-XX:+UseG1GC</startargument>
  21 + <startargument>-XX:MaxGCPauseMillis=500</startargument>
  22 + <startargument>-XX:+UseStringDeduplication</startargument>
  23 + <startargument>-XX:+ParallelRefProcEnabled</startargument>
  24 + <startargument>-XX:MaxTenuringThreshold=10</startargument>
36 25 <startargument>-Xms512m</startargument>
37 26 <startargument>-Xmx1024m</startargument>
38 27 <startargument>-jar</startargument>
... ...