Upgrade the integration to Eclipse Store 1.2.0, better module definitions and metadata.

Author: hrstoyanov

dependencies/pom.xml

@@ -120,8 +120,8 @@
         <version.lib.microprofile-tracing>3.0</version.lib.microprofile-tracing>
         <version.lib.microprofile-lra-api>2.0</version.lib.microprofile-lra-api>
         <version.lib.microstream>08.01.01-MS-GA</version.lib.microstream>
-        <version.lib.eclipse-store>1.1.0</version.lib.eclipse-store>
-        <version.lib.eclipse-serializer>1.1.0</version.lib.eclipse-serializer>
+        <version.lib.eclipse-store>1.2.0</version.lib.eclipse-store>
+        <version.lib.eclipse-serializer>1.2.0</version.lib.eclipse-serializer>
         <version.lib.mongodb>4.10.2</version.lib.mongodb>
         <version.lib.mssql-jdbc>8.4.1.jre8</version.lib.mssql-jdbc>
         <version.lib.mysql-connector-j>8.2.0</version.lib.mysql-connector-j>

integrations/eclipsestore/cache/pom.xml

@@ -61,6 +61,10 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.common.features</groupId>
+            <artifactId>helidon-common-features-api</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

integrations/eclipsestore/cache/src/main/java/module-info.java

@@ -13,18 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import io.helidon.common.features.api.Aot;
+import io.helidon.common.features.api.Feature;
+import io.helidon.common.features.api.HelidonFlavor;
 
 /**
  * Provides support for EclipseStore Cache features integration.
  */
 @SuppressWarnings({"requires-automatic", "requires-transitive-automatic"})
+@Feature(value = "Eclipse Store Cache",
+        description = "Eclipse Store Cache Integration",
+        in = HelidonFlavor.SE,
+        path = {"EclipseStore", "Cache"}
+)
+@Aot
 module io.helidon.integrations.eclipsestore.cache {
-
     requires transitive cache.api;
     requires transitive io.helidon.integrations.eclipsestore;
-
-    /* Eclipse Store Cache automatic module */
-    requires transitive cache;
+    requires transitive org.eclipse.store.cache;
+    requires transitive org.eclipse.serializer;
 
     exports io.helidon.integrations.eclipsestore.cache;
 }

integrations/eclipsestore/cdi/src/main/java/module-info.java

@@ -17,31 +17,22 @@
 import io.helidon.common.features.api.Aot;
 import io.helidon.common.features.api.Feature;
 import io.helidon.common.features.api.HelidonFlavor;
-import io.helidon.common.features.api.Preview;
 
-/**
- * Provides CDI support for Eclise Store integration.
- *
- * @provides jakarta.enterprise.inject.spi.Extension
- */
-@Preview
+
 @Feature(value = "Eclipse Store",
         description = "Eclipse Store Integration",
         in = HelidonFlavor.MP,
-        path = "EclipseStore"
+        path = {"EclipseStore", "CDI"}
 )
-@Aot(false)
+@Aot
 @SuppressWarnings({"requires-automatic", "requires-transitive-automatic"})
 module io.helidon.integrations.eclipsestore.cdi {
     requires jakarta.annotation;
     requires transitive cache.api;
     requires transitive jakarta.cdi;
     requires transitive jakarta.inject;
 
-    requires static io.helidon.common.features.api;
-
     requires io.helidon.integrations.eclipsestore.cache;
-
     exports io.helidon.integrations.eclipsestore.cdi;
 
     provides jakarta.enterprise.inject.spi.Extension

integrations/eclipsestore/core/pom.xml

@@ -68,12 +68,6 @@
             <artifactId>hamcrest-all</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.serializer</groupId>
-            <artifactId>serializer</artifactId>
-            <version>1.1.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

integrations/eclipsestore/core/src/main/java/module-info.java

@@ -25,19 +25,15 @@
         description = "Eclipse Store Integration",
         in = HelidonFlavor.SE,
         path = "EclipseStore")
-@Aot(false)
-@SuppressWarnings({ "requires-automatic", "requires-transitive-automatic" })
+@Aot
+//@SuppressWarnings({ "requires-automatic", "requires-transitive-automatic" })
 module io.helidon.integrations.eclipsestore {
-    requires static io.helidon.common.features.api;
+    requires transitive static io.helidon.common.features.api;
     requires transitive io.helidon.config;
+    requires transitive io.helidon.common;
 
-    /* Eclipse Store automatic modules */
-    requires transitive storage;
-    requires transitive storage.embedded;
-    requires transitive storage.embedded.configuration;
-    requires transitive serializer;
-    requires transitive configuration;
-    requires transitive persistence.binary.jdk17;
+    requires transitive org.eclipse.store.storage.embedded.configuration;
+    requires transitive org.eclipse.serializer.persistence.binary.jdk17;
 
     exports io.helidon.integrations.eclipsestore.core;
 }

integrations/eclipsestore/health/src/main/java/module-info.java

@@ -14,14 +14,21 @@
  * limitations under the License.
  */
 
+import io.helidon.common.features.api.Aot;
+import io.helidon.common.features.api.Feature;
+import io.helidon.common.features.api.HelidonFlavor;
+
 /**
  * Provides support for MEclipse Store HealthChecks features integration.
  */
+@Feature(value = "Eclipse Store Health",
+        description = "Eclipse Store Health Integration",
+        in = HelidonFlavor.SE,
+        path = {"EclipseStore", "Health"}
+)
+@Aot
 module io.helidon.integrations.eclipsestore.health {
-
-    requires transitive io.helidon.common;
     requires transitive io.helidon.health;
-
     requires transitive io.helidon.integrations.eclipsestore;
 
     exports io.helidon.integrations.eclipsestore.health;

integrations/eclipsestore/metrics/pom.xml

@@ -60,6 +60,10 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.common.features</groupId>
+            <artifactId>helidon-common-features-api</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

integrations/eclipsestore/metrics/src/main/java/module-info.java

@@ -14,13 +14,19 @@
  * limitations under the License.
  */
 
+import io.helidon.common.features.api.Aot;
+import io.helidon.common.features.api.Feature;
+import io.helidon.common.features.api.HelidonFlavor;
 /**
  * Provides support for Eclipse Store Metrics features integration.
  */
+@Feature(value = "Eclipse Store Metrics",
+        description = "Eclipse Store Metrics Integration",
+        in = HelidonFlavor.SE,
+        path = {"EclipseStore", "Metrics"}
+)
+@Aot
 module io.helidon.integrations.eclipsestore.metrics {
-
-    requires transitive io.helidon.common;
-    requires transitive io.helidon.config;
     requires transitive io.helidon.metrics.api;
 
     requires transitive io.helidon.integrations.eclipsestore;