Skip to content
New issue

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

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

Already on GitHub? # to your account

Update with latest CE releases #260

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
5 changes: 3 additions & 2 deletions .github/workflows/build-test-create-cluster-jdk21.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 @@ -21,9 +21,10 @@ jobs:
fail-fast: false
matrix:
coherenceVersion:
- 24.03.1
- 24.09
- 24.09.2
- 14.1.2-0-0
- 14.1.2-0-1
javaVersion:
- 21

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-test-create-cluster.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 @@ -21,12 +21,12 @@ jobs:
fail-fast: false
matrix:
coherenceVersion:
- 22.06.9
- 22.06.10
- 22.06.11
- 22.06.11-SNAPSHOT
- 14.1.2-0-0
- 14.1.2-0-1
- 14.1.2-0-1-SNAPSHOT
- 24.09
- 24.09.2
javaVersion:
- 17

Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/build-test-monitor-cluster-jdk21.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 @@ -21,10 +21,11 @@ jobs:
fail-fast: false
matrix:
coherenceVersion:
- 22.06.10
- 24.03.1
- 22.06.11
- 24.09
- 24.09.2
- 14.1.2-0-0
- 14.1.2-0-1
javaVersion:
- 21

Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/build-test-monitor-health-jdk21.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 @@ -21,10 +21,11 @@ jobs:
fail-fast: false
matrix:
coherenceVersion:
- 22.06.10
- 24.03.1
- 22.06.11
- 24.09
- 24.09.2
- 14.1.2-0-0
- 14.1.2-0-1
javaVersion:
- 21

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-tls.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 Down Expand Up @@ -61,7 +61,7 @@ jobs:
export COHERENCE_TLS_CERTS_PATH=`pwd`/test/test_utils/certs/guardians-ca.crt
export COHERENCE_TLS_CLIENT_CERT=`pwd`/test/test_utils/certs/star-lord.crt
export COHERENCE_TLS_CLIENT_KEY=`pwd`/test/test_utils/certs/star-lord.key
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=24.03.1 PROFILES=,secure make clean certs build-test-images test-cluster-startup
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=24.09.2 PROFILES=,secure make clean certs build-test-images test-cluster-startup
echo "Sleeping 30..."
sleep 30
export PATH=`pwd`/bin:$PATH
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/build-view-cache.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,9 +24,11 @@ jobs:
matrix:
coherenceVersion:
- 22.06.11-SNAPSHOT
- 22.06.10
- 22.06.11
- 24.09
- 24.09.2
- 14.1.2-0-0
- 14.1.2-0-1
- 14.1.2-0-1-SNAPSHOT

# Checkout the source, we need a depth of zero to fetch all of the history otherwise
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.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 Down Expand Up @@ -72,7 +72,7 @@ jobs:
- name: E2E Local Tests
shell: bash
run: |
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 PROFILES=,executor COHERENCE_VERSION=22.06.10 make clean build-test-images test-e2e-standalone
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 PROFILES=,executor COHERENCE_VERSION=22.06.11 make clean build-test-images test-e2e-standalone

- name: Discovery Tests
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/compatability-tests-14110.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,7 +21,7 @@ jobs:
fail-fast: false
matrix:
coherenceVersion:
- 14.1.1-0-19
- 14.1.1-0-20
- 14.1.1-0-20-SNAPSHOT
javaImage:
- gcr.io/distroless/java:11
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/compatability-tests-released-14110.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 @@ -21,8 +21,8 @@ jobs:
fail-fast: false
matrix:
coherenceVersion:
- 14.1.1-0-18
- 14.1.1-0-19
- 14.1.1-0-20
javaImage:
- gcr.io/distroless/java11

Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/compatability-tests-released.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,9 +22,12 @@ jobs:
matrix:
coherenceVersion:
- 24.09
- 24.09.2
- 22.06.10
- 22.06.11
- 22.06.11-SNAPSHOT
- 14.1.2-0-0
- 14.1.2-0-1
- 14.1.2-0-1-SNAPSHOT
javaImage:
- gcr.io/distroless/java17
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/compatability-tests.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 @@ -21,11 +21,13 @@ jobs:
fail-fast: false
matrix:
coherenceVersion:
- 24.03.1
- 24.09
- 24.09.2
- 22.06.10
- 22.06.11
- 22.06.11-SNAPSHOT
- 14.1.2-0-0
- 14.1.2-0-1
- 14.1.2-0-1-SNAPSHOT
javaImage:
- gcr.io/distroless/java17
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 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
# http://oss.oracle.com/licenses/upl.

Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:

- name: E2E Local Tests
shell: bash
run: COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=22.06.10 make clean build-test-images test-e2e-standalone
run: COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=22.06.11 make clean build-test-images test-e2e-standalone

- name: Discovery Tests
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ SHELL := /bin/bash
MVN_VERSION ?= 1.0.0

# Coherence CE version to run base tests against
COHERENCE_VERSION ?= 22.06.10
COHERENCE_VERSION ?= 22.06.11
COHERENCE_GROUP_ID ?= com.oracle.coherence.ce
COHERENCE_WKA1 ?= server1
COHERENCE_WKA2 ?= server1
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/cluster.go
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 @@ -744,7 +744,7 @@ var (
)

const (
defaultCoherenceVersion = "22.06.10"
defaultCoherenceVersion = "22.06.11"
startClusterCommand = "start cluster"
scaleClusterCommand = "scale cluster"
stopClusterCommand = "stop cluster"
Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/cluster_test.go
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 @@ -52,9 +52,9 @@ func TestGetMavenClasspath(t *testing.T) {
)
home, _ := os.UserHomeDir()

path, err := getMavenClasspath(ce, "coherence", "22.06.10", fileTypeJar)
path, err := getMavenClasspath(ce, "coherence", "22.06.11", fileTypeJar)
g.Expect(err).To(gomega.BeNil())
g.Expect(path).To(gomega.Equal(home + "/.m2/repository/com/oracle/coherence/ce/coherence/22.06.10/coherence-22.06.10.jar"))
g.Expect(path).To(gomega.Equal(home + "/.m2/repository/com/oracle/coherence/ce/coherence/22.06.11/coherence-22.06.11.jar"))

path, err = getMavenClasspath(ce, "coherence", "22.09", fileTypeJar)
g.Expect(err).To(gomega.BeNil())
Expand Down
Loading