From 7c7218509dea7f750832d3298f57ac9f05f72bb0 Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Wed, 10 Jan 2024 14:51:43 +0300 Subject: [PATCH 01/11] Bump version to 3.3.3 --- .github/workflows/coherence-matrix.yaml | 34 +++++++++---------- .github/workflows/compatibility-tests.yaml | 5 +++ Makefile | 6 ++-- config/crd/kustomization.yaml | 2 +- config/manager/kustomization.yaml | 2 +- config/manager/manager.yaml | 6 ++-- config/manager/service.yaml | 8 ++--- ...erence-operator.clusterserviceversion.yaml | 4 +-- docs/about/03_quickstart.adoc | 2 +- docs/about/04_coherence_spec.adoc | 2 +- docs/installation/01_installation.adoc | 18 +++++----- docs/installation/07_webhooks.adoc | 2 +- docs/installation/09_RBAC.adoc | 2 +- examples/015_simple_image/README.adoc | 2 +- examples/015_simple_image/pom.xml | 2 +- examples/021_deployment/pom.xml | 2 +- examples/025_extend_client/pom.xml | 2 +- examples/090_tls/pom.xml | 2 +- examples/095_network_policies/README.adoc | 12 +++---- examples/200_autoscaler/pom.xml | 2 +- examples/300_helm/chart/values.yaml | 2 +- examples/400_Istio/README.adoc | 2 +- examples/no-operator/04_istio/Dockerfile | 2 +- examples/no-operator/04_istio/README.adoc | 2 +- examples/pom.xml | 2 +- java/pom.xml | 8 ++--- 26 files changed, 70 insertions(+), 65 deletions(-) diff --git a/.github/workflows/coherence-matrix.yaml b/.github/workflows/coherence-matrix.yaml index d3def27d..2982b26a 100644 --- a/.github/workflows/coherence-matrix.yaml +++ b/.github/workflows/coherence-matrix.yaml @@ -49,48 +49,48 @@ jobs: coherenceVersion: "15.1.1-0-0-SNAPSHOT" coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:15.1.1-0-0-SNAPSHOT" javaVersion: 17 - baseImage: "gcr.io/distroless/java17-debian11" + baseImage: "gcr.io/distroless/java17-debian12" - matrixName: "15.1.1-0-SNAPSHOT-Graal" coherenceVersion: "15.1.1-0-0-SNAPSHOT" coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:15.1.1-0-0-SNAPSHOT-graal" javaVersion: 17 - baseImage: "gcr.io/distroless/java17-debian11" + baseImage: "gcr.io/distroless/java17-debian12" - matrixName: "23.09" - coherenceVersion: "23.09" - coherenceImage: "ghcr.io/oracle/coherence-ce:23.09" + coherenceVersion: "23.09.1" + coherenceImage: "ghcr.io/oracle/coherence-ce:23.09.1" javaVersion: 17 - baseImage: "gcr.io/distroless/java17-debian11" + baseImage: "gcr.io/distroless/java17-debian12" - matrixName: "23.09-Graal" - coherenceVersion: "23.09" - coherenceImage: "ghcr.io/oracle/coherence-ce:23.09-graal" + coherenceVersion: "23.09.1" + coherenceImage: "ghcr.io/oracle/coherence-ce:23.09.1-graal" javaVersion: 17 - baseImage: "gcr.io/distroless/java17-debian11" + 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" - matrixName: "14.1.1-2206-SNAPSHOT" - coherenceVersion: "14.1.1-2206-7-SNAPSHOT" - coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-2206-7-SNAPSHOT" + coherenceVersion: "14.1.1-2206-8-SNAPSHOT" + coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-2206-8-SNAPSHOT" javaVersion: 11 baseImage: "gcr.io/distroless/java11-debian11" - matrixName: "14.1.1-0-SNAPSHOT" - coherenceVersion: "14.1.1-0-15-SNAPSHOT" - coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-0-15-SNAPSHOT" + coherenceVersion: "14.1.1-0-17-SNAPSHOT" + coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-0-17-SNAPSHOT" javaVersion: 8 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" @@ -107,7 +107,7 @@ jobs: - matrixName: "12.2.1-4-SNAPSHOT" coherenceVersion: "12.2.1-4-20-SNAPSHOT" - coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:12.2.1-4-20-SNAPSHOT" + coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:12.2.1-4-21-SNAPSHOT" javaVersion: 8 baseImage: "gcr.io/distroless/java11-debian11" diff --git a/.github/workflows/compatibility-tests.yaml b/.github/workflows/compatibility-tests.yaml index 7af4a767..ad9f595b 100644 --- a/.github/workflows/compatibility-tests.yaml +++ b/.github/workflows/compatibility-tests.yaml @@ -37,6 +37,7 @@ jobs: fail-fast: false matrix: compatibilityVersion: + - 3.3.2 - 3.3.1 - 3.3.0 - 3.2.11 @@ -45,6 +46,10 @@ jobs: - 3.2.7 - 3.2.6 include: + - compatibilityVersion: 3.3.2 + coherence-image: "ghcr.io/oracle/coherence-ce:22.06.6" + 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" compatibilitySelector: control-plane=coherence diff --git a/Makefile b/Makefile index 66c4b294..fa1b1911 100644 --- a/Makefile +++ b/Makefile @@ -15,17 +15,17 @@ # ====================================================================================================================== # The version of the Operator being build - this should be a valid SemVer format -VERSION ?= 3.3.2 +VERSION ?= 3.3.3 MVN_VERSION ?= $(VERSION) # The version number to be replaced by this release -PREV_VERSION ?= 3.3.1 +PREV_VERSION ?= 3.3.2 # The operator version to use to run certification tests against CERTIFICATION_VERSION ?= $(VERSION) # The previous Operator version used to run the compatibility tests. -COMPATIBLE_VERSION ?= 3.3.1 +COMPATIBLE_VERSION ?= 3.3.2 # The selector to use to find Operator Pods of the COMPATIBLE_VERSION (do not put in double quotes!!) COMPATIBLE_SELECTOR ?= control-plane=coherence diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 1eca16df..9a631273 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -41,4 +41,4 @@ commonLabels: app.kubernetes.io/instance: coherence-operator-crd app.kubernetes.io/name: coherence-operator app.kubernetes.io/part-of: coherence-operator - app.kubernetes.io/version: 3.3.2 + app.kubernetes.io/version: 3.3.3 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 84d78ff2..0e0437f9 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -9,4 +9,4 @@ resources: images: - name: controller newName: ghcr.io/oracle/coherence-operator - newTag: 3.3.2 + newTag: 3.3.3 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index fe9129e2..15812942 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -8,8 +8,8 @@ metadata: app.kubernetes.io/name: coherence-operator app: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.3.2" - version: "3.3.2" + app.kubernetes.io/version: "3.3.3" + version: "3.3.3" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator spec: @@ -24,7 +24,7 @@ spec: app.kubernetes.io/name: coherence-operator app: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.3.2" + app.kubernetes.io/version: "3.3.3" version: "3.3.2" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator diff --git a/config/manager/service.yaml b/config/manager/service.yaml index 799f5fa1..2a90a9c4 100644 --- a/config/manager/service.yaml +++ b/config/manager/service.yaml @@ -7,7 +7,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-webhook - app.kubernetes.io/version: "3.3.2" + app.kubernetes.io/version: "3.3.3" app.kubernetes.io/component: webhook app.kubernetes.io/part-of: coherence-operator spec: @@ -18,7 +18,7 @@ spec: selector: app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.3.2" + app.kubernetes.io/version: "3.3.3" app.kubernetes.io/component: manager --- apiVersion: v1 @@ -30,7 +30,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-rest - app.kubernetes.io/version: "3.3.2" + app.kubernetes.io/version: "3.3.3" app.kubernetes.io/component: rest app.kubernetes.io/part-of: coherence-operator spec: @@ -41,5 +41,5 @@ spec: selector: app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.3.2" + app.kubernetes.io/version: "3.3.3" app.kubernetes.io/component: manager diff --git a/config/manifests/bases/coherence-operator.clusterserviceversion.yaml b/config/manifests/bases/coherence-operator.clusterserviceversion.yaml index e28fcd0d..a2b37660 100644 --- a/config/manifests/bases/coherence-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/coherence-operator.clusterserviceversion.yaml @@ -11,12 +11,12 @@ metadata: description: >- Coherence Operator implements features to assist with deploying and managing Coherence clusters in a Kubernetes environment. - containerImage: 'ghcr.io/oracle/coherence-operator:3.3.2' + containerImage: 'ghcr.io/oracle/coherence-operator:3.3.3' support: '' repository: 'https://github.com/oracle/coherence-operator' operators.operatorframework.io/builder: operator-sdk-v1.0.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v2 - name: coherence-operator.v3.3.2 + name: coherence-operator.v3.3.3 namespace: placeholder spec: apiservicedefinitions: {} diff --git a/docs/about/03_quickstart.adoc b/docs/about/03_quickstart.adoc index fbe66ed1..bef7b425 100644 --- a/docs/about/03_quickstart.adoc +++ b/docs/about/03_quickstart.adoc @@ -21,7 +21,7 @@ If you want the default Coherence Operator installation then the simplest soluti [source,bash] ---- -kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.3.2/coherence-operator.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.3.3/coherence-operator.yaml ---- This will create a namespace called `coherence` and install the Operator into it along with all the required `ClusterRole` and `RoleBinding` resources. The `coherence` namespace can be changed by downloading and editing the yaml file. diff --git a/docs/about/04_coherence_spec.adoc b/docs/about/04_coherence_spec.adoc index 28c18b7d..9730f8c3 100644 --- a/docs/about/04_coherence_spec.adoc +++ b/docs/about/04_coherence_spec.adoc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// - Copyright (c) 2020, 2023, Oracle and/or its affiliates. + Copyright (c) 2020, 2024, Oracle and/or its affiliates. Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl. diff --git a/docs/installation/01_installation.adoc b/docs/installation/01_installation.adoc index d9640f5c..0411e215 100644 --- a/docs/installation/01_installation.adoc +++ b/docs/installation/01_installation.adoc @@ -149,7 +149,7 @@ If you want the default Coherence Operator installation then the simplest soluti [source,bash] ---- -kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.3.1/coherence-operator.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.3.3/coherence-operator.yaml ---- This will create a namespace called `coherence` and install the Operator into it along with all the required `ClusterRole` and `RoleBinding` resources. The `coherence` namespace can be changed by downloading and editing the yaml file. @@ -652,13 +652,13 @@ helm delete coherence-operator --namespace If you want to use yaml directly to install the operator, with something like `kubectl`, you can use the manifest files published with the GitHub release at this link: -https://github.com/oracle/coherence-operator/releases/download/v3.3.1/coherence-operator-manifests.tar.gz[3.3.1 Manifests] +https://github.com/oracle/coherence-operator/releases/download/v3.3.3/coherence-operator-manifests.tar.gz[3.3.3 Manifests] These manifest files are for use with a tool called Kustomize, which is built into `kubectl` see the documentation here: https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/ Download the -https://github.com/oracle/coherence-operator/releases/download/v3.3.1/coherence-operator-manifests.tar.gz[3.3.1 Manifests] +https://github.com/oracle/coherence-operator/releases/download/v3.3.3/coherence-operator-manifests.tar.gz[3.3.3 Manifests] from the release page and unpack the file, which should produce a directory called `manifests` with a structure like this: [source] @@ -711,14 +711,14 @@ Change the name of the Operator image by running the command below, changing the that you are using for the Operator, for example if you have the images in a custom registry [source,bash] ---- -cd ./manager && kustomize edit set image controller=myregistry/coherence-operator:3.3.1 +cd ./manager && kustomize edit set image controller=myregistry/coherence-operator:3.3.3 ---- Change the name of the Operator image by running the command below, changing the image name to the registry and image name that you are using for the Operator utilities image [source,bash] ---- -cd ./manager && kustomize edit add configmap env-vars --from-literal OPERATOR_IMAGE=myregistry/coherence-operator:3.3.1 +cd ./manager && kustomize edit add configmap env-vars --from-literal OPERATOR_IMAGE=myregistry/coherence-operator:3.3.3 ---- Change the name of the default Coherence image. If you are always going to be deploying your own application images then this @@ -796,7 +796,7 @@ This can be done using the Tanzu CLI. [source,bash] ---- tanzu package repository add coherence-repo \ - --url ghcr.io/oracle/coherence-operator-repo:3.3.1 \ + --url ghcr.io/oracle/coherence-operator-repo:3.3.3 \ --namespace coherence \ --create-namespace ---- @@ -826,7 +826,7 @@ which should include the Operator package, `coherence-operator.oracle.github.com [source,bash] ---- NAME DISPLAY-NAME SHORT-DESCRIPTION LATEST-VERSION -coherence-operator.oracle.github.com Oracle Coherence Operator A Kubernetes operator for managing Oracle Coherence clusters 3.3.1 +coherence-operator.oracle.github.com Oracle Coherence Operator A Kubernetes operator for managing Oracle Coherence clusters 3.3.3 ---- === Install the Coherence Operator Package @@ -837,7 +837,7 @@ Once the Coherence Operator repository has been installed, the `coherence-operat ---- tanzu package install coherence \ --package-name coherence-operator.oracle.github.com \ - --version 3.3.1 \ + --version 3.3.3 \ --namespace coherence ---- @@ -853,7 +853,7 @@ which should display the Coherence Operator package. [source,bash] ---- NAME PACKAGE-NAME PACKAGE-VERSION STATUS -coherence coherence-operator.oracle.github.com 3.3.1 Reconcile succeeded +coherence coherence-operator.oracle.github.com 3.3.3 Reconcile succeeded ---- The Operator is now installed and ready to mage Coherence clusters. \ No newline at end of file diff --git a/docs/installation/07_webhooks.adoc b/docs/installation/07_webhooks.adoc index 3c687fce..42445127 100644 --- a/docs/installation/07_webhooks.adoc +++ b/docs/installation/07_webhooks.adoc @@ -63,7 +63,7 @@ If installing the operator using the manifest yaml file first replace the occurr For example: [source,bash] ---- -curl -L https://github.com/oracle/coherence-operator/releases/download/v3.3.2/coherence-operator.yaml \ +curl -L https://github.com/oracle/coherence-operator/releases/download/v3.3.3/coherence-operator.yaml \ -o coherence-operator.yaml sed -i s/self-signed/cert-manager/g coherence-operator.yaml kubectl apply -f coherence-operator.yaml diff --git a/docs/installation/09_RBAC.adoc b/docs/installation/09_RBAC.adoc index d49040c3..5d844e2c 100644 --- a/docs/installation/09_RBAC.adoc +++ b/docs/installation/09_RBAC.adoc @@ -36,7 +36,7 @@ The two methods of installing the Operator discussed in the < com.google.cloud.tools jib-maven-plugin - 3.3.2 + 3.4.0 diff --git a/examples/015_simple_image/pom.xml b/examples/015_simple_image/pom.xml index ffed3b64..14a9c69d 100644 --- a/examples/015_simple_image/pom.xml +++ b/examples/015_simple_image/pom.xml @@ -26,7 +26,7 @@ 22.06.6 - 3.3.2 + 3.4.0 diff --git a/examples/021_deployment/pom.xml b/examples/021_deployment/pom.xml index e83107a9..8f1e107a 100644 --- a/examples/021_deployment/pom.xml +++ b/examples/021_deployment/pom.xml @@ -20,7 +20,7 @@ 1.3.1 - 3.3.2 + 3.4.0 ${project.version} diff --git a/examples/025_extend_client/pom.xml b/examples/025_extend_client/pom.xml index b7dd22b5..d2af2a3b 100644 --- a/examples/025_extend_client/pom.xml +++ b/examples/025_extend_client/pom.xml @@ -26,7 +26,7 @@ 22.06.6 - 3.3.2 + 3.4.0 3.0.0 diff --git a/examples/090_tls/pom.xml b/examples/090_tls/pom.xml index 67ccfee4..bb08dd0c 100644 --- a/examples/090_tls/pom.xml +++ b/examples/090_tls/pom.xml @@ -28,7 +28,7 @@ com.oracle.coherence.ce 22.06.6 - 3.3.2 + 3.4.0 ${project.version} 20000 diff --git a/examples/095_network_policies/README.adoc b/examples/095_network_policies/README.adoc index 156cc5a6..eff3ae7a 100644 --- a/examples/095_network_policies/README.adoc +++ b/examples/095_network_policies/README.adoc @@ -647,7 +647,7 @@ kubectl -n coherence logs $(kubectl -n coherence get pod -l 'coherenceNetTest=op The output from a successful test will look like this: [source] ---- -1.6727606592497227e+09 INFO runner Operator Version: 3.3.1 +1.6727606592497227e+09 INFO runner Operator Version: 3.3.2 1.6727606592497835e+09 INFO runner Operator Build Date: 2023-01-03T12:25:58Z 1.6727606592500978e+09 INFO runner Operator Built By: jonathanknight 1.6727606592501197e+09 INFO runner Operator Git Commit: c8118585b8f3d72b083ab1209211bcea364c85c5 @@ -692,7 +692,7 @@ The output from a successful test will look like this: [source] ---- -1.6727631152848177e+09 INFO runner Operator Version: 3.3.1 +1.6727631152848177e+09 INFO runner Operator Version: 3.3.2 1.6727631152849226e+09 INFO runner Operator Build Date: 2023-01-03T12:25:58Z 1.6727631152849536e+09 INFO runner Operator Built By: jonathanknight 1.6727631152849755e+09 INFO runner Operator Git Commit: c8118585b8f3d72b083ab1209211bcea364c85c5 @@ -754,7 +754,7 @@ The output from a successful test will look like this: [source] ---- -1.6727639834559627e+09 INFO runner Operator Version: 3.3.1 +1.6727639834559627e+09 INFO runner Operator Version: 3.3.2 1.6727639834562948e+09 INFO runner Operator Build Date: 2023-01-03T12:25:58Z 1.6727639834563956e+09 INFO runner Operator Built By: jonathanknight 1.6727639834565024e+09 INFO runner Operator Git Commit: c8118585b8f3d72b083ab1209211bcea364c85c5 @@ -810,7 +810,7 @@ The output from a successful test will look like this: [source] ---- -1.6727665901488597e+09 INFO runner Operator Version: 3.3.1 +1.6727665901488597e+09 INFO runner Operator Version: 3.3.2 1.6727665901497366e+09 INFO runner Operator Build Date: 2023-01-03T12:25:58Z 1.6727665901498337e+09 INFO runner Operator Built By: jonathanknight 1.6727665901498716e+09 INFO runner Operator Git Commit: c8118585b8f3d72b083ab1209211bcea364c85c5 @@ -860,7 +860,7 @@ kubectl -n coherence logs $(kubectl -n coherence get pod -l 'coherenceNetTest=op [source] ---- -1.6727671834237397e+09 INFO runner Operator Version: 3.3.1 +1.6727671834237397e+09 INFO runner Operator Version: 3.3.2 1.6727671834238796e+09 INFO runner Operator Build Date: 2023-01-03T12:25:58Z 1.6727671834239576e+09 INFO runner Operator Built By: jonathanknight 1.6727671834240365e+09 INFO runner Operator Git Commit: c8118585b8f3d72b083ab1209211bcea364c85c5 @@ -911,7 +911,7 @@ Now with the policies applied the test should have passed. [source] ---- -1.6727691273634596e+09 INFO runner Operator Version: 3.3.1 +1.6727691273634596e+09 INFO runner Operator Version: 3.3.2 1.6727691273635025e+09 INFO runner Operator Build Date: 2023-01-03T12:25:58Z 1.6727691273635256e+09 INFO runner Operator Built By: jonathanknight 1.6727691273635616e+09 INFO runner Operator Git Commit: c8118585b8f3d72b083ab1209211bcea364c85c5 diff --git a/examples/200_autoscaler/pom.xml b/examples/200_autoscaler/pom.xml index cf50b9f7..48a0ed25 100644 --- a/examples/200_autoscaler/pom.xml +++ b/examples/200_autoscaler/pom.xml @@ -22,7 +22,7 @@ com.oracle.coherence.ce 22.06.6 - 3.3.2 + 3.4.0 ${project.version} 20000 diff --git a/examples/300_helm/chart/values.yaml b/examples/300_helm/chart/values.yaml index e4336067..b616bbdc 100644 --- a/examples/300_helm/chart/values.yaml +++ b/examples/300_helm/chart/values.yaml @@ -5,7 +5,7 @@ operator: namespace: coherence service: coherence-operator-rest port: 8000 - image: ghcr.io/oracle/coherence-operator-utils:3.3.2 + image: ghcr.io/oracle/coherence-operator-utils:3.3.3 condition: Ready timeout: 5m interval: 10s diff --git a/examples/400_Istio/README.adoc b/examples/400_Istio/README.adoc index a4859b3b..90c7b3c6 100644 --- a/examples/400_Istio/README.adoc +++ b/examples/400_Istio/README.adoc @@ -10,7 +10,7 @@ == Using Coherence with Istio You can run the Coherence cluster and manage them using the Coherence Operator alongside https://istio.io[Istio]. -Coherence clusters managed with the Coherence Operator 3.3.2 and later work with Istio 1.9.1 and later out of the box. +Coherence clusters managed with the Coherence Operator 3.3.3 and later work with Istio 1.9.1 and later out of the box. Coherence caches can be accessed from outside the Coherence cluster via Coherence*Extend, REST, and other supported Coherence clients. Using Coherence clusters with Istio does not require the Coherence Operator to also be using Istio (and vice-versa) . diff --git a/examples/no-operator/04_istio/Dockerfile b/examples/no-operator/04_istio/Dockerfile index 9b505baf..22482b3f 100644 --- a/examples/no-operator/04_istio/Dockerfile +++ b/examples/no-operator/04_istio/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/oracle/coherence-operator:3.3.2 AS Builder +FROM ghcr.io/oracle/coherence-operator:3.3.3 AS Builder FROM ghcr.io/oracle/coherence-ce:22.06.6 COPY --from=Builder /files /files diff --git a/examples/no-operator/04_istio/README.adoc b/examples/no-operator/04_istio/README.adoc index 047b6953..09a63d85 100644 --- a/examples/no-operator/04_istio/README.adoc +++ b/examples/no-operator/04_istio/README.adoc @@ -474,7 +474,7 @@ Various utilities are copied from the Operator image into the base. [source] .Dockerfile ---- -FROM ghcr.io/oracle/coherence-operator:3.3.2 AS Builder +FROM ghcr.io/oracle/coherence-operator:3.3.3 AS Builder FROM ghcr.io/oracle/coherence-ce:22.06.6 COPY --from=Builder /files /files diff --git a/examples/pom.xml b/examples/pom.xml index 5fb02cf0..1d555884 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -30,7 +30,7 @@ com.google.cloud.tools jib-maven-plugin - 3.3.2 + 3.4.0 true diff --git a/java/pom.xml b/java/pom.xml index 0401a8f0..63d60550 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -29,7 +29,7 @@ - 3.3.2 + 3.3.3 ${project.version} 17 @@ -55,12 +55,12 @@ 1.2.2 2.0.2 - 5.1.2 + 5.1.6 8.18 0.3.1 2.1 1.3 - 2.2.1 + 2.6.5 2.1.1.Final 4.13.1 5.7.2 @@ -82,7 +82,7 @@ 3.0.0 2.0.0-M3 3.1.1 - 3.3.2 + 3.4.0 3.1.1 3.7.0 3.2.0 From 899697268306a4e42b5edbca14cd0398caf5de20 Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Wed, 10 Jan 2024 16:25:13 +0300 Subject: [PATCH 02/11] Fix copyrights --- .github/workflows/coherence-matrix.yaml | 2 +- .github/workflows/compatibility-tests.yaml | 2 +- Makefile | 2 +- docs/about/03_quickstart.adoc | 2 +- docs/installation/01_installation.adoc | 2 +- docs/installation/07_webhooks.adoc | 2 +- docs/installation/09_RBAC.adoc | 2 +- examples/015_simple_image/README.adoc | 2 +- examples/015_simple_image/pom.xml | 2 +- examples/021_deployment/pom.xml | 2 +- examples/025_extend_client/pom.xml | 2 +- examples/090_tls/pom.xml | 2 +- examples/095_network_policies/README.adoc | 2 +- examples/200_autoscaler/pom.xml | 2 +- examples/400_Istio/README.adoc | 2 +- examples/no-operator/04_istio/README.adoc | 2 +- examples/pom.xml | 2 +- java/pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/coherence-matrix.yaml b/.github/workflows/coherence-matrix.yaml index 2982b26a..1e45a556 100644 --- a/.github/workflows/coherence-matrix.yaml +++ b/.github/workflows/coherence-matrix.yaml @@ -1,4 +1,4 @@ -# Copyright 2021, 2023, Oracle Corporation and/or its affiliates. All rights reserved. +# Copyright 2021, 2024, Oracle Corporation and/or its affiliates. All rights reserved. # Licensed under the Universal Permissive License v 1.0 as shown at # http://oss.oracle.com/licenses/upl. diff --git a/.github/workflows/compatibility-tests.yaml b/.github/workflows/compatibility-tests.yaml index ad9f595b..fb71d1e9 100644 --- a/.github/workflows/compatibility-tests.yaml +++ b/.github/workflows/compatibility-tests.yaml @@ -1,4 +1,4 @@ -# Copyright 2019, 2023, Oracle Corporation and/or its affiliates. All rights reserved. +# Copyright 2019, 2024, Oracle Corporation and/or its affiliates. All rights reserved. # Licensed under the Universal Permissive License v 1.0 as shown at # http://oss.oracle.com/licenses/upl. diff --git a/Makefile b/Makefile index fa1b1911..21e66c85 100644 --- a/Makefile +++ b/Makefile @@ -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. # diff --git a/docs/about/03_quickstart.adoc b/docs/about/03_quickstart.adoc index bef7b425..3177d030 100644 --- a/docs/about/03_quickstart.adoc +++ b/docs/about/03_quickstart.adoc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// - Copyright (c) 2020, 2023, Oracle and/or its affiliates. + Copyright (c) 2020, 2024, Oracle and/or its affiliates. Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl. diff --git a/docs/installation/01_installation.adoc b/docs/installation/01_installation.adoc index 0411e215..06a2cd13 100644 --- a/docs/installation/01_installation.adoc +++ b/docs/installation/01_installation.adoc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// - Copyright (c) 2020, 2023, Oracle and/or its affiliates. + Copyright (c) 2020, 2024, Oracle and/or its affiliates. Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl. diff --git a/docs/installation/07_webhooks.adoc b/docs/installation/07_webhooks.adoc index 42445127..83c45bb9 100644 --- a/docs/installation/07_webhooks.adoc +++ b/docs/installation/07_webhooks.adoc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// - Copyright (c) 2020, 2023, Oracle and/or its affiliates. + Copyright (c) 2020, 2024, Oracle and/or its affiliates. Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl. diff --git a/docs/installation/09_RBAC.adoc b/docs/installation/09_RBAC.adoc index 5d844e2c..854b060f 100644 --- a/docs/installation/09_RBAC.adoc +++ b/docs/installation/09_RBAC.adoc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// - Copyright (c) 2020, 2023, Oracle and/or its affiliates. + Copyright (c) 2020, 2024, Oracle and/or its affiliates. Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl. diff --git a/examples/015_simple_image/README.adoc b/examples/015_simple_image/README.adoc index ba5205f7..065d6942 100644 --- a/examples/015_simple_image/README.adoc +++ b/examples/015_simple_image/README.adoc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// - Copyright (c) 2021, 2023, Oracle and/or its affiliates. + Copyright (c) 2021, 2024, Oracle and/or its affiliates. Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl. diff --git a/examples/015_simple_image/pom.xml b/examples/015_simple_image/pom.xml index 14a9c69d..e688f21e 100644 --- a/examples/015_simple_image/pom.xml +++ b/examples/015_simple_image/pom.xml @@ -1,7 +1,7 @@ diff --git a/examples/021_deployment/pom.xml b/examples/021_deployment/pom.xml index 8f1e107a..21a78fb4 100644 --- a/examples/021_deployment/pom.xml +++ b/examples/021_deployment/pom.xml @@ -1,6 +1,6 @@ diff --git a/examples/025_extend_client/pom.xml b/examples/025_extend_client/pom.xml index d2af2a3b..d2f1444e 100644 --- a/examples/025_extend_client/pom.xml +++ b/examples/025_extend_client/pom.xml @@ -1,7 +1,7 @@ diff --git a/examples/090_tls/pom.xml b/examples/090_tls/pom.xml index bb08dd0c..7355b51f 100644 --- a/examples/090_tls/pom.xml +++ b/examples/090_tls/pom.xml @@ -1,6 +1,6 @@ diff --git a/examples/095_network_policies/README.adoc b/examples/095_network_policies/README.adoc index eff3ae7a..6d9d690d 100644 --- a/examples/095_network_policies/README.adoc +++ b/examples/095_network_policies/README.adoc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// - Copyright (c) 2022, 2023, Oracle and/or its affiliates. + Copyright (c) 2022, 2024, Oracle and/or its affiliates. Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl. diff --git a/examples/200_autoscaler/pom.xml b/examples/200_autoscaler/pom.xml index 48a0ed25..8afd6b6e 100644 --- a/examples/200_autoscaler/pom.xml +++ b/examples/200_autoscaler/pom.xml @@ -1,6 +1,6 @@ diff --git a/examples/400_Istio/README.adoc b/examples/400_Istio/README.adoc index 90c7b3c6..583211f4 100644 --- a/examples/400_Istio/README.adoc +++ b/examples/400_Istio/README.adoc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// - Copyright (c) 2021, 2023, Oracle and/or its affiliates. + Copyright (c) 2021, 2024, Oracle and/or its affiliates. Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl. diff --git a/examples/no-operator/04_istio/README.adoc b/examples/no-operator/04_istio/README.adoc index 09a63d85..06760987 100644 --- a/examples/no-operator/04_istio/README.adoc +++ b/examples/no-operator/04_istio/README.adoc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// - Copyright (c) 2023, Oracle and/or its affiliates. + Copyright (c) 2023, 2024, Oracle and/or its affiliates. Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl. diff --git a/examples/pom.xml b/examples/pom.xml index 1d555884..5cab1df2 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -1,6 +1,6 @@ diff --git a/java/pom.xml b/java/pom.xml index 63d60550..8959659e 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -1,7 +1,7 @@ From 5b8cc7cc0a3ffe820f5c94cb3bce47a5d55b3a55 Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Fri, 12 Jan 2024 19:23:28 +0300 Subject: [PATCH 03/11] Use golangci_lint v1.55.2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 21e66c85..6f578b89 100644 --- a/Makefile +++ b/Makefile @@ -2139,7 +2139,7 @@ get-istio: $(BUILD_PROPS) # ---------------------------------------------------------------------------------------------------------------------- $(TOOLS_BIN)/golangci-lint: @mkdir -p $(TOOLS_BIN) - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh --header $(GH_AUTH) | sh -s -- -b $(TOOLS_BIN) v1.52.2 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh --header $(GH_AUTH) | sh -s -- -b $(TOOLS_BIN) v1.55.2 # ---------------------------------------------------------------------------------------------------------------------- # Display the full version string for the artifacts that would be built. From b3826c7ba4425e97631da9ea615c06affa6cd38f Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Mon, 15 Jan 2024 15:28:15 +0300 Subject: [PATCH 04/11] Fixing builds --- .github/workflows/coherence-matrix.yaml | 6 +++--- Makefile | 7 ++++--- java/operator-test-helidon/pom.xml | 3 +++ java/operator-test-spring/pom.xml | 2 +- java/pom.xml | 1 + 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/coherence-matrix.yaml b/.github/workflows/coherence-matrix.yaml index 1e45a556..f0993976 100644 --- 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 index 6f578b89..8d01a2ce 100644 --- 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 index a1140e8a..7ae78070 100644 --- a/java/operator-test-helidon/pom.xml +++ b/java/operator-test-helidon/pom.xml @@ -28,14 +28,17 @@ com.oracle.coherence.ce coherence + ${coherence.version.2206} com.oracle.coherence.ce coherence-cdi-server + ${coherence.version.2206} com.oracle.coherence.ce coherence-management + ${coherence.version.2206} diff --git a/java/operator-test-spring/pom.xml b/java/operator-test-spring/pom.xml index b8f75d70..d2da3f02 100644 --- a/java/operator-test-spring/pom.xml +++ b/java/operator-test-spring/pom.xml @@ -30,7 +30,7 @@ com.oracle.coherence.ce coherence - ${coherence.version} + ${coherence.version.2206} org.springframework.boot diff --git a/java/pom.xml b/java/pom.xml index 8959659e..93349c3f 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -40,6 +40,7 @@ 21.12.4 + 22.06.6 com.oracle.coherence.ce ${coherence.version} From 627ea3dfca2275a7e0ba470920b1e185e52b1064 Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Mon, 15 Jan 2024 15:35:53 +0300 Subject: [PATCH 05/11] Fix copyrights --- java/operator-test-helidon/pom.xml | 2 +- java/operator-test-spring/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/operator-test-helidon/pom.xml b/java/operator-test-helidon/pom.xml index 7ae78070..5f6e97e4 100644 --- a/java/operator-test-helidon/pom.xml +++ b/java/operator-test-helidon/pom.xml @@ -1,7 +1,7 @@ From 5c11dfcec6b7282861fccc18d3905e969568eebf Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Mon, 15 Jan 2024 17:16:08 +0300 Subject: [PATCH 06/11] Bump Helidon version --- .github/workflows/coherence-matrix.yaml | 2 +- java/operator-test-helidon/pom.xml | 2 +- java/pom.xml | 12 ++++-------- pkg/runner/runner.go | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/coherence-matrix.yaml b/.github/workflows/coherence-matrix.yaml index f0993976..22658f18 100644 --- 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 index 5f6e97e4..2fef63d5 100644 --- a/java/operator-test-helidon/pom.xml +++ b/java/operator-test-helidon/pom.xml @@ -66,7 +66,7 @@ ${version.plugin.jib} - io.helidon.microprofile.server.Main + io.helidon.microprofile.cdi.Main packaged diff --git a/java/pom.xml b/java/pom.xml index 93349c3f..90b2e185 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -62,7 +62,6 @@ 2.1 1.3 2.6.5 - 2.1.1.Final 4.13.1 5.7.2 3.10.0 @@ -146,14 +145,11 @@ - io.helidon.microprofile.bundles - helidon-microprofile + io.helidon + helidon-dependencies ${version.lib.helidon} - - - org.jboss - jandex - ${version.lib.jandex} + pom + import jakarta.activation diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go index edd666a8..7eefa8ad 100644 --- 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. From 365ad22f58970e31401b2209ce223e76116dca6b Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Tue, 16 Jan 2024 12:49:08 +0300 Subject: [PATCH 07/11] Add slf4j-simple for Spring test --- java/operator-test-spring/pom.xml | 4 ++++ java/pom.xml | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/java/operator-test-spring/pom.xml b/java/operator-test-spring/pom.xml index e5c4983f..6d7db91a 100644 --- a/java/operator-test-spring/pom.xml +++ b/java/operator-test-spring/pom.xml @@ -36,6 +36,10 @@ org.springframework.boot spring-boot-starter-web + + org.slf4j + slf4j-simple + diff --git a/java/pom.xml b/java/pom.xml index 90b2e185..c718379f 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -65,7 +65,8 @@ 4.13.1 5.7.2 3.10.0 - 2.7.17 + 2.0.11 + 2.7.18 1.8.4 2.8.9 @@ -142,6 +143,11 @@ spring-boot-starter-web ${version.lib.spring} + + org.slf4j + slf4j-simple + ${version.lib.slf4j} + From 11edfd805778651fc106b4b07cad656feadf8ed5 Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Tue, 16 Jan 2024 16:09:55 +0300 Subject: [PATCH 08/11] Fixing spring tests --- java/operator-test-spring/pom.xml | 15 +++++++++++---- java/pom.xml | 6 ------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/java/operator-test-spring/pom.xml b/java/operator-test-spring/pom.xml index 6d7db91a..83a3b00f 100644 --- a/java/operator-test-spring/pom.xml +++ b/java/operator-test-spring/pom.xml @@ -35,11 +35,18 @@ org.springframework.boot spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-logging + + - - org.slf4j - slf4j-simple - + + + + + diff --git a/java/pom.xml b/java/pom.xml index c718379f..11e5fd1b 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -65,7 +65,6 @@ 4.13.1 5.7.2 3.10.0 - 2.0.11 2.7.18 1.8.4 @@ -143,11 +142,6 @@ spring-boot-starter-web ${version.lib.spring} - - org.slf4j - slf4j-simple - ${version.lib.slf4j} - From ffb7ef91b18753f8ebc8dc350f65a1e1ebed14af Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Wed, 17 Jan 2024 12:35:46 +0300 Subject: [PATCH 09/11] Delete commented out code --- java/operator-test-spring/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/java/operator-test-spring/pom.xml b/java/operator-test-spring/pom.xml index 83a3b00f..ab66c503 100644 --- a/java/operator-test-spring/pom.xml +++ b/java/operator-test-spring/pom.xml @@ -42,11 +42,6 @@ - - - - - From 39e925d4bc8b348565eab3c1aac2a5a7b1590769 Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Wed, 17 Jan 2024 14:11:42 +0300 Subject: [PATCH 10/11] Use new Coherence versions --- .github/workflows/coherence-matrix.yaml | 8 ++++---- .github/workflows/compatibility-tests.yaml | 16 ++++++++-------- Makefile | 2 +- examples/015_simple_image/README.adoc | 4 ++-- examples/015_simple_image/build.gradle | 2 +- examples/015_simple_image/pom.xml | 2 +- examples/016_simple_docker_image/README.adoc | 4 ++-- examples/016_simple_docker_image/build.gradle | 2 +- examples/016_simple_docker_image/pom.xml | 2 +- examples/021_deployment/pom.xml | 2 +- examples/025_extend_client/build.gradle | 2 +- examples/025_extend_client/pom.xml | 2 +- examples/090_tls/pom.xml | 2 +- examples/200_autoscaler/pom.xml | 2 +- examples/400_Istio/README.adoc | 4 ++-- examples/no-operator/04_istio/Dockerfile | 4 ++-- examples/no-operator/04_istio/README.adoc | 14 +++++++------- examples/no-operator/04_istio/storage.yaml | 2 +- examples/no-operator/test-client/pom.xml | 2 +- .../coherence/k8s/CoherenceVersionTest.java | 4 ++-- java/pom.xml | 2 +- 21 files changed, 42 insertions(+), 42 deletions(-) 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} From 014dec7fcd688ee1dcf7f5ce7dc0048ff813b7df Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Wed, 17 Jan 2024 15:36:20 +0300 Subject: [PATCH 11/11] Fix copyright headers --- examples/015_simple_image/build.gradle | 2 +- examples/016_simple_docker_image/README.adoc | 2 +- examples/016_simple_docker_image/build.gradle | 2 +- examples/016_simple_docker_image/pom.xml | 2 +- examples/025_extend_client/build.gradle | 2 +- examples/no-operator/test-client/pom.xml | 2 +- .../java/com/oracle/coherence/k8s/CoherenceVersionTest.java | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/015_simple_image/build.gradle b/examples/015_simple_image/build.gradle index 3a8afbb0..5886bd15 100644 --- a/examples/015_simple_image/build.gradle +++ b/examples/015_simple_image/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023, Oracle and/or its affiliates. + * Copyright (c) 2022, 2024, Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * http://oss.oracle.com/licenses/upl. */ diff --git a/examples/016_simple_docker_image/README.adoc b/examples/016_simple_docker_image/README.adoc index 94654c0b..2c768025 100644 --- a/examples/016_simple_docker_image/README.adoc +++ b/examples/016_simple_docker_image/README.adoc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// - Copyright (c) 2021, 2022, Oracle and/or its affiliates. + Copyright (c) 2021, 2024, Oracle and/or its affiliates. Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl. diff --git a/examples/016_simple_docker_image/build.gradle b/examples/016_simple_docker_image/build.gradle index c30a9058..f6db758c 100644 --- a/examples/016_simple_docker_image/build.gradle +++ b/examples/016_simple_docker_image/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2023, Oracle and/or its affiliates. + * Copyright (c) 2021, 2024, Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * http://oss.oracle.com/licenses/upl. */ diff --git a/examples/016_simple_docker_image/pom.xml b/examples/016_simple_docker_image/pom.xml index 65d858a1..cddb63b7 100644 --- a/examples/016_simple_docker_image/pom.xml +++ b/examples/016_simple_docker_image/pom.xml @@ -1,7 +1,7 @@ diff --git a/examples/025_extend_client/build.gradle b/examples/025_extend_client/build.gradle index 65a2d0dd..943908bc 100644 --- a/examples/025_extend_client/build.gradle +++ b/examples/025_extend_client/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023, Oracle and/or its affiliates. + * Copyright (c) 2022, 2024, Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * http://oss.oracle.com/licenses/upl. */ diff --git a/examples/no-operator/test-client/pom.xml b/examples/no-operator/test-client/pom.xml index cff9a921..8cdfb76d 100644 --- a/examples/no-operator/test-client/pom.xml +++ b/examples/no-operator/test-client/pom.xml @@ -1,6 +1,6 @@ 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 aea5d435..ad5ca923 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 @@ -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. */ @@ -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.7"), is(false)); + assertThat(CoherenceVersion.versionCheck("14.1.1.2206.5", "22.06.6"), is(false)); assertThat(CoherenceVersion.versionCheck("14.1.1.2206.7", "22.06.7"), is(true)); - assertThat(CoherenceVersion.versionCheck("22.06.5", "22.06.7"), is(false)); + assertThat(CoherenceVersion.versionCheck("22.06.5", "22.06.6"), is(false)); assertThat(CoherenceVersion.versionCheck("22.06.7", "22.06.7"), is(true)); }