Selaa lähdekoodia

Bump Micronaut version, Gradle, JVM, GraalVM (#10029)

Denis Stepanov 1 kuukausi sitten
vanhempi
commit
019490c675

+ 1 - 1
frameworks/Java/micronaut/buildSrc/build.gradle

@@ -8,6 +8,6 @@ repositories {
 }
 
 dependencies {
-    implementation "io.micronaut.gradle:micronaut-gradle-plugin:4.4.4"
+    implementation "io.micronaut.gradle:micronaut-gradle-plugin:4.5.4"
     implementation "com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:8.1.1"
 }

+ 1 - 1
frameworks/Java/micronaut/gradle.properties

@@ -1 +1 @@
-micronautVersion=4.7.1
+micronautVersion=4.9.2

BIN
frameworks/Java/micronaut/gradle/wrapper/gradle-wrapper.jar


+ 1 - 1
frameworks/Java/micronaut/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

+ 5 - 3
frameworks/Java/micronaut/gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -203,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

+ 2 - 0
frameworks/Java/micronaut/gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

+ 1 - 1
frameworks/Java/micronaut/micronaut-data-jdbc-graalvm.dockerfile

@@ -1,4 +1,4 @@
-FROM container-registry.oracle.com/graalvm/native-image:23
+FROM container-registry.oracle.com/graalvm/native-image:24
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src

+ 2 - 2
frameworks/Java/micronaut/micronaut-data-jdbc.dockerfile

@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk17 as build
+FROM gradle:8.14.3-jdk21 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-data-jdbc:build -x test -x internalStartTestResourcesService --no-daemon
 
-FROM openjdk:23
+FROM openjdk:24
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-data-jdbc/build/libs/micronaut-data-jdbc-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh

+ 1 - 1
frameworks/Java/micronaut/micronaut-data-mongodb-graalvm.dockerfile

@@ -1,4 +1,4 @@
-FROM container-registry.oracle.com/graalvm/native-image:23
+FROM container-registry.oracle.com/graalvm/native-image:24
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src

+ 2 - 2
frameworks/Java/micronaut/micronaut-data-mongodb.dockerfile

@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk17 as build
+FROM gradle:8.14.3-jdk21 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-data-mongodb:build -x test -x internalStartTestResourcesService --no-daemon
 
-FROM openjdk:23
+FROM openjdk:24
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-data-mongodb/build/libs/micronaut-data-mongodb-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh

+ 1 - 1
frameworks/Java/micronaut/micronaut-data-r2dbc-graalvm.dockerfile

@@ -1,4 +1,4 @@
-FROM container-registry.oracle.com/graalvm/native-image:23
+FROM container-registry.oracle.com/graalvm/native-image:24
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src

+ 2 - 2
frameworks/Java/micronaut/micronaut-data-r2dbc.dockerfile

@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk17 as build
+FROM gradle:8.14.3-jdk21 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-data-r2dbc:build -x test -x internalStartTestResourcesService --no-daemon
 
-FROM openjdk:23
+FROM openjdk:24
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-data-r2dbc/build/libs/micronaut-data-r2dbc-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh

+ 1 - 1
frameworks/Java/micronaut/micronaut-graalvm.dockerfile

@@ -1,4 +1,4 @@
-FROM container-registry.oracle.com/graalvm/native-image:23
+FROM container-registry.oracle.com/graalvm/native-image:24
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src

+ 1 - 1
frameworks/Java/micronaut/micronaut-jdbc-graalvm.dockerfile

@@ -1,4 +1,4 @@
-FROM container-registry.oracle.com/graalvm/native-image:23
+FROM container-registry.oracle.com/graalvm/native-image:24
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src

+ 2 - 2
frameworks/Java/micronaut/micronaut-jdbc.dockerfile

@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk17 as build
+FROM gradle:8.14.3-jdk21 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-jdbc:build -x test -x internalStartTestResourcesService --no-daemon
 
-FROM openjdk:23
+FROM openjdk:24
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-jdbc/build/libs/micronaut-jdbc-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh

+ 1 - 1
frameworks/Java/micronaut/micronaut-r2dbc-graalvm.dockerfile

@@ -1,4 +1,4 @@
-FROM container-registry.oracle.com/graalvm/native-image:23
+FROM container-registry.oracle.com/graalvm/native-image:24
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src

+ 2 - 2
frameworks/Java/micronaut/micronaut-r2dbc.dockerfile

@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk17 as build
+FROM gradle:8.14.3-jdk21 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-r2dbc:build -x test -x internalStartTestResourcesService --no-daemon
 
-FROM openjdk:23
+FROM openjdk:24
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-r2dbc/build/libs/micronaut-r2dbc-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh

+ 2 - 2
frameworks/Java/micronaut/micronaut.dockerfile

@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk17 as build
+FROM gradle:8.14.3-jdk21 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-vertx-pg-client:build -x test -x internalStartTestResourcesService --no-daemon
 
-FROM openjdk:21
+FROM openjdk:24
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-vertx-pg-client/build/libs/micronaut-vertx-pg-client-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh