build: plugin 6.3.5, gradle 8.0.2, jakarta validation, cleanup (#166)

micronaut-projects · Mar 13, 2023 · 39aac6b · 39aac6b
1 parent 348b16c
commit 39aac6b
Show file tree

Hide file tree

Showing 37 changed files with 72 additions and 97 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,9 @@
 plugins {
     id "io.micronaut.build.internal.docs"
-    id "io.micronaut.build.internal.dependency-updates"
     id "io.micronaut.build.internal.quality-reporting"
     id "io.micronaut.internal.build.microstream-rest-cli"
 }
 
-micronautBuild {
-    sourceCompatibility = "17"
-    targetCompatibility = "17"
-}
-
 repositories {
     maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
     mavenCentral()

diff --git a/buildSrc/src/main/groovy/io.micronaut.internal.build.microstream-testsuite.gradle b/buildSrc/src/main/groovy/io.micronaut.internal.build.microstream-testsuite.gradle
@@ -2,18 +2,6 @@ plugins {
     id "io.micronaut.internal.build.microstream-base"
 }
 
-configurations.all {
-    resolutionStrategy.dependencySubstitution {
-        substitute(module("io.micronaut:micronaut-jackson-databind"))
-                .using(module("io.micronaut.serde:micronaut-serde-jackson:${libs.versions.micronaut.serde.get()}"))
-    }
-}
-
 tasks.named('test') {
     useJUnitPlatform()
 }
-
-java {
-    sourceCompatibility = JavaVersion.toVersion("17")
-    targetCompatibility = JavaVersion.toVersion("17")
-}
diff --git a/gradle.properties b/gradle.properties
@@ -1,11 +1,6 @@
 projectVersion=2.0.0-SNAPSHOT
 projectGroup=io.micronaut.microstream
 
-micronautDocsVersion=2.0.0
-micronautVersion=4.0.0-SNAPSHOT
-groovyVersion=4.0.5
-spockVersion=2.3-groovy-4.0
-
 title=Micronaut MicroStream
 projectDesc=Micronaut integration with MicroStream
 projectUrl=https://micronaut.io

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,4 +1,10 @@
 [versions]
+micronaut-docs = "2.0.0"
+micronaut = "4.0.0-SNAPSHOT"
+groovy = "4.0.10"
+kotlin = "1.8.10"
+spock = "2.3-groovy-4.0"
+
 managed-microstream='07.01.00-MS-GA'
 
 micronaut-cache = "4.0.0-SNAPSHOT"
@@ -24,3 +30,4 @@ microstream-persistence-binary-jdk17 = { module = 'one.microstream:microstream-p
 jupiter-jupiter-params = { module = 'org.junit.jupiter:junit-jupiter-params' }
 jupiter-api = { module = 'org.junit.jupiter:junit-jupiter-api' }
 junit-jupiter-engine = { module = 'org.junit.jupiter:junit-jupiter-engine' }
+kotlin-stdlib = { module = 'org.jetbrains.kotlin:kotlin-stdlib-jdk8', version.ref = 'kotlin' }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/.../java/io/micronaut/microstream/rest/MicroStreamRestControllerConfigurationProperties.java b/.../java/io/micronaut/microstream/rest/MicroStreamRestControllerConfigurationProperties.java
@@ -18,7 +18,7 @@
 import io.micronaut.context.annotation.ConfigurationProperties;
 import io.micronaut.core.annotation.NonNull;
 import io.micronaut.core.util.StringUtils;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * Configuration properties for the {@link MicroStreamRestController}.

diff --git a/microstream-rest/src/main/java/io/micronaut/microstream/rest/RootObject.java b/microstream-rest/src/main/java/io/micronaut/microstream/rest/RootObject.java
@@ -19,7 +19,7 @@
 import io.micronaut.serde.annotation.Serdeable;
 import one.microstream.storage.restadapter.types.ViewerRootDescription;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * This object represents a root object for the MicroStream REST api.

diff --git a/microstream-rest/src/test/groovy/io/micronaut/microstream/rest/RootObjectSpec.groovy b/microstream-rest/src/test/groovy/io/micronaut/microstream/rest/RootObjectSpec.groovy
@@ -6,7 +6,7 @@ import io.micronaut.core.beans.BeanIntrospection
 import io.micronaut.serde.ObjectMapper
 import spock.lang.Specification
 
-import javax.validation.Validator
+import jakarta.validation.Validator
 
 class RootObjectSpec extends Specification {
 

diff --git a/settings.gradle b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'io.micronaut.build.shared.settings' version '6.3.1'
+    id 'io.micronaut.build.shared.settings' version '6.3.5'
 }
 
 rootProject.name = 'microstream-parent'
@@ -27,6 +27,7 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 micronautBuild {
     addSnapshotRepository()
+    useStandardizedProjectNames = true
     importMicronautCatalog()
     importMicronautCatalog("micronaut-cache")
     importMicronautCatalog("micronaut-micrometer")

diff --git a/test-suite-groovy/build.gradle b/test-suite-groovy/build.gradle
@@ -4,14 +4,11 @@ plugins {
 }
 
 dependencies {
-    testImplementation(platform("io.micronaut:micronaut-bom:$micronautVersion"))
+    testImplementation(platform(mn.micronaut.core.bom))
     testCompileOnly(mn.micronaut.inject.groovy)
     testImplementation(projects.micronautMicrostreamAnnotations)
     testImplementation(mnValidation.micronaut.validation)
     testImplementation(mnSerde.micronaut.serde.jackson)
-    testImplementation("org.spockframework:spock-core:${spockVersion}") {
-        exclude module: 'groovy-all'
-    }
     testImplementation(mnTest.micronaut.test.spock)
     testImplementation(mn.micronaut.http.server.netty)
     testImplementation(mn.micronaut.http.client)

diff --git a/test-suite-groovy/src/test/groovy/io/micronaut/microstream/docs/Customer.groovy b/test-suite-groovy/src/test/groovy/io/micronaut/microstream/docs/Customer.groovy
@@ -4,7 +4,7 @@ import io.micronaut.core.annotation.Introspected
 import io.micronaut.core.annotation.NonNull
 import io.micronaut.core.annotation.Nullable
 
-import javax.validation.constraints.NotBlank
+import jakarta.validation.constraints.NotBlank
 
 @Introspected
 class Customer {

diff --git a/test-suite-groovy/src/test/groovy/io/micronaut/microstream/docs/CustomerController.groovy b/test-suite-groovy/src/test/groovy/io/micronaut/microstream/docs/CustomerController.groovy
@@ -15,8 +15,8 @@ import io.micronaut.http.annotation.Post
 import io.micronaut.http.annotation.Status
 import io.micronaut.http.uri.UriBuilder
 
-import javax.validation.Valid
-import javax.validation.constraints.NotNull
+import jakarta.validation.Valid
+import jakarta.validation.constraints.NotNull
 
 @Controller("/customer")
 class CustomerController {

diff --git a/test-suite-groovy/src/test/groovy/io/micronaut/microstream/docs/CustomerRepository.groovy b/test-suite-groovy/src/test/groovy/io/micronaut/microstream/docs/CustomerRepository.groovy
@@ -2,9 +2,9 @@ package io.micronaut.microstream.docs
 
 import io.micronaut.core.annotation.NonNull
 
-import javax.validation.Valid
-import javax.validation.constraints.NotBlank
-import javax.validation.constraints.NotNull
+import jakarta.validation.Valid
+import jakarta.validation.constraints.NotBlank
+import jakarta.validation.constraints.NotNull
 
 interface CustomerRepository {
 

diff --git a/...-suite-groovy/src/test/groovy/io/micronaut/microstream/docs/CustomerRepositoryImpl.groovy b/...-suite-groovy/src/test/groovy/io/micronaut/microstream/docs/CustomerRepositoryImpl.groovy
@@ -6,9 +6,9 @@ import jakarta.inject.Singleton
 import one.microstream.concurrency.XThreads
 import one.microstream.storage.types.StorageManager
 
-import javax.validation.Valid
-import javax.validation.constraints.NotBlank
-import javax.validation.constraints.NotNull
+import jakarta.validation.Valid
+import jakarta.validation.constraints.NotBlank
+import jakarta.validation.constraints.NotNull
 import java.util.function.Supplier
 
 @Requires(property = "customer.repository", value = "embedded-storage-manager")

diff --git a/...e-groovy/src/test/groovy/io/micronaut/microstream/docs/CustomerRepositoryStoreImpl.groovy b/...e-groovy/src/test/groovy/io/micronaut/microstream/docs/CustomerRepositoryStoreImpl.groovy
@@ -8,9 +8,9 @@ import io.micronaut.microstream.annotations.Store
 import io.micronaut.microstream.annotations.StoreParams
 import io.micronaut.microstream.annotations.StoreReturn
 import jakarta.inject.Singleton
-import javax.validation.Valid
-import javax.validation.constraints.NotBlank
-import javax.validation.constraints.NotNull
+import jakarta.validation.Valid
+import jakarta.validation.constraints.NotBlank
+import jakarta.validation.constraints.NotNull
 
 @Requires(property = "customer.repository", value = "store")
 //tag::clazz[]

diff --git a/test-suite-groovy/src/test/groovy/io/micronaut/microstream/docs/CustomerSave.groovy b/test-suite-groovy/src/test/groovy/io/micronaut/microstream/docs/CustomerSave.groovy
@@ -3,7 +3,7 @@ package io.micronaut.microstream.docs
 import io.micronaut.core.annotation.Introspected
 import io.micronaut.core.annotation.NonNull
 import io.micronaut.core.annotation.Nullable
-import javax.validation.constraints.NotBlank
+import jakarta.validation.constraints.NotBlank
 
 @Introspected
 class CustomerSave {

diff --git a/test-suite-kotlin/build.gradle b/test-suite-kotlin/build.gradle
@@ -5,11 +5,11 @@ plugins {
 }
 
 dependencies {
-    kaptTest(platform("io.micronaut:micronaut-bom:$micronautVersion"))
+    kaptTest(platform(mn.micronaut.core.bom))
     kaptTest(projects.micronautMicrostreamAnnotations)
     kaptTest(mnSerde.micronaut.serde.processor)
 
-    testImplementation(platform("io.micronaut:micronaut-bom:$micronautVersion"))
+    testImplementation(platform(mn.micronaut.core.bom))
     testImplementation(projects.micronautMicrostreamAnnotations)
 
     testImplementation(mnValidation.micronaut.validation)
@@ -20,7 +20,7 @@ dependencies {
     testRuntimeOnly(libs.junit.jupiter.engine)
     testRuntimeOnly(mn.logback.classic)
     testRuntimeOnly(mn.snakeyaml)
-    testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10"
+    testImplementation libs.kotlin.stdlib
     kaptTest(mn.micronaut.inject.java)
 
     testImplementation(mn.micronaut.http.server.netty)
@@ -29,10 +29,3 @@ dependencies {
     testImplementation(libs.jupiter.jupiter.params)
     testImplementation(projects.micronautMicrostreamCache)
 }
-
-compileTestKotlin {
-    kotlinOptions {
-        jvmTarget = '17'
-        javaParameters = true
-    }
-}
diff --git a/test-suite-kotlin/src/test/kotlin/io/micronaut/microstream/docs/CustomerController.kt b/test-suite-kotlin/src/test/kotlin/io/micronaut/microstream/docs/CustomerController.kt
@@ -13,7 +13,7 @@ import io.micronaut.http.annotation.Delete
 import io.micronaut.http.annotation.Status
 import io.micronaut.http.annotation.PathVariable
 import io.micronaut.http.uri.UriBuilder
-import javax.validation.Valid
+import jakarta.validation.Valid
 
 @Controller("/customer")
 internal class CustomerController(private val repository: CustomerRepository) {

diff --git a/test-suite-kotlin/src/test/kotlin/io/micronaut/microstream/docs/CustomerRepository.kt b/test-suite-kotlin/src/test/kotlin/io/micronaut/microstream/docs/CustomerRepository.kt
@@ -1,7 +1,7 @@
 package io.micronaut.microstream.docs
 
-import javax.validation.Valid
-import javax.validation.constraints.NotBlank
+import jakarta.validation.Valid
+import jakarta.validation.constraints.NotBlank
 
 interface CustomerRepository {
     fun save(customerSave: @Valid CustomerSave): Customer

diff --git a/test-suite-kotlin/src/test/kotlin/io/micronaut/microstream/docs/CustomerRepositoryImpl.kt b/test-suite-kotlin/src/test/kotlin/io/micronaut/microstream/docs/CustomerRepositoryImpl.kt
@@ -6,7 +6,7 @@ import jakarta.inject.Singleton
 import one.microstream.concurrency.XThreads
 import one.microstream.storage.types.StorageManager
 import java.util.*
-import javax.validation.constraints.NotBlank
+import jakarta.validation.constraints.NotBlank
 
 @Requires(property = "customer.repository", value = "embedded-storage-manager")
 //tag::clazz[]

diff --git a/...suite-kotlin/src/test/kotlin/io/micronaut/microstream/docs/CustomerRepositoryStoreImpl.kt b/...suite-kotlin/src/test/kotlin/io/micronaut/microstream/docs/CustomerRepositoryStoreImpl.kt
@@ -9,8 +9,8 @@ import io.micronaut.microstream.annotations.StoreParams
 import io.micronaut.microstream.annotations.StoreReturn
 import jakarta.inject.Singleton
 import java.util.*
-import javax.validation.Valid
-import javax.validation.constraints.NotBlank
+import jakarta.validation.Valid
+import jakarta.validation.constraints.NotBlank
 
 @Requires(property = "customer.repository", value = "store")
 //tag::clazz[]

diff --git a/test-suite-kotlin/src/test/kotlin/io/micronaut/microstream/docs/CustomerSave.kt b/test-suite-kotlin/src/test/kotlin/io/micronaut/microstream/docs/CustomerSave.kt
@@ -1,7 +1,7 @@
 package io.micronaut.microstream.docs
 
 import io.micronaut.core.annotation.Introspected
-import javax.validation.constraints.NotBlank
+import jakarta.validation.constraints.NotBlank
 
 @Introspected
 data class CustomerSave(

diff --git a/test-suite/build.gradle b/test-suite/build.gradle
@@ -4,13 +4,13 @@ plugins {
 }
 
 dependencies {
-    testAnnotationProcessor(platform("io.micronaut:micronaut-bom:$micronautVersion"))
+    testAnnotationProcessor(platform(mn.micronaut.core.bom))
     testAnnotationProcessor(projects.micronautMicrostreamAnnotations)
     testAnnotationProcessor(mn.micronaut.inject.java)
     testAnnotationProcessor(mnValidation.micronaut.validation.processor)
     testAnnotationProcessor(mnSerde.micronaut.serde.processor)
 
-    testImplementation(platform("io.micronaut:micronaut-bom:$micronautVersion"))
+    testImplementation(platform(mn.micronaut.core.bom))
     testImplementation(mnValidation.micronaut.validation)
     testImplementation(mnSerde.micronaut.serde.jackson)
 

diff --git a/test-suite/src/test/java/io/micronaut/microstream/docs/CrmCustomerService.java b/test-suite/src/test/java/io/micronaut/microstream/docs/CrmCustomerService.java
@@ -2,8 +2,8 @@
 
 import io.micronaut.core.annotation.NonNull;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 public interface CrmCustomerService {
     @NonNull

diff --git a/test-suite/src/test/java/io/micronaut/microstream/docs/CrmCustomerServiceImpl.java b/test-suite/src/test/java/io/micronaut/microstream/docs/CrmCustomerServiceImpl.java
@@ -7,8 +7,8 @@
 import jakarta.inject.Singleton;
 import one.microstream.storage.types.StorageManager;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 @Requires(property = "spec.service", value = "store")
 @Singleton

diff --git a/...-suite/src/test/java/io/micronaut/microstream/docs/CrmCustomerServiceStoreReturnImpl.java b/...-suite/src/test/java/io/micronaut/microstream/docs/CrmCustomerServiceStoreReturnImpl.java
@@ -8,8 +8,8 @@
 import jakarta.inject.Singleton;
 import one.microstream.storage.types.StorageManager;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 @Requires(property = "spec.service", value = "store-return")
 @Singleton

diff --git a/test-suite/src/test/java/io/micronaut/microstream/docs/Customer.java b/test-suite/src/test/java/io/micronaut/microstream/docs/Customer.java
@@ -4,7 +4,7 @@
 import io.micronaut.core.annotation.Nullable;
 import io.micronaut.serde.annotation.Serdeable;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 @Serdeable // <1>
 public class Customer {

diff --git a/test-suite/src/test/java/io/micronaut/microstream/docs/CustomerController.java b/test-suite/src/test/java/io/micronaut/microstream/docs/CustomerController.java
@@ -15,8 +15,8 @@
 import io.micronaut.http.annotation.Status;
 import io.micronaut.http.uri.UriBuilder;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.util.Optional;
 import java.util.UUID;
 

diff --git a/test-suite/src/test/java/io/micronaut/microstream/docs/CustomerRepository.java b/test-suite/src/test/java/io/micronaut/microstream/docs/CustomerRepository.java
@@ -2,9 +2,9 @@
 
 import io.micronaut.core.annotation.NonNull;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.util.Collection;
 import java.util.Optional;
 import java.util.UUID;

diff --git a/test-suite/src/test/java/io/micronaut/microstream/docs/CustomerRepositoryImpl.java b/test-suite/src/test/java/io/micronaut/microstream/docs/CustomerRepositoryImpl.java
@@ -6,9 +6,9 @@
 import one.microstream.concurrency.XThreads;
 import one.microstream.storage.types.StorageManager;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;

diff --git a/test-suite/src/test/java/io/micronaut/microstream/docs/CustomerRepositoryRootEagerImpl.java b/test-suite/src/test/java/io/micronaut/microstream/docs/CustomerRepositoryRootEagerImpl.java
@@ -7,9 +7,9 @@
 import jakarta.inject.Singleton;
 import one.microstream.storage.types.StorageManager;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.util.Optional;
 import java.util.UUID;