Browse Source

Micronaut 4.6 (#9244)

* Micronaut 4.6

* Use GraalVM 21
Denis Stepanov 11 months ago
parent
commit
b8c31e25bc

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

@@ -8,6 +8,6 @@ repositories {
 }
 }
 
 
 dependencies {
 dependencies {
-    implementation "io.micronaut.gradle:micronaut-gradle-plugin:4.3.7"
+    implementation "io.micronaut.gradle:micronaut-gradle-plugin:4.4.2"
     implementation "com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:8.1.1"
     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.5.0
+micronautVersion=4.6.0

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

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

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

@@ -1,12 +1,11 @@
-FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
+FROM container-registry.oracle.com/graalvm/native-image:21
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
 RUN ./gradlew micronaut-data-jdbc:nativeCompile -x test -x internalStartTestResourcesService --no-daemon
 RUN ./gradlew micronaut-data-jdbc:nativeCompile -x test -x internalStartTestResourcesService --no-daemon
 
 
-FROM cgr.dev/chainguard/wolfi-base:latest
 WORKDIR /micronaut
 WORKDIR /micronaut
-COPY --from=build /home/gradle/src/micronaut-data-jdbc/build/native/nativeCompile/micronaut-data-jdbc micronaut
+RUN mv /home/gradle/src/micronaut-data-jdbc/build/native/nativeCompile/micronaut-data-jdbc micronaut
 
 
 EXPOSE 8080
 EXPOSE 8080
 ENV MICRONAUT_ENVIRONMENTS=benchmark
 ENV MICRONAUT_ENVIRONMENTS=benchmark

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

@@ -1,12 +1,11 @@
-FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
+FROM container-registry.oracle.com/graalvm/native-image:21
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
 RUN ./gradlew micronaut-data-mongodb:nativeCompile -x test -x internalStartTestResourcesService --no-daemon
 RUN ./gradlew micronaut-data-mongodb:nativeCompile -x test -x internalStartTestResourcesService --no-daemon
 
 
-FROM cgr.dev/chainguard/wolfi-base:latest
 WORKDIR /micronaut
 WORKDIR /micronaut
-COPY --from=build /home/gradle/src/micronaut-data-mongodb/build/native/nativeCompile/micronaut-data-mongodb micronaut
+RUN mv /home/gradle/src/micronaut-data-mongodb/build/native/nativeCompile/micronaut-data-mongodb micronaut
 
 
 EXPOSE 8080
 EXPOSE 8080
 ENV MICRONAUT_ENVIRONMENTS=benchmark
 ENV MICRONAUT_ENVIRONMENTS=benchmark

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

@@ -1,12 +1,11 @@
-FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
+FROM container-registry.oracle.com/graalvm/native-image:21
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
 RUN ./gradlew micronaut-data-r2dbc:nativeCompile -x test -x internalStartTestResourcesService --no-daemon
 RUN ./gradlew micronaut-data-r2dbc:nativeCompile -x test -x internalStartTestResourcesService --no-daemon
 
 
-FROM cgr.dev/chainguard/wolfi-base:latest
 WORKDIR /micronaut
 WORKDIR /micronaut
-COPY --from=build /home/gradle/src/micronaut-data-r2dbc/build/native/nativeCompile/micronaut-data-r2dbc micronaut
+RUN mv /home/gradle/src/micronaut-data-r2dbc/build/native/nativeCompile/micronaut-data-r2dbc micronaut
 
 
 EXPOSE 8080
 EXPOSE 8080
 ENV MICRONAUT_ENVIRONMENTS=benchmark
 ENV MICRONAUT_ENVIRONMENTS=benchmark

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

@@ -1,13 +1,11 @@
-FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
+FROM container-registry.oracle.com/graalvm/native-image:21
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
 RUN ./gradlew micronaut-vertx-pg-client:nativeCompile -x test -x internalStartTestResourcesService --no-daemon
 RUN ./gradlew micronaut-vertx-pg-client:nativeCompile -x test -x internalStartTestResourcesService --no-daemon
 
 
-FROM cgr.dev/chainguard/wolfi-base:latest
-RUN apk --no-cache update && apk add libstdc++
 WORKDIR /micronaut
 WORKDIR /micronaut
-COPY --from=build /home/gradle/src/micronaut-vertx-pg-client/build/native/nativeCompile/micronaut-vertx-pg-client micronaut
+RUN mv /home/gradle/src/micronaut-vertx-pg-client/build/native/nativeCompile/micronaut-vertx-pg-client micronaut
 
 
 EXPOSE 8080
 EXPOSE 8080
 ENV MICRONAUT_ENVIRONMENTS=benchmark
 ENV MICRONAUT_ENVIRONMENTS=benchmark

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

@@ -1,12 +1,11 @@
-FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
+FROM container-registry.oracle.com/graalvm/native-image:21
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
 RUN ./gradlew micronaut-jdbc:nativeCompile -x test -x internalStartTestResourcesService --no-daemon
 RUN ./gradlew micronaut-jdbc:nativeCompile -x test -x internalStartTestResourcesService --no-daemon
 
 
-FROM cgr.dev/chainguard/wolfi-base:latest
 WORKDIR /micronaut
 WORKDIR /micronaut
-COPY --from=build /home/gradle/src/micronaut-jdbc/build/native/nativeCompile/micronaut-jdbc micronaut
+RUN mv /home/gradle/src/micronaut-jdbc/build/native/nativeCompile/micronaut-jdbc micronaut
 
 
 EXPOSE 8080
 EXPOSE 8080
 ENV MICRONAUT_ENVIRONMENTS=benchmark
 ENV MICRONAUT_ENVIRONMENTS=benchmark

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

@@ -1,12 +1,11 @@
-FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
+FROM container-registry.oracle.com/graalvm/native-image:21
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
 RUN ./gradlew micronaut-r2dbc:nativeCompile -x test --no-daemon
 RUN ./gradlew micronaut-r2dbc:nativeCompile -x test --no-daemon
 
 
-FROM cgr.dev/chainguard/wolfi-base:latest
 WORKDIR /micronaut
 WORKDIR /micronaut
-COPY --from=build /home/gradle/src/micronaut-r2dbc/build/native/nativeCompile/micronaut-r2dbc micronaut
+RUN mv /home/gradle/src/micronaut-r2dbc/build/native/nativeCompile/micronaut-r2dbc micronaut
 
 
 EXPOSE 8080
 EXPOSE 8080
 ENV MICRONAUT_ENVIRONMENTS=benchmark
 ENV MICRONAUT_ENVIRONMENTS=benchmark