Skip to content

Commit a941116

Browse files
lissam1micronaut-buildsdelamo
authored
Micronaut 5 compatibility (#562)
* update to kotlin 2.2.20 * update ksp * java baseline 21 * remove duplicate * use junit from mnTest * graalvm-latest use java 21 * Update common files * update micronaut build to 8.0.0-M6 * update micronaut versions * use baseline plugin * fix checkstyle --------- Co-authored-by: micronaut-build <micronaut-build-account@grails.org> Co-authored-by: Sergio del Amo <sergio.delamo@softamo.com>
1 parent 1386ce5 commit a941116

File tree

8 files changed

+12
-18
lines changed

8 files changed

+12
-18
lines changed

gradle/libs.versions.toml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@ javax-annotation-api = "1.3.2"
88
jakarta-validation-tck = "3.0.1"
99

1010
micronaut = "4.10.8"
11-
micronaut-platform = "4.9.3"
11+
micronaut-platform = "4.10.1"
1212
micronaut-docs = "3.0.0"
13-
micronaut-test = "4.8.1"
13+
micronaut-test = "4.10.2"
1414
micronaut-reactor = "3.8.0"
1515
micronaut-rxjava2 = "2.8.0"
1616
micronaut-kotlin = "4.7.0"
1717
micronaut-logging = "1.7.0"
1818

1919
# gradle plugins
20-
2120
micronaut-gradle-plugin = "4.6.1"
22-
kotlin-gradle-plugin = "1.9.25"
23-
ksp-gradle-plugin = "1.9.25-1.0.20"
21+
kotlin-gradle-plugin = "2.2.20"
22+
ksp-gradle-plugin = "2.2.20-2.0.4"
2423

2524
[libraries]
2625
# core
@@ -36,7 +35,6 @@ groovy-bom = { module = "org.apache.groovy:groovy-bom", version.ref = "groovy" }
3635

3736
# testing
3837

39-
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
4038
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
4139
kotlin-kotest-junit5 = { module = "io.kotest:kotest-runner-junit5-jvm" }
4240
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" }

test-suite-groovy/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ dependencies {
2121
testImplementation mnTest.micronaut.test.spock
2222
testImplementation libs.managed.validation
2323

24-
testRuntimeOnly libs.junit.jupiter.engine
24+
testRuntimeOnly mnTest.junit.jupiter.engine
2525
}

test-suite-kotlin/build.gradle

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@ plugins {
22
id 'io.micronaut.build.internal.validation-test-suite'
33
id 'org.jetbrains.kotlin.jvm'
44
id 'com.google.devtools.ksp'
5-
}
6-
7-
kotlin {
8-
jvmToolchain {
9-
languageVersion.set(JavaLanguageVersion.of(17))
10-
}
5+
id "io.micronaut.build.internal.kotlin-base"
116
}
127

138
dependencies {
@@ -28,5 +23,5 @@ dependencies {
2823
testImplementation mn.micronaut.http.server.netty
2924
testImplementation mn.micronaut.jackson.databind
3025

31-
testRuntimeOnly libs.junit.jupiter.engine
26+
testRuntimeOnly mnTest.junit.jupiter.engine
3227
}

test-suite/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ dependencies {
1919
testImplementation mnTest.micronaut.test.junit5
2020
testImplementation mnTest.micronaut.test.spock
2121

22-
testRuntimeOnly libs.junit.jupiter.engine
22+
testRuntimeOnly mnTest.junit.jupiter.engine
2323
}
2424

validation/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
testImplementation mn.micronaut.jackson.databind
3434

3535
testImplementation(mnTest.micronaut.test.junit5)
36-
testRuntimeOnly(libs.junit.jupiter.engine)
36+
testRuntimeOnly(mnTest.junit.jupiter.engine)
3737
testRuntimeOnly(libs.junit.platform.launcher)
3838

3939
jmhAnnotationProcessor("org.openjdk.jmh:jmh-generator-annprocess:1.36")

validation/src/main/java/io/micronaut/validation/validator/constraints/ConstraintValidator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import jakarta.validation.Constraint;
2424

2525
import java.lang.annotation.Annotation;
26-
import java.util.Optional;
2726

2827
/**
2928
* Constraint validator that can be used at either runtime or compilation time and

validation/src/main/java/io/micronaut/validation/validator/constraints/DecimalMaxValidator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ default boolean isValid(@Nullable T value, @NonNull AnnotationValue<DecimalMax>
5757
return inclusive ? result <= 0 : result < 0;
5858
}
5959

60-
6160
/**
6261
* Perform the comparison for the given value.
6362
* @param value The value

validation/src/main/java/io/micronaut/validation/validator/messages/DefaultMessageInterpolatorContext.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424

2525
import java.lang.annotation.Annotation;
2626

27+
/**
28+
* Default implementation of {@link MessageInterpolator.Context}.
29+
*/
2730
@Internal
2831
public final class DefaultMessageInterpolatorContext implements MessageInterpolator.Context {
2932

0 commit comments

Comments
 (0)