Fixing builds

thegridman · Jan 15, 2024 · b3826c7 · b3826c7
1 parent 5b8cc7c
commit b3826c7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/coherence-matrix.yaml b/.github/workflows/coherence-matrix.yaml
@@ -70,7 +70,7 @@ jobs:
             baseImage: "gcr.io/distroless/java17-debian12"
 
           - matrixName: "22.06"
-            coherenceVersion: "22.06.7"
+            coherenceVersion: "22.06.6"
             coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.7"
             javaVersion: 11
             baseImage: "gcr.io/distroless/java11-debian11"
@@ -88,9 +88,9 @@ jobs:
             baseImage: "gcr.io/distroless/java11-debian11"
 
           - matrixName: "14.1.1-0"
-            coherenceVersion: "14.1.1-0-16"
+            coherenceVersion: "14.1.1-0-15"
             javaVersion: 8
-            coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-16"
+            coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-15"
             baseImage: "gcr.io/distroless/java11-debian11"
 
           - matrixName: "14.1.1.0.0"

diff --git a/Makefile b/Makefile
@@ -38,11 +38,12 @@ KUBERNETES_DOC_VERSION=v1.28
 # The Coherence image to use for deployments that do not specify an image
 # ----------------------------------------------------------------------------------------------------------------------
 # The Coherence version to build against - must be a Java 8 compatible version
-COHERENCE_VERSION ?= 21.12.5
+COHERENCE_VERSION     ?= 21.12.5
+COHERENCE_VERSION_LTS ?= 22.06.6
 # The default Coherence image the Operator will run if no image is specified
 COHERENCE_IMAGE_REGISTRY ?= ghcr.io/oracle
 COHERENCE_IMAGE_NAME     ?= coherence-ce
-COHERENCE_IMAGE_TAG      ?= 22.06.6
+COHERENCE_IMAGE_TAG      ?= $(COHERENCE_VERSION_LTS)
 COHERENCE_IMAGE          ?= $(COHERENCE_IMAGE_REGISTRY)/$(COHERENCE_IMAGE_NAME):$(COHERENCE_IMAGE_TAG)
 # The Java version that tests will be compiled to.
 # This should match the version required by the COHERENCE_IMAGE version
@@ -87,7 +88,7 @@ OPERATOR_SDK_VERSION := v1.9.0
 # Options to append to the Maven command
 # ----------------------------------------------------------------------------------------------------------------------
 MAVEN_OPTIONS ?= -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
-MAVEN_BUILD_OPTS :=$(USE_MAVEN_SETTINGS) -Drevision=$(MVN_VERSION) -Dcoherence.version=$(COHERENCE_VERSION) -Dcoherence.test.base.image=$(COHERENCE_TEST_BASE_IMAGE) -Dbuild.java.version=$(BUILD_JAVA_VERSION) $(MAVEN_OPTIONS)
+MAVEN_BUILD_OPTS :=$(USE_MAVEN_SETTINGS) -Drevision=$(MVN_VERSION) -Dcoherence.version=$(COHERENCE_VERSION) -Dcoherence.version.2206=$(COHERENCE_VERSION_LTS) -Dcoherence.test.base.image=$(COHERENCE_TEST_BASE_IMAGE) -Dbuild.java.version=$(BUILD_JAVA_VERSION) $(MAVEN_OPTIONS)
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Operator image names

diff --git a/java/operator-test-helidon/pom.xml b/java/operator-test-helidon/pom.xml
@@ -28,14 +28,17 @@
         <dependency>
             <groupId>com.oracle.coherence.ce</groupId>
             <artifactId>coherence</artifactId>
+            <version>${coherence.version.2206}</version>
         </dependency>
         <dependency>
             <groupId>com.oracle.coherence.ce</groupId>
             <artifactId>coherence-cdi-server</artifactId>
+            <version>${coherence.version.2206}</version>
         </dependency>
         <dependency>
             <groupId>com.oracle.coherence.ce</groupId>
             <artifactId>coherence-management</artifactId>
+            <version>${coherence.version.2206}</version>
         </dependency>
 
         <dependency>

diff --git a/java/operator-test-spring/pom.xml b/java/operator-test-spring/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.oracle.coherence.ce</groupId>
       <artifactId>coherence</artifactId>
-      <version>${coherence.version}</version>
+      <version>${coherence.version.2206}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>

diff --git a/java/pom.xml b/java/pom.xml
@@ -40,6 +40,7 @@
 
         <!--  The Coherence jar version (compile time dependency) -->
         <coherence.version>21.12.4</coherence.version>
+        <coherence.version.2206>22.06.6</coherence.version.2206>
         <!-- The version of Coherence to use in the test images -->
         <coherence.test.groupId>com.oracle.coherence.ce</coherence.test.groupId>
         <coherence.test.version>${coherence.version}</coherence.test.version>