Merge branch '2.0.x' into renovate/major-managed.eclipsestore

.github/workflows/gradle.yml

@@ -70,7 +70,7 @@ jobs:
 
       - name: "📊 Publish Test Report"
         if: always()
-        uses: mikepenz/action-junit-report@v4
+        uses: mikepenz/action-junit-report@v5
         with:
           check_name: Java CI / Test Report (${{ matrix.java }})
           report_paths: '**/build/test-results/test/TEST-*.xml'

build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    id("io.micronaut.build.internal.docs")
+    id("io.micronaut.build.internal.quality-reporting")
+    id("io.micronaut.internal.build.eclipsestore-rest-cli")
+}
+
+repositories {
+    mavenCentral()
+}

buildSrc/src/main/groovy/io.micronaut.internal.build.eclipsestore-base.gradle

@@ -2,3 +2,6 @@ repositories {
     mavenCentral()
 }
 
+configurations.configureEach {
+    resolutionStrategy.preferProjectModules()
+}

eclipsestore-annotations/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     id("io.micronaut.internal.build.eclipsestore-module")
 }
+
 dependencies {
-    implementation(mn.micronaut.aop)
-    implementation(mn.micronaut.core.processor)
+    compileOnly(mn.micronaut.core.processor)
 }

eclipsestore-bom/build.gradle.kts

@@ -2,4 +2,3 @@ plugins {
     id("io.micronaut.internal.build.eclipsestore-base")
     id("io.micronaut.build.internal.bom")
 }
-tasks.named("checkVersionCatalogCompatibility").configure { enabled = false }

eclipsestore-cache/build.gradle.kts

@@ -2,13 +2,6 @@ plugins {
     id("io.micronaut.internal.build.eclipsestore-module")
 }
 
-// REMOVE ONCE FIRST RELEASE IS RELEASED
-micronautBuild {
-    binaryCompatibility {
-        enabled.set(false)
-    }
-}
-
 dependencies {
     api(projects.micronautEclipsestore)
     api(libs.managed.eclipsestore.cache)

eclipsestore-processor/build.gradle.kts

@@ -0,0 +1,15 @@
+plugins {
+    id("io.micronaut.internal.build.eclipsestore-module")
+}
+
+dependencies {
+    implementation(mn.micronaut.core.processor)
+    implementation(projects.micronautEclipsestoreAnnotations)
+}
+
+// REMOVE ONCE FIRST RELEASE IS RELEASED
+micronautBuild {
+    binaryCompatibility {
+        enabled.set(false)
+    }
+}

eclipsestore-annotations/src/main/java/io/micronaut/eclipsestore/annotations/StoreAnnotationMapperUtils.java → eclipsestore-processor/src/main/java/io/micronaut/eclipsestore/processor/StoreAnnotationMapperUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 original authors
+ * Copyright 2017-2024 original authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.micronaut.eclipsestore.annotations;
+package io.micronaut.eclipsestore.processor;
 
 import io.micronaut.core.annotation.AnnotationValue;
 import io.micronaut.core.annotation.AnnotationValueBuilder;
 import io.micronaut.core.annotation.NonNull;
+import io.micronaut.eclipsestore.annotations.Store;
+import io.micronaut.eclipsestore.annotations.StoringStrategy;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,13 +31,12 @@
  * @author Sergio del Amo
  * @since 1.0.0
  */
-public final class StoreAnnotationMapperUtils {
+final class StoreAnnotationMapperUtils {
 
     private static final String STRATEGY = "strategy";
     private static final String NAME = "name";
 
     private StoreAnnotationMapperUtils() {
-
     }
 
     @NonNull
@@ -51,9 +52,10 @@ public static AnnotationValueBuilder<Store> annotationValueBuilder(@NonNull Anno
     }
 
     @NonNull
+    @SuppressWarnings("java:S1452") // AnnotationMapper requires a wildcard generic from its map method
     public static List<AnnotationValue<?>> map(@NonNull AnnotationValue<?> annotation,
                                                @NonNull Consumer<AnnotationValueBuilder<Store>> builderConsumer) {
-        AnnotationValueBuilder<Store> builder = StoreAnnotationMapperUtils.annotationValueBuilder(annotation);
+        AnnotationValueBuilder<Store> builder = annotationValueBuilder(annotation);
         builderConsumer.accept(builder);
         List<AnnotationValue<?>> annotationValues = new ArrayList<>(1);
         annotationValues.add(builder.build());

eclipsestore-annotations/src/main/java/io/micronaut/eclipsestore/annotations/StoreParamsAnnotationMapper.java → eclipsestore-processor/src/main/java/io/micronaut/eclipsestore/processor/StoreParamsAnnotationMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 original authors
+ * Copyright 2017-2024 original authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.micronaut.eclipsestore.annotations;
+package io.micronaut.eclipsestore.processor;
 
 import io.micronaut.core.annotation.AnnotationValue;
 import io.micronaut.core.annotation.Internal;
+import io.micronaut.eclipsestore.annotations.Store;
+import io.micronaut.eclipsestore.annotations.StoreParams;
 import io.micronaut.inject.annotation.TypedAnnotationMapper;
 import io.micronaut.inject.visitor.VisitorContext;
 
 import java.util.List;
 
-
 /**
  * Maps the {@link StoreParams} annotation to the {@link Store} annotation.
  * @author Sergio del Amo

eclipsestore-annotations/src/main/java/io/micronaut/eclipsestore/annotations/StoreReturnAnnotationMapper.java → eclipsestore-processor/src/main/java/io/micronaut/eclipsestore/processor/StoreReturnAnnotationMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 original authors
+ * Copyright 2017-2024 original authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.micronaut.eclipsestore.annotations;
+package io.micronaut.eclipsestore.processor;
 
 import io.micronaut.core.annotation.AnnotationValue;
 import io.micronaut.core.annotation.Internal;
+import io.micronaut.eclipsestore.annotations.Store;
+import io.micronaut.eclipsestore.annotations.StoreReturn;
 import io.micronaut.inject.annotation.TypedAnnotationMapper;
 import io.micronaut.inject.visitor.VisitorContext;
 import java.util.List;
 
-
 /**
  * Maps the {@link StoreReturn} annotation to the {@link Store} annotation.
  * @author Sergio del Amo

eclipsestore-annotations/src/main/java/io/micronaut/eclipsestore/annotations/StoreRootAnnotationMapper.java → eclipsestore-processor/src/main/java/io/micronaut/eclipsestore/processor/StoreRootAnnotationMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 original authors
+ * Copyright 2017-2024 original authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.micronaut.eclipsestore.annotations;
+package io.micronaut.eclipsestore.processor;
 
 import io.micronaut.core.annotation.AnnotationValue;
 import io.micronaut.core.annotation.Internal;
+import io.micronaut.eclipsestore.annotations.Store;
+import io.micronaut.eclipsestore.annotations.StoreRoot;
 import io.micronaut.inject.annotation.TypedAnnotationMapper;
 import io.micronaut.inject.visitor.VisitorContext;
 import java.util.List;
 
-
 /**
  * Maps the {@link StoreRoot} annotation to the {@link Store} annotation.
  * @author Sergio del Amo

eclipsestore-processor/src/main/resources/META-INF/services/io.micronaut.inject.annotation.AnnotationMapper

@@ -0,0 +1,3 @@
+io.micronaut.eclipsestore.processor.StoreRootAnnotationMapper
+io.micronaut.eclipsestore.processor.StoreReturnAnnotationMapper
+io.micronaut.eclipsestore.processor.StoreParamsAnnotationMapper

eclipsestore-annotations/src/test/groovy/io/micronaut/eclipsestore/annotations/StoreParamsAnnotationMapperSpec.groovy → eclipsestore-processor/src/test/groovy/io/micronaut/eclipsestore/processor/StoreParamsAnnotationMapperSpec.groovy

@@ -1,6 +1,9 @@
-package io.micronaut.eclipsestore.annotations
+package io.micronaut.eclipsestore.processor
 
 import io.micronaut.core.annotation.AnnotationValue
+import io.micronaut.eclipsestore.annotations.Store
+import io.micronaut.eclipsestore.annotations.StoreParams
+import io.micronaut.eclipsestore.annotations.StoringStrategy
 import io.micronaut.inject.visitor.VisitorContext
 import spock.lang.Specification
 

eclipsestore-annotations/src/test/groovy/io/micronaut/eclipsestore/annotations/StoreReturnAnnotationMapperSpec.groovy → eclipsestore-processor/src/test/groovy/io/micronaut/eclipsestore/processor/StoreReturnAnnotationMapperSpec.groovy

@@ -1,6 +1,9 @@
-package io.micronaut.eclipsestore.annotations
+package io.micronaut.eclipsestore.processor
 
 import io.micronaut.core.annotation.AnnotationValue
+import io.micronaut.eclipsestore.annotations.Store
+import io.micronaut.eclipsestore.annotations.StoreReturn
+import io.micronaut.eclipsestore.annotations.StoringStrategy
 import io.micronaut.inject.visitor.VisitorContext
 import spock.lang.Specification
 

eclipsestore-annotations/src/test/groovy/io/micronaut/eclipsestore/annotations/StoreRootAnnotationMapperSpec.groovy → eclipsestore-processor/src/test/groovy/io/micronaut/eclipsestore/processor/StoreRootAnnotationMapperSpec.groovy

@@ -1,6 +1,9 @@
-package io.micronaut.eclipsestore.annotations
+package io.micronaut.eclipsestore.processor
 
 import io.micronaut.core.annotation.AnnotationValue
+import io.micronaut.eclipsestore.annotations.Store
+import io.micronaut.eclipsestore.annotations.StoreRoot
+import io.micronaut.eclipsestore.annotations.StoringStrategy
 import io.micronaut.inject.visitor.VisitorContext
 import spock.lang.Specification
 

eclipsestore/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 dependencies {
     compileOnly(mnMicrometer.micronaut.micrometer.core)
-    compileOnly(projects.micronautEclipsestoreAnnotations)
+
     implementation(platform(mnAws.micronaut.aws.bom))
     compileOnly(libs.awssdk.s3)
     compileOnly(libs.managed.eclipsestore.aws.s3)
@@ -22,6 +22,7 @@ dependencies {
     compileOnly(mnSql.micronaut.jdbc)
 
     api(libs.managed.eclipsestore.storage.embedded.configuration)
+    api(projects.micronautEclipsestoreAnnotations)
 
     implementation(mn.reactor)
     implementation(libs.eclipsestore.persistence.binary.jdk8)
@@ -34,7 +35,6 @@ dependencies {
     testImplementation(mn.micronaut.management)
     testImplementation(mn.micronaut.http.server.netty)
     testImplementation(mn.micronaut.http.client)
-    testImplementation(projects.micronautEclipsestoreAnnotations)
 
     testImplementation(projects.testSuiteUtils)
 

gradle.properties

@@ -1,4 +1,4 @@
-projectVersion=1.8.0-SNAPSHOT
+projectVersion=2.0.0-SNAPSHOT
 projectGroup=io.micronaut.eclipsestore
 
 title=Micronaut EclipseStore

settings.gradle → settings.gradle.kts

@@ -1,3 +1,5 @@
+import io.micronaut.build.MicronautBuildSettingsExtension
+
 pluginManagement {
     repositories {
         gradlePluginPortal()
@@ -6,28 +8,27 @@ pluginManagement {
 }
 
 plugins {
-    id 'io.micronaut.build.shared.settings' version '7.2.3'
+    id("io.micronaut.build.shared.settings") version "7.2.3"
 }
 
-rootProject.name = 'eclipsestore-parent'
-
-include 'eclipsestore-bom'
-include 'eclipsestore'
-include 'eclipsestore-annotations'
-include 'eclipsestore-cache'
-include 'eclipsestore-rest'
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
-include 'test-suite'
-include 'test-suite-utils'
-include 'test-suite-groovy'
-include 'test-suite-kotlin'
+rootProject.name = "eclipsestore-parent"
 
-micronautBuild.useStandardizedProjectNames=true
+include("eclipsestore-bom")
+include("eclipsestore")
+include("eclipsestore-annotations")
+include("eclipsestore-cache")
+include("eclipsestore-rest")
+include("eclipsestore-processor")
 
-enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+include("test-suite")
+include("test-suite-utils")
+include("test-suite-groovy")
+include("test-suite-kotlin")
 
-micronautBuild {
-    useStandardizedProjectNames = true
+configure<MicronautBuildSettingsExtension> {
+    useStandardizedProjectNames.set(true)
     importMicronautCatalog()
     importMicronautCatalog("micronaut-azure")
     importMicronautCatalog("micronaut-aws")

src/main/docs/guide/breaks.adoc

@@ -0,0 +1,8 @@
+
+This section will document breaking changes that may happen during milestone or release candidate releases, as well as major releases eg (1.x.x -> 2.x.x).
+
+== Micronaut EclipseStore 2.0.0 breaking changes
+
+- The annotation mappers have been moved from `micronaut-eclipsestore-annotations` to a new module `micronaut-eclipsestore-processor`.
++
+You will need to replace the `micronaut-eclipsestore-annotations` annotation processor (or `compileOnly` dependency with a Groovy project) with `micronaut-eclipsestore-processor` in your project.

src/main/docs/guide/dependency.adoc

@@ -1,7 +1,5 @@
 To start, add the following dependencies to your classpath.
 
-dependency:micronaut-eclipsestore-annotations[groupId="io.micronaut.eclipsestore",scope=annotationProcessor]
-
-dependency:micronaut-eclipsestore-annotations[groupId="io.micronaut.eclipsestore"]
+dependency:micronaut-eclipsestore-processor[groupId="io.micronaut.eclipsestore",scope=annotationProcessor]
 
 dependency:micronaut-eclipsestore[groupId="io.micronaut.eclipsestore"]

src/main/docs/guide/toc.yml

@@ -1,6 +1,7 @@
 introduction:
   title: Introduction
 releaseHistory: Release History
+breaks: Breaking Changes
 dependency: Dependency
 configuration: Configuration
 rootInstance: Root Instance

test-suite-groovy/build.gradle → test-suite-groovy/build.gradle.kts

@@ -1,14 +1,14 @@
 plugins {
-    id 'groovy'
-    id "io.micronaut.internal.build.eclipsestore-testsuite"
+    id("groovy")
+    id("io.micronaut.internal.build.eclipsestore-testsuite")
 }
 
 dependencies {
     testCompileOnly(mn.micronaut.inject.groovy)
+    testCompileOnly(projects.micronautEclipsestoreProcessor)
 
     testImplementation(platform(mn.micronaut.core.bom))
     testImplementation(projects.micronautEclipsestore)
-    testImplementation(projects.micronautEclipsestoreAnnotations)
     testImplementation(projects.micronautEclipsestoreCache)
     testImplementation(mnValidation.micronaut.validation)
     testImplementation(mnSerde.micronaut.serde.jackson)

test-suite-kotlin/build.gradle → test-suite-kotlin/build.gradle.kts

@@ -6,12 +6,11 @@ plugins {
 
 dependencies {
     kaptTest(platform(mn.micronaut.core.bom))
-    kaptTest(projects.micronautEclipsestoreAnnotations)
+    kaptTest(projects.micronautEclipsestoreProcessor)
     kaptTest(mnSerde.micronaut.serde.processor)
     kaptTest(mn.micronaut.inject.java)
 
     testImplementation(projects.micronautEclipsestore)
-    testImplementation(projects.micronautEclipsestoreAnnotations)
     testImplementation(projects.micronautEclipsestoreCache)
 
     testImplementation(libs.kotlin.stdlib)