diff --git a/.github/workflows/build-compatability-1412.yaml b/.github/workflows/build-compatability-1412.yaml index 90d1b78..1043b6f 100644 --- a/.github/workflows/build-compatability-1412.yaml +++ b/.github/workflows/build-compatability-1412.yaml @@ -1,4 +1,4 @@ -# Copyright 2021, 2024 Oracle Corporation and/or its affiliates. +# Copyright 2021, 2025 Oracle Corporation and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at # https://oss.oracle.com/licenses/upl. @@ -24,6 +24,7 @@ jobs: matrix: coherenceVersion: - 14.1.2-0-0 + - 14.1.2-0-1 - 14.1.2-0-1-SNAPSHOT go-version: - 1.19.x diff --git a/.github/workflows/build-compatability-2206.yaml b/.github/workflows/build-compatability-2206.yaml index 7719686..430d266 100644 --- a/.github/workflows/build-compatability-2206.yaml +++ b/.github/workflows/build-compatability-2206.yaml @@ -1,4 +1,4 @@ -# Copyright 2021, 2024 Oracle Corporation and/or its affiliates. +# Copyright 2021, 2025 Oracle Corporation and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at # https://oss.oracle.com/licenses/upl. @@ -24,6 +24,7 @@ jobs: matrix: coherenceVersion: - 22.06.10 + - 22.06.11 - 22.06.11-SNAPSHOT go-version: - 1.19.x diff --git a/.github/workflows/build-compatability-v1-1412.yaml b/.github/workflows/build-compatability-v1-1412.yaml index b6f52f3..d376bf1 100644 --- a/.github/workflows/build-compatability-v1-1412.yaml +++ b/.github/workflows/build-compatability-v1-1412.yaml @@ -1,4 +1,4 @@ -# Copyright 024 Oracle Corporation and/or its affiliates. +# Copyright 2024, 2025 Oracle Corporation and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at # https://oss.oracle.com/licenses/upl. @@ -24,6 +24,7 @@ jobs: matrix: coherenceVersion: - 14.1.2-0-0 + - 14.1.2-0-1 - 14.1.2-0-1-SNAPSHOT go-version: - 1.19.x diff --git a/.github/workflows/build-compatability-v1.yaml b/.github/workflows/build-compatability-v1.yaml index 01e3432..93ca2c2 100644 --- a/.github/workflows/build-compatability-v1.yaml +++ b/.github/workflows/build-compatability-v1.yaml @@ -1,4 +1,4 @@ -# Copyright 024 Oracle Corporation and/or its affiliates. +# Copyright 2024,2025 Oracle Corporation and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at # https://oss.oracle.com/licenses/upl. @@ -24,6 +24,7 @@ jobs: matrix: coherenceVersion: - 24.09 + - 24.09.2 - 24.09.1-SNAPSHOT go-version: - 1.19.x diff --git a/.github/workflows/build-compatability.yaml b/.github/workflows/build-compatability.yaml index 38a07bc..01a56fd 100644 --- a/.github/workflows/build-compatability.yaml +++ b/.github/workflows/build-compatability.yaml @@ -1,4 +1,4 @@ -# Copyright 2022, 2024 Oracle Corporation and/or its affiliates. +# Copyright 2022, 2025 Oracle Corporation and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at # https://oss.oracle.com/licenses/upl. @@ -24,6 +24,7 @@ jobs: matrix: coherenceVersion: - 24.09 + - 24.09.2 go-version: - 1.19.x - 1.20.x diff --git a/.github/workflows/build-queues-1412.yaml b/.github/workflows/build-queues-1412.yaml index 6dd37e2..37a26bf 100644 --- a/.github/workflows/build-queues-1412.yaml +++ b/.github/workflows/build-queues-1412.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Oracle Corporation and/or its affiliates. +# Copyright 2024, 2025 Oracle Corporation and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at # https://oss.oracle.com/licenses/upl. @@ -24,6 +24,7 @@ jobs: matrix: coherenceVersion: - 14.1.2-0-0 + - 14.1.2-0-1 - 14.1.2-0-1-SNAPSHOT go-version: - 1.19.x diff --git a/.github/workflows/build-queues.yaml b/.github/workflows/build-queues.yaml index 7247187..416d96d 100644 --- a/.github/workflows/build-queues.yaml +++ b/.github/workflows/build-queues.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Oracle Corporation and/or its affiliates. +# Copyright 2024, 2025 Oracle Corporation and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at # https://oss.oracle.com/licenses/upl. @@ -24,6 +24,7 @@ jobs: matrix: coherenceVersion: - 24.09 + - 24.09.2 - 24.09.1-SNAPSHOT go-version: - 1.19.x diff --git a/.github/workflows/build-v1.yaml b/.github/workflows/build-v1.yaml index afc1446..e39adc5 100644 --- a/.github/workflows/build-v1.yaml +++ b/.github/workflows/build-v1.yaml @@ -1,4 +1,4 @@ -# Copyright 2022, 2024 Oracle Corporation and/or its affiliates. +# Copyright 2022, 2025 Oracle Corporation and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at # https://oss.oracle.com/licenses/upl. @@ -27,6 +27,7 @@ jobs: - 1.23.x coherence-version: - 24.09 + - 24.09.2 - 24.09.1-SNAPSHOT # Checkout the source, we need a depth of zero to fetch all of the history otherwise diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 285bf43..a697b5b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,4 +1,4 @@ -# Copyright 2022, 2024 Oracle Corporation and/or its affiliates. +# Copyright 2022, 2025 Oracle Corporation and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at # https://oss.oracle.com/licenses/upl. @@ -69,7 +69,7 @@ jobs: shell: bash run: | go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 - INCLUDE_LONG_RUNNING=true PROFILES=,-jakarta,javax COHERENCE_VERSION=22.06.9 make clean generate-proto build-test-images test-e2e-standalone + INCLUDE_LONG_RUNNING=true PROFILES=,-jakarta,javax COHERENCE_VERSION=22.06.11 make clean generate-proto build-test-images test-e2e-standalone - name: Profile Near Cache shell: bash @@ -86,7 +86,7 @@ jobs: shell: bash run: | go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 - COHERENCE_VERSION=22.06.9 PROFILES=,-jakarta,javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope + COHERENCE_VERSION=22.06.11 PROFILES=,-jakarta,javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope - uses: actions/upload-artifact@v4 if: failure() @@ -101,7 +101,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.9 PROFILES=,secure,-jakarta,javax make clean certs generate-proto build-test-images test-e2e-standalone + COHERENCE_VERSION=22.06.11 PROFILES=,secure,-jakarta,javax make clean certs generate-proto build-test-images test-e2e-standalone - name: E2E Local Tests SSL (options) shell: bash @@ -110,7 +110,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.9 PROFILES=,secure,-jakarta,javax,scope make clean certs generate-proto build-test-images test-e2e-standalone-scope + COHERENCE_VERSION=22.06.11 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 @@ -119,7 +119,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.9 PROFILES=,secure,-jakarta,javax,scope make clean certs generate-proto build-test-images test-e2e-standalone-scope + COHERENCE_VERSION=22.06.11 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/.github/workflows/discovery-compatability-tests.yaml b/.github/workflows/discovery-compatability-tests.yaml index 8980964..469d79b 100644 --- a/.github/workflows/discovery-compatability-tests.yaml +++ b/.github/workflows/discovery-compatability-tests.yaml @@ -1,4 +1,4 @@ -# Copyright 2022, 2024 Oracle Corporation and/or its affiliates. +# Copyright 2022, 2025 Oracle Corporation and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at # https://oss.oracle.com/licenses/upl. @@ -21,10 +21,12 @@ jobs: matrix: coherenceVersion: - 22.06.10 + - 22.06.11 - 22.06.11-SNAPSHOT - 24.09 - - 24.09.1-SNAPSHOT + - 24.09.2 - 14.1.2-0-0 + - 14.1.2-0-1 - 14.1.2-0-1-SNAPSHOT go-version: - 1.19.x diff --git a/.github/workflows/examples-jakarta-v1.2.2.yaml b/.github/workflows/examples-jakarta-v1.2.2.yaml index 0e53d31..e3c5a0e 100644 --- a/.github/workflows/examples-jakarta-v1.2.2.yaml +++ b/.github/workflows/examples-jakarta-v1.2.2.yaml @@ -22,6 +22,7 @@ jobs: matrix: coherenceVersion: - 24.09 + - 24.09.2 - 24.09.1-SNAPSHOT go-version: - 1.19.x diff --git a/.github/workflows/examples-jakarta.yaml b/.github/workflows/examples-jakarta.yaml index 13eed1b..11b80cc 100644 --- a/.github/workflows/examples-jakarta.yaml +++ b/.github/workflows/examples-jakarta.yaml @@ -1,4 +1,4 @@ -# Copyright 2023, 2024 Oracle Corporation and/or its affiliates. +# Copyright 2023, 2025 Oracle Corporation and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at # https://oss.oracle.com/licenses/upl. @@ -21,6 +21,7 @@ jobs: matrix: coherenceVersion: - 24.09 + - 24.09.2 - 24.09.1-SNAPSHOT go-version: - 1.19.x diff --git a/.github/workflows/examples-v1.2.2.yaml b/.github/workflows/examples-v1.2.2.yaml index 19508f4..27f3298 100644 --- a/.github/workflows/examples-v1.2.2.yaml +++ b/.github/workflows/examples-v1.2.2.yaml @@ -1,4 +1,4 @@ -# Copyright 2022, 2024 Oracle Corporation and/or its affiliates. +# Copyright 2022, 2025 Oracle Corporation and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at # https://oss.oracle.com/licenses/upl. @@ -23,6 +23,7 @@ jobs: coherenceVersion: - 22.06.11-SNAPSHOT - 22.06.10 + - 22.06.11 go-version: - 1.19.x - 1.20.x diff --git a/.github/workflows/examples.yaml b/.github/workflows/examples.yaml index 2b62c28..f44086a 100644 --- a/.github/workflows/examples.yaml +++ b/.github/workflows/examples.yaml @@ -1,4 +1,4 @@ -# Copyright 2022, 2024 Oracle Corporation and/or its affiliates. +# Copyright 2022, 2025 Oracle Corporation and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at # https://oss.oracle.com/licenses/upl. @@ -22,7 +22,9 @@ jobs: coherenceVersion: - 22.06.11-SNAPSHOT - 22.06.10 + - 22.06.11 - 14.1.2-0-0 + - 14.1.2-0-1 - 14.1.2-0-1-SNAPSHOT go-version: - 1.19.x diff --git a/.github/workflows/resolver-clusters-compatability-tests.yaml b/.github/workflows/resolver-clusters-compatability-tests.yaml index 5dcee06..7045b6e 100644 --- a/.github/workflows/resolver-clusters-compatability-tests.yaml +++ b/.github/workflows/resolver-clusters-compatability-tests.yaml @@ -20,8 +20,10 @@ jobs: fail-fast: false matrix: coherenceVersion: - - 22.06.9 + - 22.06.10 + - 22.06.11 - 24.09 + - 24.09.2 - 14.1.2-0-0 go-version: - 1.19.x diff --git a/.github/workflows/resolver-compatability-tests.yaml b/.github/workflows/resolver-compatability-tests.yaml index baefeae..c8b5070 100644 --- a/.github/workflows/resolver-compatability-tests.yaml +++ b/.github/workflows/resolver-compatability-tests.yaml @@ -1,4 +1,4 @@ -# Copyright 2022, 2024 Oracle Corporation and/or its affiliates. +# Copyright 2022, 2025 Oracle Corporation and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at # https://oss.oracle.com/licenses/upl. @@ -20,9 +20,12 @@ jobs: fail-fast: false matrix: coherenceVersion: - - 22.06.9 + - 22.06.10 + - 22.06.11 - 24.09 + - 24.09.2 - 14.1.2-0-0 + - 14.1.2-0-1 go-version: - 1.19.x - 1.20.x diff --git a/Makefile b/Makefile index 04ad169..15ec514 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------------------------------------------------- -# Copyright (c) 2021, 2024 Oracle and/or its affiliates. +# Copyright (c) 2021, 2025 Oracle and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at # https://oss.oracle.com/licenses/upl. # @@ -34,7 +34,7 @@ MVN_VERSION ?= 1.0.0 SHELL := /bin/bash # Coherence CE version to run base tests against -COHERENCE_VERSION ?= 22.06.9 +COHERENCE_VERSION ?= 22.06.11 COHERENCE_GROUP_ID ?= com.oracle.coherence.ce COHERENCE_WKA1 ?= server1 COHERENCE_WKA2 ?= server1 @@ -207,8 +207,8 @@ golangci: $(TOOLS_BIN)/golangci-lint ## Go code review .PHONY: generate-proto generate-proto: $(TOOLS_BIN)/protoc ## Generate Proto Files mkdir -p $(PROTO_DIR) || true - curl -o $(PROTO_DIR)/services.proto https://raw.githubusercontent.com/oracle/coherence/22.06.10/prj/coherence-grpc/src/main/proto/services.proto - curl -o $(PROTO_DIR)/messages.proto https://raw.githubusercontent.com/oracle/coherence/22.06.10/prj/coherence-grpc/src/main/proto/messages.proto + curl -o $(PROTO_DIR)/services.proto https://raw.githubusercontent.com/oracle/coherence/22.06.11/prj/coherence-grpc/src/main/proto/services.proto + curl -o $(PROTO_DIR)/messages.proto https://raw.githubusercontent.com/oracle/coherence/22.06.11/prj/coherence-grpc/src/main/proto/messages.proto echo "" >> $(PROTO_DIR)/services.proto echo "" >> $(PROTO_DIR)/messages.proto echo 'option go_package = "github.com/oracle/coherence-go-client/proto";' >> $(PROTO_DIR)/services.proto @@ -221,11 +221,11 @@ generate-proto: $(TOOLS_BIN)/protoc ## Generate Proto Files .PHONY: generate-proto-v1 generate-proto-v1: $(TOOLS_BIN)/protoc ## Generate Proto Files v1 mkdir -p $(PROTOV1_DIR) || true - curl -o $(PROTOV1_DIR)/proxy_service_messages_v1.proto https://raw.githubusercontent.com/oracle/coherence/24.09/prj/coherence-grpc/src/main/proto/proxy_service_messages_v1.proto - curl -o $(PROTOV1_DIR)/proxy_service_v1.proto https://raw.githubusercontent.com/oracle/coherence/24.09/prj/coherence-grpc/src/main/proto/proxy_service_v1.proto - curl -o $(PROTOV1_DIR)/common_messages_v1.proto https://raw.githubusercontent.com/oracle/coherence/24.09/prj/coherence-grpc/src/main/proto/common_messages_v1.proto - curl -o $(PROTOV1_DIR)/cache_service_messages_v1.proto https://raw.githubusercontent.com/oracle/coherence/24.09/prj/coherence-grpc/src/main/proto/cache_service_messages_v1.proto - curl -o $(PROTOV1_DIR)/queue_service_messages_v1.proto https://raw.githubusercontent.com/oracle/coherence/24.09/prj/coherence-grpc/src/main/proto/queue_service_messages_v1.proto + curl -o $(PROTOV1_DIR)/proxy_service_messages_v1.proto https://raw.githubusercontent.com/oracle/coherence/24.09.2/prj/coherence-grpc/src/main/proto/proxy_service_messages_v1.proto + curl -o $(PROTOV1_DIR)/proxy_service_v1.proto https://raw.githubusercontent.com/oracle/coherence/24.09.2/prj/coherence-grpc/src/main/proto/proxy_service_v1.proto + curl -o $(PROTOV1_DIR)/common_messages_v1.proto https://raw.githubusercontent.com/oracle/coherence/24.09.2/prj/coherence-grpc/src/main/proto/common_messages_v1.proto + curl -o $(PROTOV1_DIR)/cache_service_messages_v1.proto https://raw.githubusercontent.com/oracle/coherence/24.09.2/prj/coherence-grpc/src/main/proto/cache_service_messages_v1.proto + curl -o $(PROTOV1_DIR)/queue_service_messages_v1.proto https://raw.githubusercontent.com/oracle/coherence/24.09.2/prj/coherence-grpc/src/main/proto/queue_service_messages_v1.proto echo "" >> $(PROTOV1_DIR)/proxy_service_messages_v1.proto echo "" >> $(PROTOV1_DIR)/proxy_service_v1.proto echo "" >> $(PROTOV1_DIR)/common_messages_v1.proto