Integrate Coherence CE 24.03 (#68)

Integrate Helidon 3.2.6
oracle · Mar 26, 2024 · 7c3df12 · 7c3df12
1 parent 82f1be2
commit 7c3df12
Show file tree

Hide file tree

Showing 7 changed files with 145 additions and 37 deletions.
diff --git a/carts/pom.xml b/carts/pom.xml
@@ -14,14 +14,14 @@
     <parent>
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
-        <version>3.2.5</version>
+        <version>3.2.6</version>
         <relativePath/>
     </parent>
 
     <groupId>com.oracle.coherence.examples.sockshop.helidon</groupId>
     <artifactId>carts</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
 
     <name>${project.artifactId}</name>
     <description>Shopping Cart service for Helidon Sock Shop demo application</description>
@@ -33,13 +33,16 @@
         <jib.goal>dockerBuild</jib.goal>
 
         <!-- dependencies -->
-        <version.lib.coherence>23.09.2</version.lib.coherence>
+        <version.lib.coherence>24.03</version.lib.coherence>
         <version.lib.lombok>1.18.32</version.lib.lombok>
         <version.lib.junit>5.10.2</version.lib.junit>
         <version.lib.hamcrest>2.2</version.lib.hamcrest>
+        <version.lib.jandex>3.1.6</version.lib.jandex>
         <version.lib.rest-assured>5.4.0</version.lib.rest-assured>
-        <version.plugin.surefire>2.22.2</version.plugin.surefire>
-        <version.plugin.failsafe>2.22.2</version.plugin.failsafe>
+        <version.plugin.surefire>3.2.5</version.plugin.surefire>
+        <version.plugin.failsafe>3.2.5</version.plugin.failsafe>
+        <version.plugin.jandex>${version.lib.jandex}</version.plugin.jandex>
+        <version.plugin.jar>3.3.0</version.plugin.jar>
         <version.plugin.surefire.provider.junit>1.3.2</version.plugin.surefire.provider.junit>
         <version.plugin.jib>3.4.1</version.plugin.jib>
         <version.lib.jaeger>1.8.1</version.lib.jaeger>
@@ -82,6 +85,12 @@
         <dependency>
             <groupId>io.helidon.microprofile.bundles</groupId>
             <artifactId>helidon-microprofile</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jandex</artifactId>
+                    <groupId>org.jboss</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.helidon.tracing</groupId>
@@ -109,6 +118,13 @@
             <version>${version.lib.coherence}</version>
         </dependency>
 
+        <!-- jandex -->
+        <dependency>
+            <groupId>io.smallrye</groupId>
+            <artifactId>jandex</artifactId>
+            <version>${version.lib.jandex}</version>
+        </dependency>
+
         <!-- tracing -->
         <dependency>
             <groupId>io.jaegertracing</groupId>
@@ -154,8 +170,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jboss.jandex</groupId>
+                <groupId>io.smallrye</groupId>
                 <artifactId>jandex-maven-plugin</artifactId>
+                <version>${version.plugin.jandex}</version>
                 <executions>
                     <execution>
                         <id>make-index</id>
@@ -185,6 +202,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>${version.plugin.jar}</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/catalog/pom.xml b/catalog/pom.xml
@@ -14,14 +14,14 @@
     <parent>
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
-        <version>3.2.5</version>
+        <version>3.2.6</version>
         <relativePath/>
     </parent>
 
     <groupId>com.oracle.coherence.examples.sockshop.helidon</groupId>
     <artifactId>catalog</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
 
     <properties>
         <mainClass>com.oracle.coherence.examples.sockshop.helidon.catalog.Application</mainClass>
@@ -30,13 +30,16 @@
         <jib.goal>dockerBuild</jib.goal>
 
         <!-- dependencies -->
-        <version.lib.coherence>23.09.2</version.lib.coherence>
+        <version.lib.coherence>24.03</version.lib.coherence>
         <version.lib.lombok>1.18.32</version.lib.lombok>
         <version.lib.junit>5.10.2</version.lib.junit>
         <version.lib.hamcrest>2.2</version.lib.hamcrest>
+        <version.lib.jandex>3.1.6</version.lib.jandex>
         <version.lib.rest-assured>5.4.0</version.lib.rest-assured>
-        <version.plugin.surefire>2.22.2</version.plugin.surefire>
-        <version.plugin.failsafe>2.22.2</version.plugin.failsafe>
+        <version.plugin.surefire>3.2.5</version.plugin.surefire>
+        <version.plugin.failsafe>3.2.5</version.plugin.failsafe>
+        <version.plugin.jandex>${version.lib.jandex}</version.plugin.jandex>
+        <version.plugin.jar>3.3.0</version.plugin.jar>
         <version.plugin.surefire.provider.junit>1.3.2</version.plugin.surefire.provider.junit>
         <version.plugin.jib>3.4.1</version.plugin.jib>
         <version.lib.jaeger>1.8.1</version.lib.jaeger>
@@ -79,6 +82,12 @@
         <dependency>
             <groupId>io.helidon.microprofile.bundles</groupId>
             <artifactId>helidon-microprofile</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jandex</artifactId>
+                    <groupId>org.jboss</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.helidon.tracing</groupId>
@@ -106,6 +115,13 @@
             <version>${version.lib.coherence}</version>
         </dependency>
 
+        <!-- jandex -->
+        <dependency>
+            <groupId>io.smallrye</groupId>
+            <artifactId>jandex</artifactId>
+            <version>${version.lib.jandex}</version>
+        </dependency>
+
         <!-- tracing -->
         <dependency>
             <groupId>io.jaegertracing</groupId>
@@ -151,8 +167,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jboss.jandex</groupId>
+                <groupId>io.smallrye</groupId>
                 <artifactId>jandex-maven-plugin</artifactId>
+                <version>${version.plugin.jandex}</version>
                 <executions>
                     <execution>
                         <id>make-index</id>
@@ -182,6 +199,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>${version.plugin.jar}</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/orders/pom.xml b/orders/pom.xml
@@ -14,14 +14,14 @@
     <parent>
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
-        <version>3.2.5</version>
+        <version>3.2.6</version>
         <relativePath/>
     </parent>
 
     <groupId>com.oracle.coherence.examples.sockshop.helidon</groupId>
     <artifactId>orders</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
 
     <properties>
         <mainClass>com.oracle.coherence.examples.sockshop.helidon.orders.Application</mainClass>
@@ -31,13 +31,16 @@
 
         <!-- dependencies -->
         <version.lib.bedrock>7.0.3</version.lib.bedrock>
-        <version.lib.coherence>23.09.2</version.lib.coherence>
+        <version.lib.coherence>24.03</version.lib.coherence>
         <version.lib.lombok>1.18.32</version.lib.lombok>
         <version.lib.junit>5.10.2</version.lib.junit>
         <version.lib.hamcrest>2.2</version.lib.hamcrest>
+        <version.lib.jandex>3.1.6</version.lib.jandex>
         <version.lib.rest-assured>5.4.0</version.lib.rest-assured>
-        <version.plugin.surefire>2.22.2</version.plugin.surefire>
-        <version.plugin.failsafe>2.22.2</version.plugin.failsafe>
+        <version.plugin.surefire>3.2.5</version.plugin.surefire>
+        <version.plugin.failsafe>3.2.5</version.plugin.failsafe>
+        <version.plugin.jandex>${version.lib.jandex}</version.plugin.jandex>
+        <version.plugin.jar>3.3.0</version.plugin.jar>
         <version.plugin.surefire.provider.junit>1.3.2</version.plugin.surefire.provider.junit>
         <version.plugin.jib>3.4.1</version.plugin.jib>
         <version.lib.jaeger>1.8.1</version.lib.jaeger>
@@ -82,6 +85,12 @@
         <dependency>
             <groupId>io.helidon.microprofile.bundles</groupId>
             <artifactId>helidon-microprofile</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jandex</artifactId>
+                    <groupId>org.jboss</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.helidon.microprofile.grpc</groupId>
@@ -113,6 +122,13 @@
             <version>${version.lib.coherence}</version>
         </dependency>
 
+        <!-- jandex -->
+        <dependency>
+            <groupId>io.smallrye</groupId>
+            <artifactId>jandex</artifactId>
+            <version>${version.lib.jandex}</version>
+        </dependency>
+
         <!-- tracing -->
         <dependency>
             <groupId>io.jaegertracing</groupId>
@@ -169,8 +185,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jboss.jandex</groupId>
+                <groupId>io.smallrye</groupId>
                 <artifactId>jandex-maven-plugin</artifactId>
+                <version>${version.plugin.jandex}</version>
                 <executions>
                     <execution>
                         <id>make-index</id>
@@ -200,6 +217,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>${version.plugin.jar}</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/payment/pom.xml b/payment/pom.xml
@@ -14,14 +14,14 @@
     <parent>
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
-        <version>3.2.5</version>
+        <version>3.2.6</version>
         <relativePath/>
     </parent>
 
     <groupId>com.oracle.coherence.examples.sockshop.helidon</groupId>
     <artifactId>payment</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
 
     <properties>
         <mainClass>com.oracle.coherence.examples.sockshop.helidon.payment.Application</mainClass>
@@ -30,14 +30,17 @@
         <jib.goal>dockerBuild</jib.goal>
 
         <!-- dependencies -->
-        <version.lib.coherence>23.09.2</version.lib.coherence>
+        <version.lib.coherence>24.03</version.lib.coherence>
         <version.lib.lombok>1.18.32</version.lib.lombok>
         <version.lib.junit>5.10.2</version.lib.junit>
         <version.lib.hamcrest>2.2</version.lib.hamcrest>
+        <version.lib.jandex>3.1.6</version.lib.jandex>
         <version.lib.mockito>3.9.0</version.lib.mockito>
         <version.lib.rest-assured>5.4.0</version.lib.rest-assured>
-        <version.plugin.surefire>2.22.2</version.plugin.surefire>
-        <version.plugin.failsafe>2.22.2</version.plugin.failsafe>
+        <version.plugin.surefire>3.2.5</version.plugin.surefire>
+        <version.plugin.failsafe>3.2.5</version.plugin.failsafe>
+        <version.plugin.jandex>${version.lib.jandex}</version.plugin.jandex>
+        <version.plugin.jar>3.3.0</version.plugin.jar>
         <version.plugin.surefire.provider.junit>1.3.2</version.plugin.surefire.provider.junit>
         <version.plugin.jib>3.4.1</version.plugin.jib>
         <version.lib.jaeger>1.8.1</version.lib.jaeger>
@@ -80,6 +83,12 @@
         <dependency>
             <groupId>io.helidon.microprofile.bundles</groupId>
             <artifactId>helidon-microprofile</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jandex</artifactId>
+                    <groupId>org.jboss</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.helidon.microprofile.grpc</groupId>
@@ -115,6 +124,13 @@
             <version>${version.lib.coherence}</version>
         </dependency>
 
+        <!-- jandex -->
+        <dependency>
+            <groupId>io.smallrye</groupId>
+            <artifactId>jandex</artifactId>
+            <version>${version.lib.jandex}</version>
+        </dependency>
+
         <!-- tracing -->
         <dependency>
             <groupId>io.jaegertracing</groupId>
@@ -170,8 +186,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jboss.jandex</groupId>
+                <groupId>io.smallrye</groupId>
                 <artifactId>jandex-maven-plugin</artifactId>
+                <version>${version.plugin.jandex}</version>
                 <executions>
                     <execution>
                         <id>make-index</id>
@@ -201,6 +218,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>${version.plugin.jar}</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     <groupId>com.oracle.coherence.examples.sockshop.helidon</groupId>
     <artifactId>sockshop-coh</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
 
     <modules>
         <module>carts</module>