Skip to content

Update with latest CE versions #293

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.

Sign up for GitHub

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 2 commits into from
Apr 30, 2025
Merged

Update with latest CE versions #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74f8796
Update with latest CE versions
Apr 29, 2025
ff03618
update springboot
Apr 29, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/build-test-create-cluster-jdk21.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
fail-fast: false
matrix:
coherenceVersion:
- 25.03
- 14.1.2-0-0
- 25.03.1
- 14.1.2-0-1
- 14.1.2-0-2
javaVersion:
- 21

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-test-create-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:
fail-fast: false
matrix:
coherenceVersion:
- 22.06.11
- 22.06.12-SNAPSHOT
- 14.1.2-0-1
- 14.1.2-0-2-SNAPSHOT
- 25.03
- 22.06.12
# - 22.06.12-SNAPSHOT
- 14.1.2-0-2
# - 14.1.2-0-2-SNAPSHOT
- 25.03.1
javaVersion:
- 17

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-test-monitor-cluster-jdk21.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:
fail-fast: false
matrix:
coherenceVersion:
- 22.06.11
- 24.09.3
- 22.06.12
- 25.03
- 14.1.2-0-0
- 25.03.1
- 14.1.2-0-1
- 14.1.2-0-2
javaVersion:
- 21

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-test-monitor-health-jdk21.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:
fail-fast: false
matrix:
coherenceVersion:
- 22.06.11
- 24.09.3
- 22.06.12
- 25.03
- 14.1.2-0-0
- 25.03.1
- 14.1.2-0-1
- 14.1.2-0-2
javaVersion:
- 21

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-tls.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
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.09.2 PROFILES=,secure make clean certs build-test-images test-cluster-startup
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=14.1.2-0-2 PROFILES=,secure make clean certs build-test-images test-cluster-startup
echo "Sleeping 30..."
sleep 30
export PATH=`pwd`/bin:$PATH
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/build-view-cache.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,11 @@ jobs:
fail-fast: false
matrix:
coherenceVersion:
- 22.06.12-SNAPSHOT
- 22.06.11
- 24.09.3
- 25.03
- 14.1.2-0-1
- 14.1.2-0-2-SNAPSHOT
# - 22.06.12-SNAPSHOT
- 22.06.12
- 25.03.1
- 14.1.2-0-2
# - 14.1.2-0-2-SNAPSHOT

# Checkout the source, we need a depth of zero to fetch all of the history otherwise
# the copyright check cannot work out the date of the files from Git.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
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.11 make clean build-test-images test-e2e-standalone
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 PROFILES=,executor COHERENCE_VERSION=14.1.2-0-2 make clean build-test-images test-e2e-standalone

- name: Discovery Tests
shell: bash
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/compatability-tests-released.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:
fail-fast: false
matrix:
coherenceVersion:
- 24.09.3
- 25.03
- 22.06.11
- 25.03.1
- 22.06.12
- 22.06.12-SNAPSHOT
- 14.1.2-0-1
- 14.1.2-0-2
- 14.1.2-0-2-SNAPSHOT
javaImage:
- gcr.io/distroless/java17
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/compatability-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@ jobs:
fail-fast: false
matrix:
coherenceVersion:
- 24.09.3
- 25.03
- 22.06.11
- 22.06.12-SNAPSHOT
- 14.1.2-0-1
- 14.1.2-0-2-SNAPSHOT
- 25.03.1
- 22.06.12
# - 22.06.12-SNAPSHOT
- 14.1.2-0-2
# - 14.1.2-0-2-SNAPSHOT
javaImage:
- gcr.io/distroless/java17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
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.11 make clean build-test-images test-e2e-standalone
run: COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=14.1.2-0-2 make clean build-test-images test-e2e-standalone

- name: Discovery Tests
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
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 ?= 14.1.2-0-1
COHERENCE_VERSION ?= 14.1.2-0-2
COHERENCE_GROUP_ID ?= com.oracle.coherence.ce
COHERENCE_WKA1 ?= server1
COHERENCE_WKA2 ?= server1
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ var (
)

const (
defaultCoherenceVersion = "14.1.2-0-1"
defaultCoherenceVersion = "14.1.2-0-2"
startClusterCommand = "start cluster"
scaleClusterCommand = "scale cluster"
stopClusterCommand = "stop cluster"
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ func TestGetMavenClasspath(t *testing.T) {
)
home, _ := os.UserHomeDir()

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

path, err = getMavenClasspath(ce, "coherence", "22.09", fileTypeJar)
g.Expect(err).To(gomega.BeNil())
Expand Down
2 changes: 1 addition & 1 deletion templates/springboot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.3</version>
<version>3.4.5</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand Down
2 changes: 1 addition & 1 deletion templates/templates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ templates:
- src/main/java/com/oracle/coherence/demo/frameworks/helidon/CustomerResource.java

- name: springboot
frameworkVersion: "spring-boot-starter 3.4.3, coherence-spring 4.3.0"
frameworkVersion: "spring-boot-starter 3.4.5, coherence-spring 4.3.0"
instructions: |
To run Spring Boot starter you must have JDK21+ and maven 3.8.5+.
Change to the newly created directory and run the following to build:
Expand Down
Loading