diff --git a/.github/workflows/coherence-matrix.yaml b/.github/workflows/coherence-matrix.yaml index 22658f18..1e45a556 100644 --- a/.github/workflows/coherence-matrix.yaml +++ b/.github/workflows/coherence-matrix.yaml @@ -70,8 +70,8 @@ jobs: baseImage: "gcr.io/distroless/java17-debian12" - matrixName: "22.06" - coherenceVersion: "22.06.6" - coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.6" + coherenceVersion: "22.06.7" + 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-15" + coherenceVersion: "14.1.1-0-16" javaVersion: 8 - coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-15" + coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-16" baseImage: "gcr.io/distroless/java11-debian11" - matrixName: "14.1.1.0.0" diff --git a/.github/workflows/compatibility-tests.yaml b/.github/workflows/compatibility-tests.yaml index fb71d1e9..1f2756c6 100644 --- a/.github/workflows/compatibility-tests.yaml +++ b/.github/workflows/compatibility-tests.yaml @@ -47,35 +47,35 @@ jobs: - 3.2.6 include: - compatibilityVersion: 3.3.2 - coherence-image: "ghcr.io/oracle/coherence-ce:22.06.6" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7" 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.6" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7" 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.6" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7" 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.6" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7" 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.6" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7" 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.6" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7" 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.6" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7" 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.6" + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7" compatibilitySelector: control-plane=coherence k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16 diff --git a/Makefile b/Makefile index 8d01a2ce..226a53c5 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ KUBERNETES_DOC_VERSION=v1.28 # ---------------------------------------------------------------------------------------------------------------------- # The Coherence version to build against - must be a Java 8 compatible version COHERENCE_VERSION ?= 21.12.5 -COHERENCE_VERSION_LTS ?= 22.06.6 +COHERENCE_VERSION_LTS ?= 22.06.7 # 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/examples/015_simple_image/README.adoc b/examples/015_simple_image/README.adoc index 065d6942..e4003a14 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.6") + implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7") ---- 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.6") + implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7") 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 5beefb71..3a8afbb0 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.6") + implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7") 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 e688f21e..df1009b2 100644 --- a/examples/015_simple_image/pom.xml +++ b/examples/015_simple_image/pom.xml @@ -24,7 +24,7 @@ 11 11 - 22.06.6 + 22.06.7 3.4.0 diff --git a/examples/016_simple_docker_image/README.adoc b/examples/016_simple_docker_image/README.adoc index 714fd9b0..94654c0b 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.6.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.7.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.6") + implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7") 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 72680aef..c30a9058 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.6") + implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7") 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 ad1ebf48..65d858a1 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.6 + 22.06.7 3.3.2 diff --git a/examples/021_deployment/pom.xml b/examples/021_deployment/pom.xml index 21a78fb4..ae8a7862 100644 --- a/examples/021_deployment/pom.xml +++ b/examples/021_deployment/pom.xml @@ -16,7 +16,7 @@ com.oracle.coherence.ce - 22.06.6 + 22.06.7 1.3.1 diff --git a/examples/025_extend_client/build.gradle b/examples/025_extend_client/build.gradle index a301ab78..65a2d0dd 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.6") + implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7") implementation "com.oracle.coherence.ce:coherence" } diff --git a/examples/025_extend_client/pom.xml b/examples/025_extend_client/pom.xml index d2f1444e..ca5c8d5f 100644 --- a/examples/025_extend_client/pom.xml +++ b/examples/025_extend_client/pom.xml @@ -24,7 +24,7 @@ 11 11 - 22.06.6 + 22.06.7 3.4.0 3.0.0 diff --git a/examples/090_tls/pom.xml b/examples/090_tls/pom.xml index 7355b51f..911d840d 100644 --- a/examples/090_tls/pom.xml +++ b/examples/090_tls/pom.xml @@ -26,7 +26,7 @@ 11 com.oracle.coherence.ce - 22.06.6 + 22.06.7 3.4.0 diff --git a/examples/200_autoscaler/pom.xml b/examples/200_autoscaler/pom.xml index 8afd6b6e..19563a43 100644 --- a/examples/200_autoscaler/pom.xml +++ b/examples/200_autoscaler/pom.xml @@ -20,7 +20,7 @@ 11 com.oracle.coherence.ce - 22.06.6 + 22.06.7 3.4.0 diff --git a/examples/400_Istio/README.adoc b/examples/400_Istio/README.adoc index 583211f4..0e678839 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.6 + image: ghcr.io/oracle/coherence-ce:22.06.7 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.6 # <1> + image: ghcr.io/oracle/coherence-ce:22.06.7 # <1> restartPolicy: Never cluster: storage # <2> coherence: diff --git a/examples/no-operator/04_istio/Dockerfile b/examples/no-operator/04_istio/Dockerfile index 22482b3f..d7f99ed6 100644 --- a/examples/no-operator/04_istio/Dockerfile +++ b/examples/no-operator/04_istio/Dockerfile @@ -1,9 +1,9 @@ FROM ghcr.io/oracle/coherence-operator:3.3.3 AS Builder -FROM ghcr.io/oracle/coherence-ce:22.06.6 +FROM ghcr.io/oracle/coherence-ce:22.06.7 COPY --from=Builder /files /files COPY --from=Builder /files/lib/coherence-operator.jar /app/libs/coherence-operator.jar -COPY coherence-java-client-22.06.6.jar /app/libs/coherence-java-client-22.06.6.jar +COPY coherence-java-client-22.06.7.jar /app/libs/coherence-java-client-22.06.7.jar ENTRYPOINT ["files/runner"] CMD ["-h"] \ No newline at end of file diff --git a/examples/no-operator/04_istio/README.adoc b/examples/no-operator/04_istio/README.adoc index 06760987..5aaebdb0 100644 --- a/examples/no-operator/04_istio/README.adoc +++ b/examples/no-operator/04_istio/README.adoc @@ -225,7 +225,7 @@ spec: spec: containers: - name: coherence - image: ghcr.io/oracle/coherence-ce:22.06.6 # <2> + image: ghcr.io/oracle/coherence-ce:22.06.7 # <2> env: - name: COHERENCE_CLUSTER # <3> value: "test-cluster" @@ -408,7 +408,7 @@ The port could be changed by setting the `COHERENCE_EXTEND_PORT` environment var spec: containers: - name: coherence - image: ghcr.io/oracle/coherence-ce:22.06.6 + image: ghcr.io/oracle/coherence-ce:22.06.7 env: - name: COHERENCE_EXTEND_PORT value: "20001" @@ -434,7 +434,7 @@ This port can be changed by using the `COHERENCE_GRPC_SERVER_PORT` environment v spec: containers: - name: coherence - image: ghcr.io/oracle/coherence-ce:22.06.6 + image: ghcr.io/oracle/coherence-ce:22.06.7 env: - name: COHERENCE_GRPC_SERVER_PORT value: "1408" @@ -476,10 +476,10 @@ Various utilities are copied from the Operator image into the base. ---- FROM ghcr.io/oracle/coherence-operator:3.3.3 AS Builder -FROM ghcr.io/oracle/coherence-ce:22.06.6 +FROM ghcr.io/oracle/coherence-ce:22.06.7 COPY --from=Builder /files /files COPY --from=Builder /files/lib/coherence-operator.jar /app/libs/coherence-operator.jar -COPY coherence-java-client-22.06.6.jar /app/libs/coherence-java-client-22.06.6.jar +COPY coherence-java-client-22.06.7.jar /app/libs/coherence-java-client-22.06.7.jar ENTRYPOINT ["files/runner"] CMD ["-h"] @@ -490,8 +490,8 @@ Coherence gRPC client jar. We can download this with `curl` to the same director [source,bash] ---- -curl -s https://repo1.maven.org/maven2/com/oracle/coherence/ce/coherence-java-client/22.06.6/coherence-java-client-22.06.6.jar \ - -o coherence-java-client-22.06.6.jar +curl -s https://repo1.maven.org/maven2/com/oracle/coherence/ce/coherence-java-client/22.06.7/coherence-java-client-22.06.7.jar \ + -o coherence-java-client-22.06.7.jar ---- Build the image with the following command: diff --git a/examples/no-operator/04_istio/storage.yaml b/examples/no-operator/04_istio/storage.yaml index c3939fb9..894259a4 100644 --- a/examples/no-operator/04_istio/storage.yaml +++ b/examples/no-operator/04_istio/storage.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: coherence - image: ghcr.io/oracle/coherence-ce:22.06.6 # <2> + image: ghcr.io/oracle/coherence-ce:22.06.7 # <2> env: - name: COHERENCE_CLUSTER # <3> value: "test-cluster" diff --git a/examples/no-operator/test-client/pom.xml b/examples/no-operator/test-client/pom.xml index 8ac7c80e..cff9a921 100644 --- a/examples/no-operator/test-client/pom.xml +++ b/examples/no-operator/test-client/pom.xml @@ -23,7 +23,7 @@ 11 - 22.06.6 + 22.06.7 ${project.basedir} diff --git a/java/coherence-operator/src/test/java/com/oracle/coherence/k8s/CoherenceVersionTest.java b/java/coherence-operator/src/test/java/com/oracle/coherence/k8s/CoherenceVersionTest.java index eccc5dde..aea5d435 100644 --- a/java/coherence-operator/src/test/java/com/oracle/coherence/k8s/CoherenceVersionTest.java +++ b/java/coherence-operator/src/test/java/com/oracle/coherence/k8s/CoherenceVersionTest.java @@ -60,9 +60,9 @@ public void shouldWorkWithInterimBuild() throws Exception { @Test public void shouldWorkWithCE() throws Exception { assertThat(CoherenceVersion.versionCheck("14.1.1.0.15", "22.06.1"), is(false)); - assertThat(CoherenceVersion.versionCheck("14.1.1.2206.5", "22.06.6"), is(false)); + assertThat(CoherenceVersion.versionCheck("14.1.1.2206.5", "22.06.7"), is(false)); assertThat(CoherenceVersion.versionCheck("14.1.1.2206.7", "22.06.7"), is(true)); - assertThat(CoherenceVersion.versionCheck("22.06.5", "22.06.6"), is(false)); + assertThat(CoherenceVersion.versionCheck("22.06.5", "22.06.7"), is(false)); assertThat(CoherenceVersion.versionCheck("22.06.7", "22.06.7"), is(true)); } diff --git a/java/pom.xml b/java/pom.xml index 11e5fd1b..215d64c9 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -40,7 +40,7 @@ 21.12.4 - 22.06.6 + 22.06.7 com.oracle.coherence.ce ${coherence.version}