Bump Helidon version

thegridman · Jan 15, 2024 · 5c11dfc · 5c11dfc
1 parent 627ea3d
commit 5c11dfc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/coherence-matrix.yaml b/.github/workflows/coherence-matrix.yaml
@@ -71,7 +71,7 @@ jobs:
 
           - matrixName: "22.06"
             coherenceVersion: "22.06.6"
-            coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.7"
+            coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.6"
             javaVersion: 11
             baseImage: "gcr.io/distroless/java11-debian11"
 

diff --git a/java/operator-test-helidon/pom.xml b/java/operator-test-helidon/pom.xml
@@ -66,7 +66,7 @@
                 <version>${version.plugin.jib}</version>
                 <configuration>
                     <container>
-                      <mainClass>io.helidon.microprofile.server.Main</mainClass>
+                      <mainClass>io.helidon.microprofile.cdi.Main</mainClass>
                     </container>
                     <!-- MUST use packaged mode for Helidon CDI application -->
                     <containerizingMode>packaged</containerizingMode>

diff --git a/java/pom.xml b/java/pom.xml
@@ -62,7 +62,6 @@
         <version.lib.glassfish.copyright>2.1</version.lib.glassfish.copyright>
         <version.lib.hamcrest>1.3</version.lib.hamcrest>
         <version.lib.helidon>2.6.5</version.lib.helidon>
-        <version.lib.jandex>2.1.1.Final</version.lib.jandex>
         <version.lib.junit>4.13.1</version.lib.junit>
         <version.lib.junit.jupiter>5.7.2</version.lib.junit.jupiter>
         <version.lib.mockito>3.10.0</version.lib.mockito>
@@ -146,14 +145,11 @@
 
             <!-- Helidon -->
             <dependency>
-                <groupId>io.helidon.microprofile.bundles</groupId>
-                <artifactId>helidon-microprofile</artifactId>
+                <groupId>io.helidon</groupId>
+                <artifactId>helidon-dependencies</artifactId>
                 <version>${version.lib.helidon}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss</groupId>
-                <artifactId>jandex</artifactId>
-                <version>${version.lib.jandex}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>jakarta.activation</groupId>

diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  */
@@ -34,7 +34,7 @@ const (
 	// DefaultMain is an indicator to run the default main class.
 	DefaultMain = "$DEFAULT$"
 	// HelidonMain is the default Helidon main class name.
-	HelidonMain = "io.helidon.microprofile.server.Main"
+	HelidonMain = "io.helidon.microprofile.cdi.Main"
 	// ServerMain is the default server main class name.
 	ServerMain = "com.oracle.coherence.k8s.Main"
 	// SpringBootMain is the default Spring Boot main class name.