Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Micronaut to 4.4.2 and Upgrades #8778

Merged
merged 10 commits into from
May 8, 2024
Merged

Micronaut to 4.4.2 and Upgrades #8778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
be9d4a8
Micronaut Upgrades
timyates Feb 29, 2024
bf31b8a
Update frameworks/Java/micronaut/gradle.properties
timyates Mar 9, 2024
9f2c33f
Apply suggestions from code review
timyates Mar 22, 2024
2df3b66
Tie Graal docker images to 21
timyates Mar 25, 2024
e3dc25f
Micronaut 4.4.1, Gradle 8.7, update dockerfiles for graal
timyates Apr 25, 2024
72045a5
Merge branch 'master' into micronaut-4.3.4
timyates Apr 25, 2024
cbc6b35
Gradle 8.7
timyates Apr 25, 2024
c6ab1f0
Update gradle plugin
timyates Apr 25, 2024
440978a
Try and trigger pipelines on my fork
timyates Apr 25, 2024
68cd7d0
Update frameworks/Java/micronaut/gradle.properties
timyates May 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frameworks/Java/micronaut/buildSrc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion frameworks/Java/micronaut/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
micronautVersion = 4.2.2
micronautVersion=4.4.2
Binary file modified frameworks/Java/micronaut/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion frameworks/Java/micronaut/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
20 changes: 10 additions & 10 deletions frameworks/Java/micronaut/gradlew.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
9 changes: 4 additions & 5 deletions frameworks/Java/micronaut/micronaut-data-jdbc-graalvm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion frameworks/Java/micronaut/micronaut-data-jdbc.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 4 additions & 5 deletions frameworks/Java/micronaut/micronaut-data-mongodb-graalvm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion frameworks/Java/micronaut/micronaut-data-mongodb.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Java/micronaut/micronaut-data-mongodb/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
9 changes: 4 additions & 5 deletions frameworks/Java/micronaut/micronaut-data-r2dbc-graalvm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion frameworks/Java/micronaut/micronaut-data-r2dbc.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions frameworks/Java/micronaut/micronaut-graalvm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 4 additions & 5 deletions frameworks/Java/micronaut/micronaut-jdbc-graalvm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion frameworks/Java/micronaut/micronaut-jdbc.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 4 additions & 5 deletions frameworks/Java/micronaut/micronaut-r2dbc-graalvm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion frameworks/Java/micronaut/micronaut-r2dbc.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Java/micronaut/micronaut.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading