Commit440527e

authored

Merge pull request#1659 from joreilly/bump-java-used-on-the-server

Use Java 25 on the server

2 parents601b39f +4e500a2 commit440527eCopy full SHA for 440527e

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ fun buildImage(`
`28`	`28`	`Containerizer.to(DockerDaemonImage.named(imageRef))`
`29`	`29`	`}`
`30`	`30`
`31`		`-Jib.from("openjdk:17-alpine")`
	`31`	`+Jib.from("azul/zulu-openjdk:25")`
`32`	`32`	`.addLayer(listOf(path),AbsoluteUnixPath.get("/"))`
`33`	`33`	`.addLayer(runtimeClasspath.map { it.file.toPath() },AbsoluteUnixPath.get("/classpath"))`
`34`	`34`	`.setEntrypoint(`

1.83 KB

Binary file not shown.

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`distributionBase=GRADLE_USER_HOME`
`2`	`2`	`distributionPath=wrapper/dists`
`3`		`-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531`
`4`		`-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip`
	`3`	`+distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444`
	`4`	`+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip`
`5`	`5`	`networkTimeout=10000`
`6`	`6`	`validateDistributionUrl=true`
`7`	`7`	`zipStoreBase=GRADLE_USER_HOME`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`	`3`	`#`
`4`		`-# Copyright © 2015-2021 the original authors.`
	`4`	`+# Copyright © 2015 the original authors.`
`5`	`5`	`#`
`6`	`6`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`7`	`7`	`# you may not use this file except in compliance with the License.`
`@@ -114,7 +114,6 @@ case "$( uname )" in #(`
`114`	`114`	`NONSTOP* ) nonstop=true ;;`
`115`	`115`	`esac`
`116`	`116`
`117`		`-CLASSPATH="\\\"\\\""`
`118`	`117`
`119`	`118`
`120`	`119`	`# Determine the Java command to use to start the JVM.`
`@@ -172,7 +171,6 @@ fi`
`172`	`171`	`# For Cygwin or MSYS, switch paths to Windows format before running java`
`173`	`172`	`if"$cygwin"\|\|"$msys";then`
`174`	`173`	`APP_HOME=$( cygpath --path --mixed"$APP_HOME")`
`175`		`- CLASSPATH=$( cygpath --path --mixed"$CLASSPATH")`
`176`	`174`
`177`	`175`	`JAVACMD=$( cygpath --unix"$JAVACMD")`
`178`	`176`
`@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'`
`212`	`210`
`213`	`211`	`set -- \`
`214`	`212`	`"-Dorg.gradle.appname=$APP_BASE_NAME" \`
`215`		`- -classpath"$CLASSPATH" \`
`216`	`213`	`-jar"$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \`
`217`	`214`	`"$@"`
`218`	`215`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,11 +70,10 @@ goto fail`
`70`	`70`	`:execute`
`71`	`71`	`@rem Setup the command line`
`72`	`72`
`73`		`-setCLASSPATH=`
`74`	`73`
`75`	`74`
`76`	`75`	`@rem Execute Gradle`
`77`		`-"%JAVA_EXE%"%DEFAULT_JVM_OPTS%%JAVA_OPTS%%GRADLE_OPTS%"-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath"%CLASSPATH%" -jar"%APP_HOME%\gradle\wrapper\gradle-wrapper.jar"%*`
	`76`	`+"%JAVA_EXE%"%DEFAULT_JVM_OPTS%%JAVA_OPTS%%GRADLE_OPTS%"-Dorg.gradle.appname=%APP_BASE_NAME%" -jar"%APP_HOME%\gradle\wrapper\gradle-wrapper.jar"%*`
`78`	`77`
`79`	`78`	`:end`
`80`	`79`	`@rem End local scope for the variables with windows NT shell`

Comments

(0)