diff --git a/.github/workflows/coherence-matrix.yaml b/.github/workflows/coherence-matrix.yaml index 9cfa5e6e..b731c3b5 100644 --- a/.github/workflows/coherence-matrix.yaml +++ b/.github/workflows/coherence-matrix.yaml @@ -35,8 +35,8 @@ jobs: matrixName: - "15.1.1-0-SNAPSHOT" - "15.1.1-0-SNAPSHOT-Graal" - - "24.03" - - "24.03-Graal" + - "24.09" + - "24.09-Graal" - "22.06" - "14.1.2-0-SNAPSHOT" - "14.1.1-2206-SNAPSHOT" @@ -58,21 +58,21 @@ jobs: javaVersion: 17 baseImage: "gcr.io/distroless/java17-debian12" - - matrixName: "24.03" - coherenceVersion: "24.03.1" - coherenceImage: "ghcr.io/oracle/coherence-ce:24.03.1" + - matrixName: "24.09" + coherenceVersion: "24.09" + coherenceImage: "ghcr.io/oracle/coherence-ce:24.09" javaVersion: 17 baseImage: "gcr.io/distroless/java17-debian12" - - matrixName: "24.03-Graal" - coherenceVersion: "24.03.1" - coherenceImage: "ghcr.io/oracle/coherence-ce:24.03.1-graal" + - matrixName: "24.09-Graal" + coherenceVersion: "24.09" + coherenceImage: "ghcr.io/oracle/coherence-ce:24.09-graal" javaVersion: 17 baseImage: "gcr.io/distroless/java17-debian12" - matrixName: "22.06" - coherenceVersion: "22.06.9" - coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.9" + coherenceVersion: "22.06.10" + coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.10" javaVersion: 11 baseImage: "gcr.io/distroless/java11-debian11" @@ -89,15 +89,15 @@ jobs: baseImage: "gcr.io/distroless/java11-debian11" - matrixName: "14.1.1-0-SNAPSHOT" - coherenceVersion: "14.1.1-0-19-SNAPSHOT" + coherenceVersion: "14.1.1-0-20-SNAPSHOT" coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-0-19-SNAPSHOT" javaVersion: 8 baseImage: "gcr.io/distroless/java11-debian11" - matrixName: "14.1.1-0" - coherenceVersion: "14.1.1-0-18" + coherenceVersion: "14.1.1-0-19" javaVersion: 8 - coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-18" + coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-19" baseImage: "gcr.io/distroless/java11-debian11" - matrixName: "14.1.1.0.0" @@ -113,8 +113,8 @@ jobs: baseImage: "gcr.io/distroless/java11-debian11" - matrixName: "12.2.1-4-SNAPSHOT" - coherenceVersion: "12.2.1-4-21-SNAPSHOT" - coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:12.2.1-4-21-SNAPSHOT" + coherenceVersion: "12.2.1-4-24-SNAPSHOT" + coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:12.2.1-4-24-SNAPSHOT" javaVersion: 8 baseImage: "gcr.io/distroless/java11-debian11" diff --git a/.github/workflows/compatibility-tests.yaml b/.github/workflows/compatibility-tests.yaml index 06f9aceb..386339da 100644 --- a/.github/workflows/compatibility-tests.yaml +++ b/.github/workflows/compatibility-tests.yaml @@ -51,51 +51,51 @@ jobs: - 3.2.6 include: - compatibilityVersion: 3.4.0 - coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10" compatibilitySelector: control-plane=coherence k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245 - compatibilityVersion: 3.3.5 - coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10" compatibilitySelector: control-plane=coherence k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245 - compatibilityVersion: 3.3.4 - coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10" compatibilitySelector: control-plane=coherence k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245 - compatibilityVersion: 3.3.3 - coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10" compatibilitySelector: control-plane=coherence k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72 - compatibilityVersion: 3.3.2 - coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10" compatibilitySelector: control-plane=coherence k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72 - compatibilityVersion: 3.3.1 - coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10" compatibilitySelector: control-plane=coherence k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72 - compatibilityVersion: 3.3.0 - coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10" compatibilitySelector: control-plane=coherence k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72 - compatibilityVersion: 3.2.11 - coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10" compatibilitySelector: control-plane=coherence k8s: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb - compatibilityVersion: 3.2.10 - coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10" compatibilitySelector: control-plane=coherence k8s: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb - compatibilityVersion: 3.2.9 - coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10" compatibilitySelector: control-plane=coherence k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16 - compatibilityVersion: 3.2.7 - coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10" compatibilitySelector: control-plane=coherence k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16 - compatibilityVersion: 3.2.6 - coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10" compatibilitySelector: control-plane=coherence k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16 diff --git a/Makefile b/Makefile index fb605231..d84e400a 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ KUBERNETES_DOC_VERSION=v1.30 # ---------------------------------------------------------------------------------------------------------------------- # The Coherence version to build against - must be a Java 8 compatible version COHERENCE_VERSION ?= 21.12.5 -COHERENCE_VERSION_LTS ?= 22.06.9 +COHERENCE_VERSION_LTS ?= 22.06.10 # The default Coherence image the Operator will run if no image is specified COHERENCE_IMAGE_REGISTRY ?= ghcr.io/oracle COHERENCE_IMAGE_NAME ?= coherence-ce diff --git a/docs/management/100_tmb_test.adoc b/docs/management/100_tmb_test.adoc index 97503b54..28cff1bb 100644 --- a/docs/management/100_tmb_test.adoc +++ b/docs/management/100_tmb_test.adoc @@ -54,7 +54,7 @@ spec: restartPolicy: Never containers: - name: coherence - image: ghcr.io/oracle/coherence-ce:22.06 # <1> + image: ghcr.io/oracle/coherence-ce:22.06.10 # <1> ports: - name: mbus containerPort: 8000 @@ -101,7 +101,7 @@ spec: restartPolicy: Never containers: - name: coherence - image: ghcr.io/oracle/coherence-ce:22.06 + image: ghcr.io/oracle/coherence-ce:22.06.10 command: - java # <1> - -cp diff --git a/examples/015_simple_image/README.adoc b/examples/015_simple_image/README.adoc index b2edd037..91065a85 100644 --- a/examples/015_simple_image/README.adoc +++ b/examples/015_simple_image/README.adoc @@ -52,7 +52,7 @@ In the `build.gradle` file we add the bom as a platform dependency. .build.gradle ---- dependencies { - implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7") + implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.10") ---- We can then add the `coherence` and `coherence-json` modules as dependencies @@ -77,7 +77,7 @@ In the `build.gradle` file we add the bom as a platform dependency. .build.gradle ---- dependencies { - implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7") + implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.10") implementation "com.oracle.coherence.ce:coherence" implementation "com.oracle.coherence.ce:coherence-json" diff --git a/examples/015_simple_image/build.gradle b/examples/015_simple_image/build.gradle index a9ce0d4b..9db598d7 100644 --- a/examples/015_simple_image/build.gradle +++ b/examples/015_simple_image/build.gradle @@ -19,7 +19,7 @@ repositories { } dependencies { - implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7") + implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.10") implementation "com.oracle.coherence.ce:coherence" implementation "com.oracle.coherence.ce:coherence-json" diff --git a/examples/015_simple_image/pom.xml b/examples/015_simple_image/pom.xml index 38de9bef..376574f4 100644 --- a/examples/015_simple_image/pom.xml +++ b/examples/015_simple_image/pom.xml @@ -24,7 +24,7 @@ 11 11 - 22.06.7 + 22.06.10 3.4.1 diff --git a/examples/016_simple_docker_image/README.adoc b/examples/016_simple_docker_image/README.adoc index 2c768025..d752efe8 100644 --- a/examples/016_simple_docker_image/README.adoc +++ b/examples/016_simple_docker_image/README.adoc @@ -205,7 +205,7 @@ The `image-assembly.xml` descriptor file is shown below, and configures the foll * There are two `` configured: ** The first copies any class files in `target/classes` to `app/classes` (which will actually be `target/docker/app/classes`) ** The second copies all files under `src/docker` (i.e. the `Dockerfile`) into `target/docker` -* The `` configuration copies all the project dependencies (including transitive dependencies) to the `app/libs` directory (actually the `target/docker/app/libs` directory). Any version information will be stripped from the files, so `coherence-22.06.7.jar` would become `coherence.jar`. +* The `` configuration copies all the project dependencies (including transitive dependencies) to the `app/libs` directory (actually the `target/docker/app/libs` directory). Any version information will be stripped from the files, so `coherence-22.06.10.jar` would become `coherence.jar`. [source,xml] .src/assembly/image-assembly.xml @@ -274,7 +274,7 @@ In the `build.gradle` file we add the bom as a platform dependency and then add .build.gradle ---- dependencies { - implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7") + implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.10") implementation "com.oracle.coherence.ce:coherence" implementation "com.oracle.coherence.ce:coherence-json" diff --git a/examples/016_simple_docker_image/build.gradle b/examples/016_simple_docker_image/build.gradle index f6db758c..c94781ae 100644 --- a/examples/016_simple_docker_image/build.gradle +++ b/examples/016_simple_docker_image/build.gradle @@ -18,7 +18,7 @@ repositories { } dependencies { - implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7") + implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.10") implementation "com.oracle.coherence.ce:coherence" implementation "com.oracle.coherence.ce:coherence-json" diff --git a/examples/016_simple_docker_image/pom.xml b/examples/016_simple_docker_image/pom.xml index cddb63b7..c2b7fef9 100644 --- a/examples/016_simple_docker_image/pom.xml +++ b/examples/016_simple_docker_image/pom.xml @@ -24,7 +24,7 @@ 11 11 - 22.06.7 + 22.06.10 3.3.2 diff --git a/examples/021_deployment/pom.xml b/examples/021_deployment/pom.xml index ae8a7862..45889bb9 100644 --- a/examples/021_deployment/pom.xml +++ b/examples/021_deployment/pom.xml @@ -16,7 +16,7 @@ com.oracle.coherence.ce - 22.06.7 + 22.06.10 1.3.1 diff --git a/examples/025_extend_client/build.gradle b/examples/025_extend_client/build.gradle index 943908bc..860e6d5f 100644 --- a/examples/025_extend_client/build.gradle +++ b/examples/025_extend_client/build.gradle @@ -19,7 +19,7 @@ repositories { } dependencies { - implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7") + implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.10") implementation "com.oracle.coherence.ce:coherence" } diff --git a/examples/025_extend_client/pom.xml b/examples/025_extend_client/pom.xml index a64a187c..83a5c100 100644 --- a/examples/025_extend_client/pom.xml +++ b/examples/025_extend_client/pom.xml @@ -24,7 +24,7 @@ 11 11 - 22.06.7 + 22.06.10 3.4.1 3.0.0 diff --git a/examples/090_tls/pom.xml b/examples/090_tls/pom.xml index 911d840d..73c5f413 100644 --- a/examples/090_tls/pom.xml +++ b/examples/090_tls/pom.xml @@ -26,7 +26,7 @@ 11 com.oracle.coherence.ce - 22.06.7 + 22.06.10 3.4.0 diff --git a/examples/200_autoscaler/pom.xml b/examples/200_autoscaler/pom.xml index 19563a43..f8d524f4 100644 --- a/examples/200_autoscaler/pom.xml +++ b/examples/200_autoscaler/pom.xml @@ -20,7 +20,7 @@ 11 com.oracle.coherence.ce - 22.06.7 + 22.06.10 3.4.0 diff --git a/examples/400_Istio/README.adoc b/examples/400_Istio/README.adoc index 1e8f36fb..0533b167 100644 --- a/examples/400_Istio/README.adoc +++ b/examples/400_Istio/README.adoc @@ -192,7 +192,7 @@ metadata: name: storage spec: replicas: 3 - image: ghcr.io/oracle/coherence-ce:22.06.7 + image: ghcr.io/oracle/coherence-ce:22.06.10 labels: app: storage # <1> version: 1.0.0 # <2> @@ -274,7 +274,7 @@ kind: CoherenceJob metadata: name: client spec: - image: ghcr.io/oracle/coherence-ce:22.06.7 # <1> + image: ghcr.io/oracle/coherence-ce:22.06.10 # <1> restartPolicy: Never cluster: storage # <2> coherence: diff --git a/examples/no-operator/04_istio/Dockerfile b/examples/no-operator/04_istio/Dockerfile index 802086bd..b12ef8be 100644 --- a/examples/no-operator/04_istio/Dockerfile +++ b/examples/no-operator/04_istio/Dockerfile @@ -1,6 +1,6 @@ FROM ghcr.io/oracle/coherence-operator:3.4.1 AS Builder -FROM ghcr.io/oracle/coherence-ce:22.06.7 +FROM ghcr.io/oracle/coherence-ce:22.06.10 COPY --from=Builder /files /files COPY --from=Builder /files/lib/coherence-operator.jar /app/libs/coherence-operator.jar COPY coherence-java-client-22.06.7.jar /app/libs/coherence-java-client-22.06.7.jar diff --git a/java/pom.xml b/java/pom.xml index 5e961c6c..2fe3660b 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -42,7 +42,7 @@ com.oracle.coherence.ce 21.12.5 - 22.06.8 + 22.06.10 com.oracle.coherence.ce gcr.io/distroless/java11-debian11