From 56fa4ebb19081a322ec4bdd4dae81a26f4e5365e Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Thu, 29 May 2025 08:54:52 +0800 Subject: [PATCH 1/2] Update Coherence versions --- .../workflows/build-compatability-2206.yaml | 1 - .github/workflows/build.yaml | 8 ++++---- README.md | 4 ++-- coherence/doc.go | 8 ++++---- java/pom.xml | 2 +- scripts/run-checkin-test.sh | 19 ------------------- scripts/run-test-examples.sh | 4 ++-- 7 files changed, 13 insertions(+), 33 deletions(-) delete mode 100755 scripts/run-checkin-test.sh diff --git a/.github/workflows/build-compatability-2206.yaml b/.github/workflows/build-compatability-2206.yaml index 50e4aec..f8c2ae9 100644 --- a/.github/workflows/build-compatability-2206.yaml +++ b/.github/workflows/build-compatability-2206.yaml @@ -25,7 +25,6 @@ jobs: fail-fast: false matrix: coherenceVersion: - - 22.06.11 - 22.06.12 - 22.06.13-SNAPSHOT go-version: diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f800701..0deafc9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -85,7 +85,7 @@ jobs: shell: bash run: | go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 - SKIP_PROTO_GENERATION=true COHERENCE_VERSION=22.06.11 PROFILES=,-jakarta,javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope + SKIP_PROTO_GENERATION=true COHERENCE_VERSION=22.06.12 PROFILES=,-jakarta,javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope - uses: actions/upload-artifact@v4 if: failure() @@ -100,7 +100,7 @@ jobs: COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \ COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \ COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \ - COHERENCE_VERSION=22.06.11 PROFILES=,secure,-jakarta,javax make clean certs generate-proto build-test-images test-e2e-standalone + COHERENCE_VERSION=22.06.12 PROFILES=,secure,-jakarta,javax make clean certs generate-proto build-test-images test-e2e-standalone - name: E2E Local Tests SSL (options) shell: bash @@ -109,7 +109,7 @@ jobs: COHERENCE_TLS_CERTS_PATH_OPTION=`pwd`/test/utils/certs/guardians-ca.crt \ COHERENCE_TLS_CLIENT_CERT_OPTION=`pwd`/test/utils/certs/star-lord.crt \ COHERENCE_TLS_CLIENT_KEY_OPTION=`pwd`/test/utils/certs/star-lord.key \ - COHERENCE_VERSION=22.06.11 PROFILES=,secure,-jakarta,javax,scope make clean certs generate-proto build-test-images test-e2e-standalone-scope + COHERENCE_VERSION=22.06.12 PROFILES=,secure,-jakarta,javax,scope make clean certs generate-proto build-test-images test-e2e-standalone-scope - name: E2E Local Tests SSL (tlsConfig) shell: bash @@ -118,7 +118,7 @@ jobs: COHERENCE_TLS_CERTS_PATH_OPTION=`pwd`/test/utils/certs/guardians-ca.crt \ COHERENCE_TLS_CLIENT_CERT_OPTION=`pwd`/test/utils/certs/star-lord.crt \ COHERENCE_TLS_CLIENT_KEY_OPTION=`pwd`/test/utils/certs/star-lord.key \ - COHERENCE_VERSION=22.06.11 PROFILES=,secure,-jakarta,javax,scope make clean certs generate-proto build-test-images test-e2e-standalone-scope + COHERENCE_VERSION=22.06.12 PROFILES=,secure,-jakarta,javax,scope make clean certs generate-proto build-test-images test-e2e-standalone-scope - uses: actions/upload-artifact@v4 if: failure() diff --git a/README.md b/README.md index a97dca1..f1b2112 100644 --- a/README.md +++ b/README.md @@ -25,12 +25,12 @@ to a Coherence Cluster using gRPC for the network transport. * session lifecycle events such as connected, disconnected, reconnected and closed * Support for storing Go structs as JSON as well as the ability to serialize to Java objects on the server for access from other Coherence language API's * Near cache support to cache frequently accessed data in the Go client to avoid sending requests across the network -* Support for simple and double-ended queues in Coherence Community Edition 24.09+ and commercial version 14.1.2.0+ +* Support for simple and double-ended queues in Coherence Community Edition 25.03+ and commercial version 14.1.2.0+ * Full support for Go generics in all Coherence API's #### Requirements -* Coherence CE 22.06.4+, 24.09+ or Coherence 14.1.1.2206.4+ Commercial edition with a configured [gRPCProxy](https://docs.oracle.com/en/middleware/standalone/coherence/14.1.1.2206/develop-remote-clients/using-coherence-grpc-server.html). +* Coherence CE 22.06.4+, 25.03+ or Coherence 14.1.1.2206.4+ Commercial edition with a configured [gRPCProxy](https://docs.oracle.com/en/middleware/standalone/coherence/14.1.1.2206/develop-remote-clients/using-coherence-grpc-server.html). * Go 1.23.+ > Note: If you wish to use the queues API in the latest release, you must use CE 24.09 or commercial version 14.1.2.0.x. diff --git a/coherence/doc.go b/coherence/doc.go index e7020ce..cdaf6b0 100644 --- a/coherence/doc.go +++ b/coherence/doc.go @@ -26,7 +26,7 @@ The Coherence Go client provides the following features: and session lifecycle events such as connected, disconnected, reconnected and closed - Support for storing Go structs as JSON as well as the ability to serialize to Java objects on the server for access from other Coherence language API's - Near cache support to cache frequently accessed data in the Go client to avoid sending requests across the network - - Support for simple and double-ended queues in Coherence Community Edition 24.09+ and commercial version 14.1.2.0+ + - Support for simple and double-ended queues in Coherence Community Edition 25.03+ and commercial version 14.1.2.0+ - Full support for Go generics in all Coherence API's For more information on Coherence caches, please see the [Coherence Documentation]. @@ -536,7 +536,7 @@ in your main code, create a new [Session] and register the listener # Working with Queues -When connecting to a Coherence CE cluster versions 24.09 or above or commercial 14.1.2.0.+, you have the ability to create two main types of queues, a [NamedQueue] or [NamedDequeue]. +When connecting to a Coherence CE cluster versions 25.03 or above or commercial 14.1.2.0.+, you have the ability to create two main types of queues, a [NamedQueue] or [NamedDequeue]. A [NamedQueue] is a simple FIFO queue which can be one of two types: either [Queue] - a simple queue which stores data in a single partition and is limited to approx 2GB of storage, or [PagedQueue] which distributes data over the cluster and is only limited @@ -700,7 +700,7 @@ that occur against a [NamedQueue]. time.Sleep(5 * time.Second) // output: - // 2024/11/28 11:40:58 INFO: Session [b1435a16-f210-4289-97e4-e1654947acd5] connected to [localhost:1408] Coherence version: 24.09, serverProtocolVersion: 1, proxyMemberId: 1 + // 2024/11/28 11:40:58 INFO: Session [b1435a16-f210-4289-97e4-e1654947acd5] connected to [localhost:1408] Coherence version: 25.03, serverProtocolVersion: 1, proxyMemberId: 1 // **EVENT=queue_released: source=NamedQueue{name=queue-events, type=Queue, queueID=1198559040} // 2024/11/28 11:41:03 INFO: Session [b1435a16-f210-4289-97e4-e1654947acd5] closed @@ -895,6 +895,6 @@ accessed and created entries. [examples]: https://github.com/oracle/coherence-go-client/tree/main/examples [gRPC Proxy documentation]: https://docs.oracle.com/en/middleware/standalone/coherence/14.1.1.2206/develop-remote-clients/using-coherence-grpc-server.html [gRPC Naming]: https://github.com/grpc/grpc/blob/master/doc/naming.md -[Queues]: https://coherence.community/latest/24.09/docs/#/docs/core/09_queues +[Queues]: https://docs.oracle.com/en/middleware/fusion-middleware/coherence/14.1.2/develop-applications/implementing-concurreny-distributed-environment.html#GUID-18AEA825-C23E-4997-A938-DC7E5915AD45 */ package coherence diff --git a/java/pom.xml b/java/pom.xml index d2b7aa6..6f2e3c6 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -34,7 +34,7 @@ 11 com.oracle.coherence.ce - 22.09 + 25.03.1 com.oracle.coherence.ce diff --git a/scripts/run-checkin-test.sh b/scripts/run-checkin-test.sh deleted file mode 100755 index 0ab8cf0..0000000 --- a/scripts/run-checkin-test.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# -# Copyright (c) 2022, 2024 Oracle and/or its affiliates. -# Licensed under the Universal Permissive License v 1.0 as shown at -# https://oss.oracle.com/licenses/upl. -# - -# This script runs some tests that should succeed to be sure we can push -set -e - -echo "Coherence CE 24.09 All Tests gRPC v1" -COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 PROFILES=,jakarta,-javax COHERENCE_VERSION=24.09 make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone - -echo "Coherence CE 24.09 with queues" -COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 PROFILES=,jakarta,-javax,queues COHERENCE_VERSION=24.09 make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-queues - -echo "Coherence CE 22.06.10" -COHERENCE_VERSION=22.06.10 PROFILES=,-jakarta,javax make clean generate-proto build-test-images test-e2e-standalone \ No newline at end of file diff --git a/scripts/run-test-examples.sh b/scripts/run-test-examples.sh index 14c8167..18e2069 100755 --- a/scripts/run-test-examples.sh +++ b/scripts/run-test-examples.sh @@ -52,8 +52,8 @@ do echo "===========================================" if [ ! -z `echo $file | grep queues` ]; then - # Check for queues which cannot be run unless we have versions 24.09, 14.1.2, or 15.1.1 - if echo "$COHERENCE_VERSION" | grep -q -e 24.09 -e 14.1.2 -e 15.1.1; then + # Check for queues which cannot be run unless we have versions 25.03, 14.1.2, or 15.1.1 + if echo "$COHERENCE_VERSION" | grep -q -e 25.03 -e 14.1.2 -e 15.1.1; then go run -race "$file" fi else From 90bbc97d10a35ea8e02c5f61ddc4cd5436c3bbae Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Thu, 29 May 2025 09:19:23 +0800 Subject: [PATCH 2/2] Test updates --- .github/workflows/streaming.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/streaming.yaml b/.github/workflows/streaming.yaml index f4f3696..0af8f39 100644 --- a/.github/workflows/streaming.yaml +++ b/.github/workflows/streaming.yaml @@ -22,8 +22,8 @@ jobs: fail-fast: false matrix: coherenceVersion: - - 22.06.13-SNAPSHOT - - 22.06.12 +# - 22.06.13-SNAPSHOT +# - 22.06.12 - 14.1.2-0-2 - 14.1.2-0-3-SNAPSHOT go-version: