Skip to content

Update with latest CE releases #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build-compatability-1412.yaml
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-compatability-2206.yaml
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -24,6 +24,7 @@ jobs:
matrix:
coherenceVersion:
- 22.06.10
- 22.06.11
- 22.06.11-SNAPSHOT
go-version:
- 1.19.x
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-compatability-v1-1412.yaml
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-compatability-v1.yaml
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -24,6 +24,7 @@ jobs:
matrix:
coherenceVersion:
- 24.09
- 24.09.2
- 24.09.1-SNAPSHOT
go-version:
- 1.19.x
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-compatability.yaml
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -24,6 +24,7 @@ jobs:
matrix:
coherenceVersion:
- 24.09
- 24.09.2
go-version:
- 1.19.x
- 1.20.x
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-queues-1412.yaml
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-queues.yaml
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -24,6 +24,7 @@ jobs:
matrix:
coherenceVersion:
- 24.09
- 24.09.2
- 24.09.1-SNAPSHOT
go-version:
- 1.19.x
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-v1.yaml
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
shell: bash
run: |
go get google.golang.org/grpc/cmd/[email protected]
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
Expand All @@ -86,7 +86,7 @@ jobs:
shell: bash
run: |
go get google.golang.org/grpc/cmd/[email protected]
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()
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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()
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/discovery-compatability-tests.yaml
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/examples-jakarta-v1.2.2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
matrix:
coherenceVersion:
- 24.09
- 24.09.2
- 24.09.1-SNAPSHOT
go-version:
- 1.19.x
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/examples-jakarta.yaml
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -21,6 +21,7 @@ jobs:
matrix:
coherenceVersion:
- 24.09
- 24.09.2
- 24.09.1-SNAPSHOT
go-version:
- 1.19.x
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/examples-v1.2.2.yaml
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -23,6 +23,7 @@ jobs:
coherenceVersion:
- 22.06.11-SNAPSHOT
- 22.06.10
- 22.06.11
go-version:
- 1.19.x
- 1.20.x
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/examples.yaml
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/resolver-clusters-compatability-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/resolver-compatability-tests.yaml
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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
Expand Down
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading