meissa/ModeratorElection
6
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

[skip ci] Bump to latest versions: springframework, spring.dependency-management, com.vaadin, java/graalvm 22

Browse source
This commit is contained in:
Mirco 2024-07-09 09:02:32 +02:00
parent 4b64fed80a
commit fbf5ca1cac
3 changed files with 21 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
build.gradle
View file

@ -6,10 +6,10 @@ buildscript {
} }
} }
plugins { plugins {
id 'org.springframework.boot' version '3.1.5' id 'org.springframework.boot' version '3.3.1'
id 'io.spring.dependency-management' version '1.0.15.RELEASE' id 'io.spring.dependency-management' version '1.1.6'
id 'java' 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' id 'org.graalvm.buildtools.native' version '0.10.2'
} }
group = 'com.ModeratorElection' group = 'com.ModeratorElection'
@ -23,7 +23,7 @@ repositories {
} }
ext { ext {
set('vaadinVersion', '24.3.3') set('vaadinVersion', '24.4.4')
} }
configurations { configurations {
@ -51,11 +51,12 @@ dependencyManagement {
tasks.named('test') { tasks.named('test') {
useJUnitPlatform() useJUnitPlatform()
jvmArgs "-Xshare:off"
} }
java { java {
toolchain { toolchain {
languageVersion = JavaLanguageVersion.of(17) languageVersion = JavaLanguageVersion.of(22)
} }
} }
@ -63,11 +64,13 @@ graalvmNative {
binaries { binaries {
main { main {
mainClass = 'com.ModeratorElection.MEApplication' mainClass = 'com.ModeratorElection.MEApplication'
buildArgs.add("-march=native")
buildArgs.add("-R:MaxHeapSize=6442450944")
fallback = false fallback = false
imageName.set('ModeratorElection') imageName.set('ModeratorElection')
//javaLauncher @JavaExec :: Configures the java executable to be used to run the tests. //javaLauncher @JavaExec :: Configures the java executable to be used to run the tests.
javaLauncher.set(javaToolchains.launcherFor { javaLauncher.set(javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(17)) languageVersion.set(JavaLanguageVersion.of(22))
//vendor.set(JvmVendorSpec.GRAAL_VM) //vendor.set(JvmVendorSpec.GRAAL_VM)
}) })
} }
@ -76,9 +79,11 @@ graalvmNative {
toolchainDetection = false toolchainDetection = false
} }
//tasks.withType(JavaCompile) { /*tasks.withType(JavaCompile) {
// options.compilerArgs += ['-Xlint:deprecation','-Xlint:unchecked'] options.compilerArgs += ['-Xlint:deprecation']
//} //,'-Xlint:unchecked'
}*/
/* /*
task runApp(type: JavaExec) { task runApp(type: JavaExec) {
classpath = sourceSets.main.runtimeClasspath classpath = sourceSets.main.runtimeClasspath

2
gradle.properties
View file

@ -1 +1 @@
vaadinVersion=24.3.3 vaadinVersion=24.4.4

22
image/resources/install.sh
View file

@ -5,7 +5,6 @@ set -exo pipefail
function main() function main()
{ {
upgradeSystem upgradeSystem
#openjdk-17-jdk-headless, no need, we are installing graalvm
#unzpip only necessary for gradle installation within main() #unzpip only necessary for gradle installation within main()
apt-get -qqy install curl git build-essential libz-dev zlib1g-dev apt-get -qqy install curl git build-essential libz-dev zlib1g-dev
mkdir /usr/local/src/ModeratorElection 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 #curl -SsLo /tmp/gradle-${gradle_version}-bin.zip.sha256 https://services.gradle.org/distributions/gradle-${gradle_version}-bin.zip.sha256
#download graalvm #download graalvm
#oracle graalvm-jdk, v17.0.11, 2024-06-14 #graalvm-community-jdk, v22.0.1 2024-04-16
graalvm_JDK_version="17" graalvm_jdk_version="22.0.1"
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-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-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 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, 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
#checksum graalvm #checksum graalvm
checksum checksum
@ -36,13 +30,9 @@ function main()
#install graalvm #install graalvm
graalvm_inst graalvm_inst
#echo "export PATH=$PATH:/usr/lib/jvm/$dirname_graalvm/lib/svm/bin"|tee -a /root/.bashrc #nativeCompile
#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
buildproc buildproc
cleanupDocker cleanupDocker
} > /dev/null } > /dev/null