Update to m1 (#567)

sdelamo · web-flow · commit e504f3bc9722 · 2025-12-09T10:24:35.000+01:00
* micronaut core 5.0.0-M1

* remove micronaut-logging

* remove kotlin version

* fix jspecify nullability annotations placements

* oss index audit

* force spock version
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -8,8 +8,6 @@ repositories {
 }
 
 dependencies {
-    implementation libs.gradle.kotlin
-    implementation libs.gradle.kotlin.allopen
-    implementation libs.gradle.kotlin.noarg
     implementation libs.micronaut.gradle.plugin
+    implementation(providers.gradleProperty("micronaut-build-version").map { "io.micronaut.build.internal:micronaut-kotlin-build-plugins:${it}" }.get())
 }
diff --git a/email-amazon-ses/src/main/java/io/micronaut/email/ses/SesEmailComposer.java b/email-amazon-ses/src/main/java/io/micronaut/email/ses/SesEmailComposer.java
@@ -106,8 +106,7 @@ private SendEmailRequest sendEmailRequest(@NonNull Email email) {
         return requestBuilder.build();
     }
 
-    @NonNull
-    private Destination.Builder destinationBuilder(@NonNull Email email) {
+    private Destination.@NonNull Builder destinationBuilder(@NonNull Email email) {
         Destination.Builder destinationBuilder = Destination.builder();
         if (email.getTo() != null) {
             destinationBuilder.toAddresses(email.getTo().stream().map(Contact::getEmail).toList());
@@ -121,16 +120,14 @@ private Destination.Builder destinationBuilder(@NonNull Email email) {
         return destinationBuilder;
     }
 
-    @NonNull
-    private software.amazon.awssdk.services.ses.model.Message message(@NonNull Email email) {
+    private software.amazon.awssdk.services.ses.model.@NonNull Message message(@NonNull Email email) {
         return software.amazon.awssdk.services.ses.model.Message.builder()
                 .subject(Content.builder().data(email.getSubject()).build())
                 .body(bodyBuilder(email).build())
                 .build();
     }
 
-    @NonNull
-    private Body.Builder bodyBuilder(@NonNull Email email) {
+    private Body.@NonNull Builder bodyBuilder(@NonNull Email email) {
         Body.Builder bodyBuilder = Body.builder();
         io.micronaut.email.Body body = email.getBody();
         if (body != null) {
diff --git a/email-mailtrap/src/main/java/io/micronaut/email/mailtrap/MailtrapConfiguration.java b/email-mailtrap/src/main/java/io/micronaut/email/mailtrap/MailtrapConfiguration.java
@@ -38,6 +38,5 @@ public interface MailtrapConfiguration extends Toggleable {
      *
      * @return Mailtrap configuration.
      */
-    @NonNull
-    MailtrapConfig.Builder getConfig();
+    MailtrapConfig.@NonNull Builder getConfig();
 }
diff --git a/email-mailtrap/src/main/java/io/micronaut/email/mailtrap/MailtrapConfigurationProperties.java b/email-mailtrap/src/main/java/io/micronaut/email/mailtrap/MailtrapConfigurationProperties.java
@@ -36,7 +36,7 @@ class MailtrapConfigurationProperties implements MailtrapConfiguration {
     private final MailtrapConfig.Builder config = new MailtrapConfig.Builder();
 
     @Override
-    public @NonNull MailtrapConfig.Builder getConfig() {
+    public MailtrapConfig.@NonNull Builder getConfig() {
         return config;
     }
 
diff --git a/email-mailtrap/src/main/java/io/micronaut/email/mailtrap/MailtrapEmailComposer.java b/email-mailtrap/src/main/java/io/micronaut/email/mailtrap/MailtrapEmailComposer.java
@@ -38,7 +38,7 @@
 @Internal
 class MailtrapEmailComposer implements EmailComposer<MailtrapMail.MailtrapMailBuilder> {
     @Override
-    public @NonNull MailtrapMail.MailtrapMailBuilder compose(@NonNull Email email) throws EmailException {
+    public MailtrapMail.@NonNull MailtrapMailBuilder compose(@NonNull Email email) throws EmailException {
         var builder = MailtrapMail.builder()
             .subject(email.getSubject())
             .from(address(email.getFrom()));
diff --git a/email-postmark/build.gradle.kts b/email-postmark/build.gradle.kts
@@ -4,7 +4,10 @@ plugins {
 
 dependencies {
     api(libs.managed.postmark)
-    implementation(libs.commons.io) // postmark contains a vulnerable version of commons-io
+    // postmark depends on com.fasterxml.jackson.core/jackson-core@2.14.1 which contains a 1 vulnerability
+    // https://ossindex.sonatype.org/vulnerability/CVE-2025-52999?component-type=maven&component-name=com.fasterxml.jackson.core%2Fjackson-core
+    implementation("com.fasterxml.jackson.core:jackson-core:2.15.0") // postmark depends on jackson-core  version
+
     api(projects.micronautEmail)
     implementation(mn.reactor)
     testImplementation(mn.micronaut.http)
diff --git a/email-sendgrid/build.gradle.kts b/email-sendgrid/build.gradle.kts
@@ -4,6 +4,10 @@ plugins {
 
 dependencies {
     api(libs.managed.sendgrid.java)
+    // sendgrid depends on com.fasterxml.jackson.core/jackson-core@2.14.1 which contains a 1 vulnerability
+    // https://ossindex.sonatype.org/vulnerability/CVE-2025-52999?component-type=maven&component-name=com.fasterxml.jackson.core%2Fjackson-core
+    implementation("com.fasterxml.jackson.core:jackson-core:2.15.0") // postmark depends on jackson-core  version
+
     api(projects.micronautEmail)
     implementation(mnReactor.micronaut.reactor)
     testAnnotationProcessor(mn.micronaut.inject.java)
diff --git a/email-sendgrid/src/main/java/io/micronaut/email/sendgrid/SendgridEmailComposer.java b/email-sendgrid/src/main/java/io/micronaut/email/sendgrid/SendgridEmailComposer.java
@@ -123,8 +123,7 @@ private Optional<com.sendgrid.helpers.mail.objects.Email> createReplyTo(@NonNull
         return Optional.of(replyTo);
     }
 
-    @NonNull
-    private com.sendgrid.helpers.mail.objects.Email createForm(@NonNull Email email) {
+    private com.sendgrid.helpers.mail.objects.@NonNull Email createForm(@NonNull Email email) {
         com.sendgrid.helpers.mail.objects.Email from = new com.sendgrid.helpers.mail.objects.Email();
         from.setEmail(email.getFrom().getEmail());
         if (email.getFrom().getName() != null) {
diff --git a/email-template/src/main/java/io/micronaut/email/template/TemplateBodyDecorator.java b/email-template/src/main/java/io/micronaut/email/template/TemplateBodyDecorator.java
@@ -55,7 +55,7 @@ Optional<ViewsRenderer> resolveViewsRenderer(@NonNull BodyType bodyType,
                                                  @Nullable Object data);
 
     @Override
-    default void decorate(@NonNull @NotNull Email.Builder emailBuilder) {
+    default void decorate(@NotNull Email.@NonNull Builder emailBuilder) {
         Optional<Body> optionalBody = emailBuilder.getBody();
         if (optionalBody.isPresent()) {
             Body body = optionalBody.get();
diff --git a/email/src/main/java/io/micronaut/email/AsyncEmailSender.java b/email/src/main/java/io/micronaut/email/AsyncEmailSender.java
@@ -39,7 +39,7 @@ public interface AsyncEmailSender<I, O> extends Named {
      */
     @NonNull
     @SingleResult
-    default Publisher<O> sendAsync(@NonNull @NotNull Email.Builder emailBuilder) throws EmailException {
+    default Publisher<O> sendAsync(@NotNull Email.@NonNull Builder emailBuilder) throws EmailException {
         return sendAsync(emailBuilder, i -> { });
     }
 
@@ -52,6 +52,6 @@ default Publisher<O> sendAsync(@NonNull @NotNull Email.Builder emailBuilder) thr
      */
     @NonNull
     @SingleResult
-    Publisher<O> sendAsync(@NonNull @NotNull Email.Builder emailBuilder,
+    Publisher<O> sendAsync(@NotNull Email.@NonNull Builder emailBuilder,
                            @NonNull @NotNull Consumer<I> emailRequest) throws EmailException;
 }
diff --git a/email/src/main/java/io/micronaut/email/DefaultAsyncEmailSender.java b/email/src/main/java/io/micronaut/email/DefaultAsyncEmailSender.java
@@ -52,7 +52,7 @@ public DefaultAsyncEmailSender(AsyncTransactionalEmailSender<I, O> transactional
     @Override
     @NonNull
     @SingleResult
-    public Publisher<O> sendAsync(@NonNull @NotNull Email.Builder emailBuilder, @NonNull @NotNull Consumer<I> emailRequest) throws EmailException {
+    public Publisher<O> sendAsync(@NotNull Email.@NonNull Builder emailBuilder, @NonNull @NotNull Consumer<I> emailRequest) throws EmailException {
         for (EmailDecorator decorator : decorators) {
             decorator.decorate(emailBuilder);
         }
diff --git a/email/src/main/java/io/micronaut/email/DefaultEmailSender.java b/email/src/main/java/io/micronaut/email/DefaultEmailSender.java
@@ -48,7 +48,7 @@ public DefaultEmailSender(TransactionalEmailSender<I, O> transactionalEmailSende
 
     @Override
     @NonNull
-    public O send(@NonNull @NotNull Email.Builder emailBuilder, @NonNull @NotNull Consumer<I> emailRequest) throws EmailException {
+    public O send(@NotNull Email.@NonNull Builder emailBuilder, @NonNull @NotNull Consumer<I> emailRequest) throws EmailException {
         for (EmailDecorator decorator : decorators) {
             decorator.decorate(emailBuilder);
         }
diff --git a/email/src/main/java/io/micronaut/email/Email.java b/email/src/main/java/io/micronaut/email/Email.java
@@ -196,8 +196,7 @@ public Body getBody() {
      *
      * @return Builder
      */
-    @NonNull
-    public static Email.Builder builder() {
+    public static Email.@NonNull Builder builder() {
         return new Builder();
     }
 
@@ -234,8 +233,7 @@ public static class Builder {
          * @param from contact sending the email
          * @return Email Builder
          */
-        @NonNull
-        public Email.Builder from(@NonNull String from) {
+        public Email.@NonNull Builder from(@NonNull String from) {
             this.from = new Contact(from);
             return this;
         }
@@ -245,8 +243,7 @@ public Email.Builder from(@NonNull String from) {
          * @param from contact sending the email
          * @return Email Builder
          */
-        @NonNull
-        public Email.Builder from(@NonNull Contact from) {
+        public Email.@NonNull Builder from(@NonNull Contact from) {
             this.from = from;
             return this;
         }
@@ -256,8 +253,7 @@ public Email.Builder from(@NonNull Contact from) {
          * @param replyTo Reply to contact
          * @return Email Builder
          */
-        @NonNull
-        public Email.Builder replyTo(@NonNull String replyTo) {
+        public Email.@NonNull Builder replyTo(@NonNull String replyTo) {
             addReplyTo(new Contact(replyTo));
             return this;
         }
@@ -267,8 +263,7 @@ public Email.Builder replyTo(@NonNull String replyTo) {
          * @param replyTo Reply to contact
          * @return Email Builder
          */
-        @NonNull
-        public Email.Builder replyTo(@NonNull Contact replyTo) {
+        public Email.@NonNull Builder replyTo(@NonNull Contact replyTo) {
             addReplyTo(replyTo);
             return this;
         }
@@ -285,8 +280,7 @@ private void addReplyTo(@NonNull Contact replyTo) {
          * @param to Recipients to
          * @return Email Builder
          */
-        @NonNull
-        public Email.Builder to(@NonNull String to) {
+        public Email.@NonNull Builder to(@NonNull String to) {
             if (this.to == null) {
                 this.to = new ArrayList<>();
             }
@@ -299,8 +293,7 @@ public Email.Builder to(@NonNull String to) {
          * @param to Recipients to
          * @return Email Builder
          */
-        @NonNull
-        public Email.Builder to(@NonNull Contact to) {
+        public Email.@NonNull Builder to(@NonNull Contact to) {
             addTo(to);
             return this;
         }
@@ -317,8 +310,7 @@ private void addTo(@NonNull Contact to) {
          * @param cc carbon copy recipient.
          * @return Email Builder
          */
-        @NonNull
-        public Email.Builder cc(@NonNull Contact cc) {
+        public Email.@NonNull Builder cc(@NonNull Contact cc) {
             addCc(cc);
             return this;
         }
@@ -335,8 +327,7 @@ private void addCc(Contact cc) {
          * @param cc carbon copy recipient.
          * @return Email Builder
          */
-        @NonNull
-        public Email.Builder cc(@NonNull String cc) {
+        public Email.@NonNull Builder cc(@NonNull String cc) {
             if (this.cc == null) {
                 this.cc = new ArrayList<>();
             }
@@ -349,8 +340,7 @@ public Email.Builder cc(@NonNull String cc) {
          * @param bcc blind carbon copy recipient.
          * @return Email Builder
          */
-        @NonNull
-        public Email.Builder bcc(@NonNull Contact bcc) {
+        public Email.@NonNull Builder bcc(@NonNull Contact bcc) {
             addBcc(bcc);
             return this;
         }
@@ -367,8 +357,7 @@ private void addBcc(@NonNull Contact bcc) {
          * @param bcc blind carbon copy recipient.
          * @return Email Builder
          */
-        @NonNull
-        public Email.Builder bcc(@NonNull String bcc) {
+        public Email.@NonNull Builder bcc(@NonNull String bcc) {
             if (this.bcc == null) {
                 this.bcc = new ArrayList<>();
             }
@@ -381,8 +370,7 @@ public Email.Builder bcc(@NonNull String bcc) {
          * @param subject Email subject
          * @return Email Builder
          */
-        @NonNull
-        public Email.Builder subject(@NonNull String subject) {
+        public Email.@NonNull Builder subject(@NonNull String subject) {
             this.subject = subject;
             return this;
         }
@@ -392,8 +380,7 @@ public Email.Builder subject(@NonNull String subject) {
          * @param attachment Email attachment
          * @return Email Builder
          */
-        @NonNull
-        public Email.Builder attachment(@NonNull Attachment attachment) {
+        public Email.@NonNull Builder attachment(@NonNull Attachment attachment) {
             if (this.attachments == null) {
                 attachments = new ArrayList<>();
             }
@@ -406,8 +393,7 @@ public Email.Builder attachment(@NonNull Attachment attachment) {
          * @param attachment attachment builder consumer
          * @return Email Builder
          */
-        @NonNull
-        public Email.Builder attachment(@NonNull Consumer<Attachment.Builder> attachment) {
+        public Email.@NonNull Builder attachment(@NonNull Consumer<Attachment.Builder> attachment) {
             Attachment.Builder builder = Attachment.builder();
             attachment.accept(builder);
             return attachment(builder.build());
diff --git a/email/src/main/java/io/micronaut/email/EmailDecorator.java b/email/src/main/java/io/micronaut/email/EmailDecorator.java
@@ -33,5 +33,5 @@ public interface EmailDecorator extends Ordered {
      * Populates an email.
      * @param emailBuilder Email Builder
      */
-    void decorate(@NonNull @NotNull Email.Builder emailBuilder);
+    void decorate(@NotNull Email.@NonNull Builder emailBuilder);
 }
diff --git a/email/src/main/java/io/micronaut/email/EmailSender.java b/email/src/main/java/io/micronaut/email/EmailSender.java
@@ -35,7 +35,7 @@ public interface EmailSender<I, O> extends Named {
      * @throws EmailException Wrapper of any exception thrown while sending email
      */
     @NonNull
-    default O send(@NonNull @NotNull Email.Builder emailBuilder) throws EmailException {
+    default O send(@NotNull Email.@NonNull Builder emailBuilder) throws EmailException {
         return send(emailBuilder, i -> { });
     }
 
@@ -47,6 +47,6 @@ default O send(@NonNull @NotNull Email.Builder emailBuilder) throws EmailExcepti
      * @throws EmailException Wrapper of any exception thrown while sending email
      */
     @NonNull
-    O send(@NonNull @NotNull Email.Builder emailBuilder,
+    O send(@NotNull Email.@NonNull Builder emailBuilder,
            @NonNull @NotNull Consumer<I> emailRequest) throws EmailException;
 }
diff --git a/email/src/main/java/io/micronaut/email/FromDecorator.java b/email/src/main/java/io/micronaut/email/FromDecorator.java
@@ -41,7 +41,7 @@ public FromDecorator(FromConfiguration fromConfiguration) {
     }
 
     @Override
-    public void decorate(@NonNull @NotNull Email.Builder emailBuilder) {
+    public void decorate(@NotNull Email.@NonNull Builder emailBuilder) {
         if (!emailBuilder.getFrom().isPresent()) {
             emailBuilder.from(fromConfiguration.getFrom());
         }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,26 +1,22 @@
 [versions]
 micronaut-gradle-plugin = "4.6.1"
-micronaut = "4.10.9"
+micronaut = "5.0.0-M2"
 
 managed-postmark = "1.11.1"
-commons-io="2.21.0"
 managed-sendgrid = "4.10.3"
 managed-jakarta-mail = "2.1.5"
 managed-eclipse-angus = "2.0.5"
 managed-mailjet = "6.0.1"
 managed-mailtrap = "1.1.0"
-
 poi-ooxml = "5.5.1"
-kotlin = "2.2.21"
 
 micronaut-aws = "4.11.0"
-micronaut-reactor = "3.9.1"
-micronaut-serde = "2.16.2"
+micronaut-reactor = "4.0.0-M1"
+micronaut-serde = "3.0.0-M1"
 micronaut-test-resources = "2.10.1"
-micronaut-validation = "4.12.0"
+micronaut-validation = "5.0.0-M1"
 micronaut-views = "5.9.0"
 micronaut-hibernate-validator = "4.8.0"
-micronaut-logging = "1.7.1"
 
 [libraries]
 # Managed dependencies
@@ -42,13 +38,8 @@ micronaut-validation = { module = "io.micronaut.validation:micronaut-validation-
 micronaut-views = {module = "io.micronaut.views:micronaut-views-bom", version.ref = "micronaut-views" }
 
 junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
-kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
 poi-ooxml = { module = "org.apache.poi:poi-ooxml", version.ref = "poi-ooxml" }
 ses = { module = "software.amazon.awssdk:ses" }
-commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }
 
 # Plugins
-gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-gradle-kotlin-allopen = { module = "org.jetbrains.kotlin:kotlin-allopen", version.ref = "kotlin" }
-gradle-kotlin-noarg = { module = "org.jetbrains.kotlin:kotlin-noarg", version.ref = "kotlin" }
 micronaut-gradle-plugin = { module = "io.micronaut.gradle:micronaut-gradle-plugin", version.ref="micronaut-gradle-plugin" }
diff --git a/test-suite-groovy/build.gradle b/test-suite-groovy/build.gradle
@@ -25,3 +25,9 @@ dependencies {
 tasks.named('test') {
     useJUnitPlatform()
 }
+//TODO remove once Micronaut Test ships Spock version compatible with Groovy 5
+configurations.all {
+    resolutionStrategy {
+        force "org.spockframework:spock-core:2.4-M7-groovy-5.0"
+    }
+}
diff --git a/test-suite-kotlin/build.gradle b/test-suite-kotlin/build.gradle
@@ -1,6 +1,5 @@
 plugins {
-    id "org.jetbrains.kotlin.jvm"
-    id("org.jetbrains.kotlin.kapt")
+    id("io.micronaut.build.internal.kotlin-kapt")
     id("io.micronaut.build.internal.email-tests")
     id "io.micronaut.build.internal.kotlin-base"
 }
@@ -12,8 +11,6 @@ dependencies {
     testImplementation(mnTest.micronaut.test.junit5)
     testRuntimeOnly(libs.junit.jupiter.engine)
 
-    testImplementation(libs.kotlin.stdlib.jdk8)
-
     kaptTest(mn.micronaut.inject.java)
 
     testImplementation(projects.testSuiteUtils)

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@ repositories {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`dependencies {`
`11`		`- implementation libs.gradle.kotlin`
`12`		`- implementation libs.gradle.kotlin.allopen`
`13`		`- implementation libs.gradle.kotlin.noarg`
`14`	`11`	`implementation libs.micronaut.gradle.plugin`
	`12`	`+ implementation(providers.gradleProperty("micronaut-build-version").map { "io.micronaut.build.internal:micronaut-kotlin-build-plugins:${it}" }.get())`
`15`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,5 @@ public interface MailtrapConfiguration extends Toggleable {`
`38`	`38`	`*`
`39`	`39`	`* @return Mailtrap configuration.`
`40`	`40`	`*/`
`41`		`- @NonNull`
`42`		`- MailtrapConfig.Builder getConfig();`
	`41`	`+ MailtrapConfig.@NonNull Builder getConfig();`
`43`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class MailtrapConfigurationProperties implements MailtrapConfiguration {`
`36`	`36`	`private final MailtrapConfig.Builder config = new MailtrapConfig.Builder();`
`37`	`37`
`38`	`38`	`@Override`
`39`		`- public @NonNull MailtrapConfig.Builder getConfig() {`
	`39`	`+ public MailtrapConfig.@NonNull Builder getConfig() {`
`40`	`40`	`return config;`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,7 @@ private Optional<com.sendgrid.helpers.mail.objects.Email> createReplyTo(@NonNull`
`123`	`123`	`return Optional.of(replyTo);`
`124`	`124`	`}`
`125`	`125`
`126`		`- @NonNull`
`127`		`- private com.sendgrid.helpers.mail.objects.Email createForm(@NonNull Email email) {`
	`126`	`+ private com.sendgrid.helpers.mail.objects.@NonNull Email createForm(@NonNull Email email) {`
`128`	`127`	`com.sendgrid.helpers.mail.objects.Email from = new com.sendgrid.helpers.mail.objects.Email();`
`129`	`128`	`from.setEmail(email.getFrom().getEmail());`
`130`	`129`	`if (email.getFrom().getName() != null) {`