Update with latest CE versions (#293)

Tim Middleton · web-flow · commit 858fb9a8e523 · 2025-04-30T08:29:38.000+08:00
* Update with latest CE versions
* update springboot version
diff --git a/.github/workflows/build-test-create-cluster-jdk21.yaml b/.github/workflows/build-test-create-cluster-jdk21.yaml
@@ -21,9 +21,9 @@ jobs:
       fail-fast: false
       matrix:
         coherenceVersion:
-          - 25.03
-          - 14.1.2-0-0
+          - 25.03.1
           - 14.1.2-0-1
+          - 14.1.2-0-2
         javaVersion:
           - 21
 
diff --git a/.github/workflows/build-test-create-cluster.yaml b/.github/workflows/build-test-create-cluster.yaml
@@ -21,11 +21,11 @@ jobs:
       fail-fast: false
       matrix:
         coherenceVersion:
-          - 22.06.11
-          - 22.06.12-SNAPSHOT
-          - 14.1.2-0-1
-          - 14.1.2-0-2-SNAPSHOT
-          - 25.03
+          - 22.06.12
+#          - 22.06.12-SNAPSHOT
+          - 14.1.2-0-2
+#          - 14.1.2-0-2-SNAPSHOT
+          - 25.03.1
         javaVersion:
           - 17
 
diff --git a/.github/workflows/build-test-monitor-cluster-jdk21.yaml b/.github/workflows/build-test-monitor-cluster-jdk21.yaml
@@ -21,11 +21,11 @@ jobs:
       fail-fast: false
       matrix:
         coherenceVersion:
-          - 22.06.11
-          - 24.09.3
+          - 22.06.12
           - 25.03
-          - 14.1.2-0-0
+          - 25.03.1
           - 14.1.2-0-1
+          - 14.1.2-0-2
         javaVersion:
           - 21
 
diff --git a/.github/workflows/build-test-monitor-health-jdk21.yaml b/.github/workflows/build-test-monitor-health-jdk21.yaml
@@ -21,11 +21,11 @@ jobs:
       fail-fast: false
       matrix:
         coherenceVersion:
-          - 22.06.11
-          - 24.09.3
+          - 22.06.12
           - 25.03
-          - 14.1.2-0-0
+          - 25.03.1
           - 14.1.2-0-1
+          - 14.1.2-0-2
         javaVersion:
           - 21
 
diff --git a/.github/workflows/build-tls.yaml b/.github/workflows/build-tls.yaml
@@ -61,7 +61,7 @@ jobs:
         export COHERENCE_TLS_CERTS_PATH=`pwd`/test/test_utils/certs/guardians-ca.crt
         export COHERENCE_TLS_CLIENT_CERT=`pwd`/test/test_utils/certs/star-lord.crt
         export COHERENCE_TLS_CLIENT_KEY=`pwd`/test/test_utils/certs/star-lord.key
-        COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=24.09.2 PROFILES=,secure make clean certs build-test-images test-cluster-startup
+        COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=14.1.2-0-2 PROFILES=,secure make clean certs build-test-images test-cluster-startup
         echo "Sleeping 30..."
         sleep 30
         export PATH=`pwd`/bin:$PATH
diff --git a/.github/workflows/build-view-cache.yaml b/.github/workflows/build-view-cache.yaml
@@ -23,12 +23,11 @@ jobs:
       fail-fast: false
       matrix:
         coherenceVersion:
-          - 22.06.12-SNAPSHOT
-          - 22.06.11
-          - 24.09.3
-          - 25.03
-          - 14.1.2-0-1
-          - 14.1.2-0-2-SNAPSHOT
+#          - 22.06.12-SNAPSHOT
+          - 22.06.12
+          - 25.03.1
+          - 14.1.2-0-2
+#          - 14.1.2-0-2-SNAPSHOT
 
 #   Checkout the source, we need a depth of zero to fetch all of the history otherwise
 #   the copyright check cannot work out the date of the files from Git.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -72,7 +72,7 @@ jobs:
     - name: E2E Local Tests
       shell: bash
       run: |
-        COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 PROFILES=,executor COHERENCE_VERSION=22.06.11 make clean build-test-images test-e2e-standalone
+        COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 PROFILES=,executor COHERENCE_VERSION=14.1.2-0-2 make clean build-test-images test-e2e-standalone
 
     - name: Discovery Tests
       shell: bash
diff --git a/.github/workflows/compatability-tests-released.yaml b/.github/workflows/compatability-tests-released.yaml
@@ -21,11 +21,11 @@ jobs:
       fail-fast: false
       matrix:
         coherenceVersion:
-          - 24.09.3
           - 25.03
-          - 22.06.11
+          - 25.03.1
+          - 22.06.12
           - 22.06.12-SNAPSHOT
-          - 14.1.2-0-1
+          - 14.1.2-0-2
           - 14.1.2-0-2-SNAPSHOT
         javaImage:
           - gcr.io/distroless/java17
diff --git a/.github/workflows/compatability-tests.yaml b/.github/workflows/compatability-tests.yaml
@@ -21,12 +21,11 @@ jobs:
       fail-fast: false
       matrix:
         coherenceVersion:
-          - 24.09.3
-          - 25.03
-          - 22.06.11
-          - 22.06.12-SNAPSHOT
-          - 14.1.2-0-1
-          - 14.1.2-0-2-SNAPSHOT
+          - 25.03.1
+          - 22.06.12
+#          - 22.06.12-SNAPSHOT
+          - 14.1.2-0-2
+#          - 14.1.2-0-2-SNAPSHOT
         javaImage:
           - gcr.io/distroless/java17
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -52,7 +52,7 @@ jobs:
 
     - name: E2E Local Tests
       shell: bash
-      run: COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=22.06.11 make clean build-test-images test-e2e-standalone
+      run: COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=14.1.2-0-2 make clean build-test-images test-e2e-standalone
 
     - name: Discovery Tests
       shell: bash
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ SHELL := /bin/bash
 MVN_VERSION ?= 1.0.0
 
 # Coherence CE version to run base tests against
-COHERENCE_VERSION ?= 14.1.2-0-1
+COHERENCE_VERSION ?= 14.1.2-0-2
 COHERENCE_GROUP_ID ?= com.oracle.coherence.ce
 COHERENCE_WKA1 ?= server1
 COHERENCE_WKA2 ?= server1
diff --git a/pkg/cmd/cluster.go b/pkg/cmd/cluster.go
@@ -745,7 +745,7 @@ var (
 )
 
 const (
-	defaultCoherenceVersion = "14.1.2-0-1"
+	defaultCoherenceVersion = "14.1.2-0-2"
 	startClusterCommand     = "start cluster"
 	scaleClusterCommand     = "scale cluster"
 	stopClusterCommand      = "stop cluster"
diff --git a/pkg/cmd/cluster_test.go b/pkg/cmd/cluster_test.go
@@ -52,9 +52,9 @@ func TestGetMavenClasspath(t *testing.T) {
 	)
 	home, _ := os.UserHomeDir()
 
-	path, err := getMavenClasspath(ce, "coherence", "14.1.2-0-1", fileTypeJar)
+	path, err := getMavenClasspath(ce, "coherence", "14.1.2-0-2", fileTypeJar)
 	g.Expect(err).To(gomega.BeNil())
-	g.Expect(path).To(gomega.Equal(home + "/.m2/repository/com/oracle/coherence/ce/coherence/14.1.2-0-1/coherence-14.1.2-0-1.jar"))
+	g.Expect(path).To(gomega.Equal(home + "/.m2/repository/com/oracle/coherence/ce/coherence/14.1.2-0-2/coherence-14.1.2-0-2.jar"))
 
 	path, err = getMavenClasspath(ce, "coherence", "22.09", fileTypeJar)
 	g.Expect(err).To(gomega.BeNil())
diff --git a/templates/springboot/pom.xml b/templates/springboot/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.4.3</version>
+    <version>3.4.5</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
 
diff --git a/templates/templates.yaml b/templates/templates.yaml
@@ -31,7 +31,7 @@ templates:
       - src/main/java/com/oracle/coherence/demo/frameworks/helidon/CustomerResource.java
 
   - name: springboot
-    frameworkVersion: "spring-boot-starter 3.4.3, coherence-spring 4.3.0"
+    frameworkVersion: "spring-boot-starter 3.4.5, coherence-spring 4.3.0"
     instructions: |
       To run Spring Boot starter you must have JDK21+ and maven 3.8.5+.
       Change to the newly created directory and run the following to build:
