diff --git a/script/server.sh b/script/server.sh index 906877c..4274eb8 100755 --- a/script/server.sh +++ b/script/server.sh @@ -23,6 +23,6 @@ chmod 400 server-icon.png chmod 400 wepif.yml while true; do - java -Xmx1800M -Xss8M -Xtune:virtualized -Xaggressive -Xcompressedrefs -Xdump:heap+java+snap:none -Xdump:tool:events=throw+systhrow,filter=java/lang/OutOfMemoryError,exec="kill -9 %pid" -Xgc:concurrentScavenge -Xgc:dnssExpectedTimeRatioMaximum=3 -Xgc:scvNoAdaptiveTenure -Xdisableexplicitgc -Xshareclasses -Xshareclasses:noPersistentDiskSpaceCheck -XX:MaxDirectMemorySize=128M -XX:+ClassRelationshipVerifier -XX:+UseContainerSupport -DPaper.IgnoreJavaVersion=true -Dpaper.playerconnection.keepalive=360 -DIReallyKnowWhatIAmDoingISwear -jar server.jar nogui + java -Xmx1800M -Xss8M -Xtune:virtualized -Xaggressive -Xcompressedrefs -Xdump:heap+java+snap:none -Xdump:tool:events=throw+systhrow,filter=java/lang/OutOfMemoryError,exec="kill -9 %pid" -Xgc:concurrentScavenge -Xgc:dnssExpectedTimeRatioMaximum=3 -Xgc:scvNoAdaptiveTenure -Xdisableexplicitgc -Xshareclasses -Xshareclasses:noPersistentDiskSpaceCheck -XX:MaxDirectMemorySize=128M -XX:+ClassRelationshipVerifier -XX:+GlobalLockReservation -XX:+UseContainerSupport -DPaper.IgnoreJavaVersion=true -Dpaper.playerconnection.keepalive=360 -DIReallyKnowWhatIAmDoingISwear -jar server.jar nogui sleep 1 done diff --git a/vendor/generate_jre.sh b/vendor/generate_jre.sh index 8bcd6bd..2661714 100755 --- a/vendor/generate_jre.sh +++ b/vendor/generate_jre.sh @@ -3,7 +3,7 @@ # This script is used as a reference to generate a stripped-down OpenJ9 JRE for the server rm -rf java/ -wget https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14%2B36.1_openj9-0.19.0/OpenJDK14U-jdk_x64_linux_openj9_14_36_openj9-0.19.0.tar.gz +wget https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.1%2B7_openj9-0.20.0/OpenJDK14U-jdk_x64_linux_openj9_14.0.1_7_openj9-0.20.0.tar.gz tar -zxvf OpenJDK* rm OpenJDK* mv jdk* jdk/ diff --git a/vendor/java/bin/java b/vendor/java/bin/java index fe56654..b8626f3 100755 Binary files a/vendor/java/bin/java and b/vendor/java/bin/java differ diff --git a/vendor/java/lib/compressedrefs/j9ddr.dat b/vendor/java/lib/compressedrefs/j9ddr.dat index c734dc2..e58566b 100644 Binary files a/vendor/java/lib/compressedrefs/j9ddr.dat and b/vendor/java/lib/compressedrefs/j9ddr.dat differ diff --git a/vendor/java/lib/compressedrefs/libj9dmp29.so b/vendor/java/lib/compressedrefs/libj9dmp29.so index 1146dd1..cacf34a 100644 Binary files a/vendor/java/lib/compressedrefs/libj9dmp29.so and b/vendor/java/lib/compressedrefs/libj9dmp29.so differ diff --git a/vendor/java/lib/compressedrefs/libj9gc29.so b/vendor/java/lib/compressedrefs/libj9gc29.so index c351039..480b87f 100644 Binary files a/vendor/java/lib/compressedrefs/libj9gc29.so and b/vendor/java/lib/compressedrefs/libj9gc29.so differ diff --git a/vendor/java/lib/compressedrefs/libj9gcchk29.so b/vendor/java/lib/compressedrefs/libj9gcchk29.so index 5abbb02..4c2652d 100644 Binary files a/vendor/java/lib/compressedrefs/libj9gcchk29.so and b/vendor/java/lib/compressedrefs/libj9gcchk29.so differ diff --git a/vendor/java/lib/compressedrefs/libj9hookable29.so b/vendor/java/lib/compressedrefs/libj9hookable29.so index dc3b1ef..a4de42c 100644 Binary files a/vendor/java/lib/compressedrefs/libj9hookable29.so and b/vendor/java/lib/compressedrefs/libj9hookable29.so differ diff --git a/vendor/java/lib/compressedrefs/libj9jit29.so b/vendor/java/lib/compressedrefs/libj9jit29.so index 5e830f5..5c9ff29 100644 Binary files a/vendor/java/lib/compressedrefs/libj9jit29.so and b/vendor/java/lib/compressedrefs/libj9jit29.so differ diff --git a/vendor/java/lib/compressedrefs/libj9jnichk29.so b/vendor/java/lib/compressedrefs/libj9jnichk29.so index 6313de0..a77582e 100644 Binary files a/vendor/java/lib/compressedrefs/libj9jnichk29.so and b/vendor/java/lib/compressedrefs/libj9jnichk29.so differ diff --git a/vendor/java/lib/compressedrefs/libj9jvmti29.so b/vendor/java/lib/compressedrefs/libj9jvmti29.so index c101cdd..1d09d5f 100644 Binary files a/vendor/java/lib/compressedrefs/libj9jvmti29.so and b/vendor/java/lib/compressedrefs/libj9jvmti29.so differ diff --git a/vendor/java/lib/compressedrefs/libj9prt29.so b/vendor/java/lib/compressedrefs/libj9prt29.so index 0d8c5a1..bbbfa99 100644 Binary files a/vendor/java/lib/compressedrefs/libj9prt29.so and b/vendor/java/lib/compressedrefs/libj9prt29.so differ diff --git a/vendor/java/lib/compressedrefs/libj9shr29.so b/vendor/java/lib/compressedrefs/libj9shr29.so index eb4b3cc..c742959 100644 Binary files a/vendor/java/lib/compressedrefs/libj9shr29.so and b/vendor/java/lib/compressedrefs/libj9shr29.so differ diff --git a/vendor/java/lib/compressedrefs/libj9trc29.so b/vendor/java/lib/compressedrefs/libj9trc29.so index 5297808..cc1c2e1 100644 Binary files a/vendor/java/lib/compressedrefs/libj9trc29.so and b/vendor/java/lib/compressedrefs/libj9trc29.so differ diff --git a/vendor/java/lib/compressedrefs/libj9vm29.so b/vendor/java/lib/compressedrefs/libj9vm29.so index 5ae7535..966129a 100644 Binary files a/vendor/java/lib/compressedrefs/libj9vm29.so and b/vendor/java/lib/compressedrefs/libj9vm29.so differ diff --git a/vendor/java/lib/compressedrefs/libj9vmchk29.so b/vendor/java/lib/compressedrefs/libj9vmchk29.so index 71bf804..2d5fc16 100644 Binary files a/vendor/java/lib/compressedrefs/libj9vmchk29.so and b/vendor/java/lib/compressedrefs/libj9vmchk29.so differ diff --git a/vendor/java/lib/compressedrefs/libj9vrb29.so b/vendor/java/lib/compressedrefs/libj9vrb29.so index c7e795f..ee20941 100644 Binary files a/vendor/java/lib/compressedrefs/libj9vrb29.so and b/vendor/java/lib/compressedrefs/libj9vrb29.so differ diff --git a/vendor/java/lib/compressedrefs/libj9zlib29.so b/vendor/java/lib/compressedrefs/libj9zlib29.so index d739a35..f16580e 100644 Binary files a/vendor/java/lib/compressedrefs/libj9zlib29.so and b/vendor/java/lib/compressedrefs/libj9zlib29.so differ diff --git a/vendor/java/lib/compressedrefs/libjclse29.so b/vendor/java/lib/compressedrefs/libjclse29.so index 56b2a70..3c3ff6a 100644 Binary files a/vendor/java/lib/compressedrefs/libjclse29.so and b/vendor/java/lib/compressedrefs/libjclse29.so differ diff --git a/vendor/java/lib/compressedrefs/libjvm.so b/vendor/java/lib/compressedrefs/libjvm.so index 6e855e6..361fba9 100644 Binary files a/vendor/java/lib/compressedrefs/libjvm.so and b/vendor/java/lib/compressedrefs/libjvm.so differ diff --git a/vendor/java/lib/compressedrefs/libmanagement.so b/vendor/java/lib/compressedrefs/libmanagement.so deleted file mode 100644 index 5935e36..0000000 Binary files a/vendor/java/lib/compressedrefs/libmanagement.so and /dev/null differ diff --git a/vendor/java/lib/compressedrefs/libmanagement_ext.so b/vendor/java/lib/compressedrefs/libmanagement_ext.so deleted file mode 100644 index 261dc3a..0000000 Binary files a/vendor/java/lib/compressedrefs/libmanagement_ext.so and /dev/null differ diff --git a/vendor/java/lib/j9vm/libjsig.so b/vendor/java/lib/j9vm/libjsig.so index a434663..b5389f7 100644 Binary files a/vendor/java/lib/j9vm/libjsig.so and b/vendor/java/lib/j9vm/libjsig.so differ diff --git a/vendor/java/lib/j9vm/libjvm.so b/vendor/java/lib/j9vm/libjvm.so index 7ca3bbf..dbf6cff 100644 Binary files a/vendor/java/lib/j9vm/libjvm.so and b/vendor/java/lib/j9vm/libjvm.so differ diff --git a/vendor/java/lib/java.properties b/vendor/java/lib/java.properties index 8d1983d..e162165 100644 --- a/vendor/java/lib/java.properties +++ b/vendor/java/lib/java.properties @@ -1,4 +1,4 @@ -#Wed Mar 18 19:15:21 UTC 2020 +#Thu Apr 16 13:41:43 UTC 2020 EXEL070=ROM image is wrong version EXEL079=\ -Xscmx set size of new shared class cache to J9VM151=Failed to open jimage library diff --git a/vendor/java/lib/jexec b/vendor/java/lib/jexec index a3bff7a..1161271 100755 Binary files a/vendor/java/lib/jexec and b/vendor/java/lib/jexec differ diff --git a/vendor/java/lib/jrt-fs.jar b/vendor/java/lib/jrt-fs.jar index 52a537b..264e31f 100644 Binary files a/vendor/java/lib/jrt-fs.jar and b/vendor/java/lib/jrt-fs.jar differ diff --git a/vendor/java/lib/jspawnhelper b/vendor/java/lib/jspawnhelper index cfc656e..513cb1f 100755 Binary files a/vendor/java/lib/jspawnhelper and b/vendor/java/lib/jspawnhelper differ diff --git a/vendor/java/lib/libawt.so b/vendor/java/lib/libawt.so index 79c99cc..3470a9c 100644 Binary files a/vendor/java/lib/libawt.so and b/vendor/java/lib/libawt.so differ diff --git a/vendor/java/lib/libawt_headless.so b/vendor/java/lib/libawt_headless.so index 0dcf5c7..6b7339f 100644 Binary files a/vendor/java/lib/libawt_headless.so and b/vendor/java/lib/libawt_headless.so differ diff --git a/vendor/java/lib/libawt_xawt.so b/vendor/java/lib/libawt_xawt.so index c0cc34d..89a856d 100644 Binary files a/vendor/java/lib/libawt_xawt.so and b/vendor/java/lib/libawt_xawt.so differ diff --git a/vendor/java/lib/libfontmanager.so b/vendor/java/lib/libfontmanager.so index 7771254..51d2aff 100644 Binary files a/vendor/java/lib/libfontmanager.so and b/vendor/java/lib/libfontmanager.so differ diff --git a/vendor/java/lib/libfreetype.so b/vendor/java/lib/libfreetype.so index 0efe887..501c04e 100644 Binary files a/vendor/java/lib/libfreetype.so and b/vendor/java/lib/libfreetype.so differ diff --git a/vendor/java/lib/libjava.so b/vendor/java/lib/libjava.so index aea5017..6d35800 100644 Binary files a/vendor/java/lib/libjava.so and b/vendor/java/lib/libjava.so differ diff --git a/vendor/java/lib/libjavajpeg.so b/vendor/java/lib/libjavajpeg.so index ddd3f15..0ee8a20 100644 Binary files a/vendor/java/lib/libjavajpeg.so and b/vendor/java/lib/libjavajpeg.so differ diff --git a/vendor/java/lib/libjawt.so b/vendor/java/lib/libjawt.so index 22ed8ab..6b2bcf6 100644 Binary files a/vendor/java/lib/libjawt.so and b/vendor/java/lib/libjawt.so differ diff --git a/vendor/java/lib/libjimage.so b/vendor/java/lib/libjimage.so index d28d96e..650dbf8 100644 Binary files a/vendor/java/lib/libjimage.so and b/vendor/java/lib/libjimage.so differ diff --git a/vendor/java/lib/libjli.so b/vendor/java/lib/libjli.so index 3c66aa6..f31a0b3 100644 Binary files a/vendor/java/lib/libjli.so and b/vendor/java/lib/libjli.so differ diff --git a/vendor/java/lib/libjncrypto.so b/vendor/java/lib/libjncrypto.so index d10da06..7b2bf8b 100644 Binary files a/vendor/java/lib/libjncrypto.so and b/vendor/java/lib/libjncrypto.so differ diff --git a/vendor/java/lib/libjsig.so b/vendor/java/lib/libjsig.so index a434663..b5389f7 100644 Binary files a/vendor/java/lib/libjsig.so and b/vendor/java/lib/libjsig.so differ diff --git a/vendor/java/lib/libjsound.so b/vendor/java/lib/libjsound.so index 0c1e7b7..89aac39 100644 Binary files a/vendor/java/lib/libjsound.so and b/vendor/java/lib/libjsound.so differ diff --git a/vendor/java/lib/liblcms.so b/vendor/java/lib/liblcms.so index 1545aea..3831135 100644 Binary files a/vendor/java/lib/liblcms.so and b/vendor/java/lib/liblcms.so differ diff --git a/vendor/java/lib/libmanagement.so b/vendor/java/lib/libmanagement.so new file mode 100644 index 0000000..7c7175a Binary files /dev/null and b/vendor/java/lib/libmanagement.so differ diff --git a/vendor/java/lib/libmlib_image.so b/vendor/java/lib/libmlib_image.so index 3f97f8f..c94e77d 100644 Binary files a/vendor/java/lib/libmlib_image.so and b/vendor/java/lib/libmlib_image.so differ diff --git a/vendor/java/lib/libnet.so b/vendor/java/lib/libnet.so index 11567dc..2022845 100644 Binary files a/vendor/java/lib/libnet.so and b/vendor/java/lib/libnet.so differ diff --git a/vendor/java/lib/libnio.so b/vendor/java/lib/libnio.so index 0f7adb7..bc1ca0a 100644 Binary files a/vendor/java/lib/libnio.so and b/vendor/java/lib/libnio.so differ diff --git a/vendor/java/lib/libprefs.so b/vendor/java/lib/libprefs.so index 24716d9..17e0f6d 100644 Binary files a/vendor/java/lib/libprefs.so and b/vendor/java/lib/libprefs.so differ diff --git a/vendor/java/lib/libsplashscreen.so b/vendor/java/lib/libsplashscreen.so index 75c148f..974c1de 100644 Binary files a/vendor/java/lib/libsplashscreen.so and b/vendor/java/lib/libsplashscreen.so differ diff --git a/vendor/java/lib/libsunec.so b/vendor/java/lib/libsunec.so index e4b760b..15e3c57 100644 Binary files a/vendor/java/lib/libsunec.so and b/vendor/java/lib/libsunec.so differ diff --git a/vendor/java/lib/libverify.so b/vendor/java/lib/libverify.so index 8f02cc2..375564b 100644 Binary files a/vendor/java/lib/libverify.so and b/vendor/java/lib/libverify.so differ diff --git a/vendor/java/lib/libzip.so b/vendor/java/lib/libzip.so index 889fd42..6f382ef 100644 Binary files a/vendor/java/lib/libzip.so and b/vendor/java/lib/libzip.so differ diff --git a/vendor/java/lib/modules b/vendor/java/lib/modules index 478eb1b..11b7596 100644 Binary files a/vendor/java/lib/modules and b/vendor/java/lib/modules differ diff --git a/vendor/java/lib/server/libjsig.so b/vendor/java/lib/server/libjsig.so index a434663..b5389f7 100644 Binary files a/vendor/java/lib/server/libjsig.so and b/vendor/java/lib/server/libjsig.so differ diff --git a/vendor/java/lib/server/libjvm.so b/vendor/java/lib/server/libjvm.so index 7ca3bbf..dbf6cff 100644 Binary files a/vendor/java/lib/server/libjvm.so and b/vendor/java/lib/server/libjvm.so differ diff --git a/vendor/java/release b/vendor/java/release index 5728c7c..7159b97 100644 --- a/vendor/java/release +++ b/vendor/java/release @@ -1,2 +1,2 @@ -JAVA_VERSION="14" +JAVA_VERSION="14.0.1" MODULES="java.base java.datatransfer java.xml java.prefs java.desktop java.logging java.management java.security.sasl java.naming java.net.http java.scripting java.transaction.xa java.sql jdk.crypto.ec jdk.unsupported jdk.zipfs openj9.sharedclasses"