Browse Source

Micronaut to 4.4.2 and Upgrades (#8778)

* Micronaut Upgrades

- Micronaut to 4.3.4
- Micronaut Gradle plugin to latest
- Unpin micronaut-data-mongodb
- Update Gradle to 8.6

* Update frameworks/Java/micronaut/gradle.properties

Co-authored-by: Sergio del Amo <[email protected]>

* Apply suggestions from code review

Co-authored-by: Sergio del Amo <[email protected]>

* Tie Graal docker images to 21

I don't think the Gradle we're using uses 22 yet

* Micronaut 4.4.1, Gradle 8.7, update dockerfiles for graal

* Gradle 8.7

* Update gradle plugin

* Try and trigger pipelines on my fork

* Update frameworks/Java/micronaut/gradle.properties

Co-authored-by: Sergio del Amo <[email protected]>

---------

Co-authored-by: Sergio del Amo <[email protected]>
Tim Yates 1 year ago
parent
commit
f2b0b607ac

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

@@ -8,6 +8,6 @@ repositories {
 }
 
 dependencies {
-    implementation "io.micronaut.gradle:micronaut-gradle-plugin:4.0.1"
-    implementation "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
+    implementation "io.micronaut.gradle:micronaut-gradle-plugin:4.3.7"
+    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.2.2
+micronautVersion=4.4.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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

+ 10 - 10
frameworks/Java/micronaut/gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

+ 4 - 5
frameworks/Java/micronaut/micronaut-data-jdbc-graalvm.dockerfile

@@ -1,11 +1,10 @@
-FROM ghcr.io/graalvm/graalvm-community:latest as build
+FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
+RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
-RUN ./gradlew  --no-daemon
-RUN ./gradlew micronaut-data-jdbc:nativeBuild -x test --no-daemon
+RUN ./gradlew micronaut-data-jdbc:nativeCompile -x test --no-daemon
 
-FROM frolvlad/alpine-glibc:glibc-2.34
-RUN apk --no-cache update && apk add libstdc++
+FROM cgr.dev/chainguard/wolfi-base:latest
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-data-jdbc/build/native/nativeCompile/micronaut-data-jdbc micronaut
 

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

@@ -1,4 +1,4 @@
-FROM gradle:8.1.0-jdk17 as build
+FROM gradle:8.7.0-jdk17 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-data-jdbc:build -x test --no-daemon

+ 4 - 5
frameworks/Java/micronaut/micronaut-data-mongodb-graalvm.dockerfile

@@ -1,11 +1,10 @@
-FROM ghcr.io/graalvm/graalvm-community:latest as build
+FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
+RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
-RUN ./gradlew  --no-daemon
-RUN ./gradlew micronaut-data-mongodb:nativeBuild -x test --no-daemon
+RUN ./gradlew micronaut-data-mongodb:nativeCompile -x test --no-daemon
 
-FROM frolvlad/alpine-glibc:glibc-2.34
-RUN apk --no-cache update && apk add libstdc++
+FROM cgr.dev/chainguard/wolfi-base:latest
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-data-mongodb/build/native/nativeCompile/micronaut-data-mongodb micronaut
 

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

@@ -1,4 +1,4 @@
-FROM gradle:8.1.0-jdk17 as build
+FROM gradle:8.7.0-jdk17 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-data-mongodb:build -x test --no-daemon

+ 1 - 1
frameworks/Java/micronaut/micronaut-data-mongodb/build.gradle

@@ -4,6 +4,6 @@ plugins {
 
 dependencies {
     annotationProcessor("io.micronaut.data:micronaut-data-document-processor")
-    implementation("io.micronaut.data:micronaut-data-mongodb:3.8.1")
+    implementation("io.micronaut.data:micronaut-data-mongodb")
     runtimeOnly("io.micronaut.mongodb:micronaut-mongo-sync")
 }

+ 4 - 5
frameworks/Java/micronaut/micronaut-data-r2dbc-graalvm.dockerfile

@@ -1,11 +1,10 @@
-FROM ghcr.io/graalvm/graalvm-community:latest as build
+FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
+RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
-RUN ./gradlew  --no-daemon
-RUN ./gradlew micronaut-data-r2dbc:nativeBuild -x test --no-daemon
+RUN ./gradlew micronaut-data-r2dbc:nativeCompile -x test --no-daemon
 
-FROM frolvlad/alpine-glibc:glibc-2.34
-RUN apk --no-cache update && apk add libstdc++
+FROM cgr.dev/chainguard/wolfi-base:latest
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-data-r2dbc/build/native/nativeCompile/micronaut-data-r2dbc micronaut
 

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

@@ -1,4 +1,4 @@
-FROM gradle:8.1.0-jdk17 as build
+FROM gradle:8.7.0-jdk17 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-data-r2dbc:build -x test --no-daemon

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

@@ -1,10 +1,10 @@
-FROM ghcr.io/graalvm/graalvm-community:latest as build
+FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
+RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
-RUN ./gradlew  --no-daemon
-RUN ./gradlew micronaut-vertx-pg-client:nativeBuild -x test --no-daemon
+RUN ./gradlew micronaut-vertx-pg-client:nativeCompile -x test --no-daemon
 
-FROM frolvlad/alpine-glibc:glibc-2.34
+FROM cgr.dev/chainguard/wolfi-base:latest
 RUN apk --no-cache update && apk add libstdc++
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-vertx-pg-client/build/native/nativeCompile/micronaut-vertx-pg-client micronaut

+ 4 - 5
frameworks/Java/micronaut/micronaut-jdbc-graalvm.dockerfile

@@ -1,11 +1,10 @@
-FROM ghcr.io/graalvm/graalvm-community:latest as build
+FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
+RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
-RUN ./gradlew  --no-daemon
-RUN ./gradlew micronaut-jdbc:nativeBuild -x test --no-daemon
+RUN ./gradlew micronaut-jdbc:nativeCompile -x test --no-daemon
 
-FROM frolvlad/alpine-glibc:glibc-2.34
-RUN apk --no-cache update && apk add libstdc++
+FROM cgr.dev/chainguard/wolfi-base:latest
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-jdbc/build/native/nativeCompile/micronaut-jdbc micronaut
 

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

@@ -1,4 +1,4 @@
-FROM gradle:8.1.0-jdk17 as build
+FROM gradle:8.7.0-jdk17 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-jdbc:build -x test --no-daemon

+ 4 - 5
frameworks/Java/micronaut/micronaut-r2dbc-graalvm.dockerfile

@@ -1,11 +1,10 @@
-FROM ghcr.io/graalvm/graalvm-community:latest as build
+FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
+RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
-RUN ./gradlew  --no-daemon
-RUN ./gradlew micronaut-r2dbc:nativeBuild -x test --no-daemon
+RUN ./gradlew micronaut-r2dbc:nativeCompile -x test --no-daemon
 
-FROM frolvlad/alpine-glibc:glibc-2.34
-RUN apk --no-cache update && apk add libstdc++
+FROM cgr.dev/chainguard/wolfi-base:latest
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-r2dbc/build/native/nativeCompile/micronaut-r2dbc micronaut
 

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

@@ -1,4 +1,4 @@
-FROM gradle:8.1.0-jdk17 as build
+FROM gradle:8.7.0-jdk17 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-r2dbc:build -x test --no-daemon

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

@@ -1,4 +1,4 @@
-FROM gradle:8.1.0-jdk17 as build
+FROM gradle:8.7.0-jdk17 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-vertx-pg-client:build -x test --no-daemon