diff --git a/build.gradle b/build.gradle index 9ae3798..c8000a7 100644 --- a/build.gradle +++ b/build.gradle @@ -6,10 +6,10 @@ buildscript { } } plugins { - id 'org.springframework.boot' version '3.1.5' - id 'io.spring.dependency-management' version '1.0.15.RELEASE' + id 'org.springframework.boot' version '3.3.1' + id 'io.spring.dependency-management' version '1.1.6' id 'java' - id 'com.vaadin' version '24.3.3' + id 'com.vaadin' version '24.4.4' id 'org.graalvm.buildtools.native' version '0.10.2' } group = 'com.ModeratorElection' @@ -23,7 +23,7 @@ repositories { } ext { - set('vaadinVersion', '24.3.3') + set('vaadinVersion', '24.4.4') } configurations { @@ -51,11 +51,12 @@ dependencyManagement { tasks.named('test') { useJUnitPlatform() + jvmArgs "-Xshare:off" } java { toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(22) } } @@ -63,11 +64,13 @@ graalvmNative { binaries { main { mainClass = 'com.ModeratorElection.MEApplication' + buildArgs.add("-march=native") + buildArgs.add("-R:MaxHeapSize=6442450944") fallback = false imageName.set('ModeratorElection') //javaLauncher @JavaExec :: Configures the java executable to be used to run the tests. javaLauncher.set(javaToolchains.launcherFor { - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(22)) //vendor.set(JvmVendorSpec.GRAAL_VM) }) } @@ -76,9 +79,11 @@ graalvmNative { toolchainDetection = false } -//tasks.withType(JavaCompile) { -// options.compilerArgs += ['-Xlint:deprecation','-Xlint:unchecked'] -//} +/*tasks.withType(JavaCompile) { + options.compilerArgs += ['-Xlint:deprecation'] + //,'-Xlint:unchecked' +}*/ + /* task runApp(type: JavaExec) { classpath = sourceSets.main.runtimeClasspath diff --git a/gradle.properties b/gradle.properties index 2ecf910..9e355a9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -vaadinVersion=24.3.3 +vaadinVersion=24.4.4 diff --git a/image/resources/install.sh b/image/resources/install.sh index 296440b..b82a44c 100755 --- a/image/resources/install.sh +++ b/image/resources/install.sh @@ -5,7 +5,6 @@ set -exo pipefail function main() { upgradeSystem - #openjdk-17-jdk-headless, no need, we are installing graalvm #unzpip only necessary for gradle installation within main() apt-get -qqy install curl git build-essential libz-dev zlib1g-dev mkdir /usr/local/src/ModeratorElection @@ -20,15 +19,10 @@ function main() #curl -SsLo /tmp/gradle-${gradle_version}-bin.zip.sha256 https://services.gradle.org/distributions/gradle-${gradle_version}-bin.zip.sha256 #download graalvm - #oracle graalvm-jdk, v17.0.11, 2024-06-14 - graalvm_JDK_version="17" - curl -SsLo /tmp/graalvm-jdk-${graalvm_JDK_version}_linux-x64_bin.tar.gz https://download.oracle.com/graalvm/${graalvm_JDK_version}/latest/graalvm-jdk-${graalvm_JDK_version}_linux-x64_bin.tar.gz - curl -SsLo /tmp/graalvm-jdk-${graalvm_JDK_version}_linux-x64_bin.tar.gz.sha256 https://download.oracle.com/graalvm/${graalvm_JDK_version}/latest/graalvm-jdk-${graalvm_JDK_version}_linux-x64_bin.tar.gz.sha256 - - #graalvm-community-jdk, v17.0.8, 2023-07-25 - #graalvm_jdk_version="17.0.8" - #curl -SsLo /tmp/graalvm-community-jdk.tar.gz https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${graalvm_jdk_version}/graalvm-community-jdk-${graalvm_jdk_version}_linux-x64_bin.tar.gz - #curl -SsLo /tmp/graalvm-checksum https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${graalvm_jdk_version}/graalvm-community-jdk-${graalvm_jdk_version}_linux-x64_bin.tar.gz.sha256 + #graalvm-community-jdk, v22.0.1 2024-04-16 + graalvm_jdk_version="22.0.1" + curl -SsLo /tmp/graalvm-community-jdk.tar.gz https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${graalvm_jdk_version}/graalvm-community-jdk-${graalvm_jdk_version}_linux-x64_bin.tar.gz + curl -SsLo /tmp/graalvm-checksum https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${graalvm_jdk_version}/graalvm-community-jdk-${graalvm_jdk_version}_linux-x64_bin.tar.gz.sha256 #checksum graalvm checksum @@ -36,13 +30,9 @@ function main() #install graalvm graalvm_inst - #echo "export PATH=$PATH:/usr/lib/jvm/$dirname_graalvm/lib/svm/bin"|tee -a /root/.bashrc - #possibility to install js, node.js,... to graalvm using "gu" - #"gu available" shows available components, native-image is one part of it - #echo "export PATH=$PATH:/usr/lib/jvm/graalvm-jdk-17.0.11+7.1/lib/installer/bin/gu"|tee -a /root/.bashrc - #/usr/lib/jvm/$dirname_graalvm/lib/svm/bin/native-image --version - + #nativeCompile buildproc + cleanupDocker } > /dev/null