Skip to content

Commit

Permalink
Bump Coherence versions after Oct CPU releases (#678)
Browse files Browse the repository at this point in the history
  • Loading branch information
thegridman authored Oct 30, 2024
1 parent 201227c commit 772ff9c
Show file tree
Hide file tree
Showing 18 changed files with 47 additions and 47 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/coherence-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ jobs:
matrixName:
- "15.1.1-0-SNAPSHOT"
- "15.1.1-0-SNAPSHOT-Graal"
- "24.03"
- "24.03-Graal"
- "24.09"
- "24.09-Graal"
- "22.06"
- "14.1.2-0-SNAPSHOT"
- "14.1.1-2206-SNAPSHOT"
Expand All @@ -58,21 +58,21 @@ jobs:
javaVersion: 17
baseImage: "gcr.io/distroless/java17-debian12"

- matrixName: "24.03"
coherenceVersion: "24.03.1"
coherenceImage: "ghcr.io/oracle/coherence-ce:24.03.1"
- matrixName: "24.09"
coherenceVersion: "24.09"
coherenceImage: "ghcr.io/oracle/coherence-ce:24.09"
javaVersion: 17
baseImage: "gcr.io/distroless/java17-debian12"

- matrixName: "24.03-Graal"
coherenceVersion: "24.03.1"
coherenceImage: "ghcr.io/oracle/coherence-ce:24.03.1-graal"
- matrixName: "24.09-Graal"
coherenceVersion: "24.09"
coherenceImage: "ghcr.io/oracle/coherence-ce:24.09-graal"
javaVersion: 17
baseImage: "gcr.io/distroless/java17-debian12"

- matrixName: "22.06"
coherenceVersion: "22.06.9"
coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.9"
coherenceVersion: "22.06.10"
coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.10"
javaVersion: 11
baseImage: "gcr.io/distroless/java11-debian11"

Expand All @@ -89,15 +89,15 @@ jobs:
baseImage: "gcr.io/distroless/java11-debian11"

- matrixName: "14.1.1-0-SNAPSHOT"
coherenceVersion: "14.1.1-0-19-SNAPSHOT"
coherenceVersion: "14.1.1-0-20-SNAPSHOT"
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-0-19-SNAPSHOT"
javaVersion: 8
baseImage: "gcr.io/distroless/java11-debian11"

- matrixName: "14.1.1-0"
coherenceVersion: "14.1.1-0-18"
coherenceVersion: "14.1.1-0-19"
javaVersion: 8
coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-18"
coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-19"
baseImage: "gcr.io/distroless/java11-debian11"

- matrixName: "14.1.1.0.0"
Expand All @@ -113,8 +113,8 @@ jobs:
baseImage: "gcr.io/distroless/java11-debian11"

- matrixName: "12.2.1-4-SNAPSHOT"
coherenceVersion: "12.2.1-4-21-SNAPSHOT"
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:12.2.1-4-21-SNAPSHOT"
coherenceVersion: "12.2.1-4-24-SNAPSHOT"
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:12.2.1-4-24-SNAPSHOT"
javaVersion: 8
baseImage: "gcr.io/distroless/java11-debian11"

Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/compatibility-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,51 +51,51 @@ jobs:
- 3.2.6
include:
- compatibilityVersion: 3.4.0
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
compatibilitySelector: control-plane=coherence
k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
- compatibilityVersion: 3.3.5
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
compatibilitySelector: control-plane=coherence
k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
- compatibilityVersion: 3.3.4
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
compatibilitySelector: control-plane=coherence
k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
- compatibilityVersion: 3.3.3
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
compatibilitySelector: control-plane=coherence
k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
- compatibilityVersion: 3.3.2
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
compatibilitySelector: control-plane=coherence
k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
- compatibilityVersion: 3.3.1
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
compatibilitySelector: control-plane=coherence
k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
- compatibilityVersion: 3.3.0
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
compatibilitySelector: control-plane=coherence
k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
- compatibilityVersion: 3.2.11
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
compatibilitySelector: control-plane=coherence
k8s: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
- compatibilityVersion: 3.2.10
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
compatibilitySelector: control-plane=coherence
k8s: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
- compatibilityVersion: 3.2.9
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
compatibilitySelector: control-plane=coherence
k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16
- compatibilityVersion: 3.2.7
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
compatibilitySelector: control-plane=coherence
k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16
- compatibilityVersion: 3.2.6
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
compatibilitySelector: control-plane=coherence
k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ KUBERNETES_DOC_VERSION=v1.30
# ----------------------------------------------------------------------------------------------------------------------
# The Coherence version to build against - must be a Java 8 compatible version
COHERENCE_VERSION ?= 21.12.5
COHERENCE_VERSION_LTS ?= 22.06.9
COHERENCE_VERSION_LTS ?= 22.06.10
# The default Coherence image the Operator will run if no image is specified
COHERENCE_IMAGE_REGISTRY ?= ghcr.io/oracle
COHERENCE_IMAGE_NAME ?= coherence-ce
Expand Down
4 changes: 2 additions & 2 deletions docs/management/100_tmb_test.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
restartPolicy: Never
containers:
- name: coherence
image: ghcr.io/oracle/coherence-ce:22.06 # <1>
image: ghcr.io/oracle/coherence-ce:22.06.10 # <1>
ports:
- name: mbus
containerPort: 8000
Expand Down Expand Up @@ -101,7 +101,7 @@ spec:
restartPolicy: Never
containers:
- name: coherence
image: ghcr.io/oracle/coherence-ce:22.06
image: ghcr.io/oracle/coherence-ce:22.06.10
command:
- java # <1>
- -cp
Expand Down
4 changes: 2 additions & 2 deletions examples/015_simple_image/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ In the `build.gradle` file we add the bom as a platform dependency.
.build.gradle
----
dependencies {
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7")
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.10")
----
We can then add the `coherence` and `coherence-json` modules as dependencies
Expand All @@ -77,7 +77,7 @@ In the `build.gradle` file we add the bom as a platform dependency.
.build.gradle
----
dependencies {
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7")
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.10")
implementation "com.oracle.coherence.ce:coherence"
implementation "com.oracle.coherence.ce:coherence-json"
Expand Down
2 changes: 1 addition & 1 deletion examples/015_simple_image/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repositories {
}

dependencies {
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7")
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.10")

implementation "com.oracle.coherence.ce:coherence"
implementation "com.oracle.coherence.ce:coherence-json"
Expand Down
2 changes: 1 addition & 1 deletion examples/015_simple_image/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>

<coherence.version>22.06.7</coherence.version>
<coherence.version>22.06.10</coherence.version>

<version.plugin.jib>3.4.1</version.plugin.jib>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions examples/016_simple_docker_image/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ The `image-assembly.xml` descriptor file is shown below, and configures the foll
* There are two `<fileSets>` configured:
** The first copies any class files in `target/classes` to `app/classes` (which will actually be `target/docker/app/classes`)
** The second copies all files under `src/docker` (i.e. the `Dockerfile`) into `target/docker`
* The `<dependencySets>` configuration copies all the project dependencies (including transitive dependencies) to the `app/libs` directory (actually the `target/docker/app/libs` directory). Any version information will be stripped from the files, so `coherence-22.06.7.jar` would become `coherence.jar`.
* The `<dependencySets>` configuration copies all the project dependencies (including transitive dependencies) to the `app/libs` directory (actually the `target/docker/app/libs` directory). Any version information will be stripped from the files, so `coherence-22.06.10.jar` would become `coherence.jar`.
[source,xml]
.src/assembly/image-assembly.xml
Expand Down Expand Up @@ -274,7 +274,7 @@ In the `build.gradle` file we add the bom as a platform dependency and then add
.build.gradle
----
dependencies {
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7")
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.10")
implementation "com.oracle.coherence.ce:coherence"
implementation "com.oracle.coherence.ce:coherence-json"
Expand Down
2 changes: 1 addition & 1 deletion examples/016_simple_docker_image/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ repositories {
}

dependencies {
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7")
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.10")

implementation "com.oracle.coherence.ce:coherence"
implementation "com.oracle.coherence.ce:coherence-json"
Expand Down
2 changes: 1 addition & 1 deletion examples/016_simple_docker_image/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>

<coherence.version>22.06.7</coherence.version>
<coherence.version>22.06.10</coherence.version>

<version.plugin.jib>3.3.2</version.plugin.jib>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion examples/021_deployment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<properties>
<coherence.group.id>com.oracle.coherence.ce</coherence.group.id>
<coherence.version>22.06.7</coherence.version>
<coherence.version>22.06.10</coherence.version>

<helidon.version>1.3.1</helidon.version>

Expand Down
2 changes: 1 addition & 1 deletion examples/025_extend_client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repositories {
}

dependencies {
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7")
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.10")

implementation "com.oracle.coherence.ce:coherence"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/025_extend_client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>

<coherence.version>22.06.7</coherence.version>
<coherence.version>22.06.10</coherence.version>

<version.plugin.jib>3.4.1</version.plugin.jib>
<version.plugin.exec>3.0.0</version.plugin.exec>
Expand Down
2 changes: 1 addition & 1 deletion examples/090_tls/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<maven.compiler.target>11</maven.compiler.target>

<coherence.group.id>com.oracle.coherence.ce</coherence.group.id>
<coherence.version>22.06.7</coherence.version>
<coherence.version>22.06.10</coherence.version>

<jib.version>3.4.0</jib.version>

Expand Down
2 changes: 1 addition & 1 deletion examples/200_autoscaler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<maven.compiler.target>11</maven.compiler.target>

<coherence.group.id>com.oracle.coherence.ce</coherence.group.id>
<coherence.version>22.06.7</coherence.version>
<coherence.version>22.06.10</coherence.version>

<jib.version>3.4.0</jib.version>

Expand Down
4 changes: 2 additions & 2 deletions examples/400_Istio/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ metadata:
name: storage
spec:
replicas: 3
image: ghcr.io/oracle/coherence-ce:22.06.7
image: ghcr.io/oracle/coherence-ce:22.06.10
labels:
app: storage # <1>
version: 1.0.0 # <2>
Expand Down Expand Up @@ -274,7 +274,7 @@ kind: CoherenceJob
metadata:
name: client
spec:
image: ghcr.io/oracle/coherence-ce:22.06.7 # <1>
image: ghcr.io/oracle/coherence-ce:22.06.10 # <1>
restartPolicy: Never
cluster: storage # <2>
coherence:
Expand Down
2 changes: 1 addition & 1 deletion examples/no-operator/04_istio/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ghcr.io/oracle/coherence-operator:3.4.1 AS Builder

FROM ghcr.io/oracle/coherence-ce:22.06.7
FROM ghcr.io/oracle/coherence-ce:22.06.10
COPY --from=Builder /files /files
COPY --from=Builder /files/lib/coherence-operator.jar /app/libs/coherence-operator.jar
COPY coherence-java-client-22.06.7.jar /app/libs/coherence-java-client-22.06.7.jar
Expand Down
2 changes: 1 addition & 1 deletion java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<coherence.legacy.groupId>com.oracle.coherence.ce</coherence.legacy.groupId>
<coherence.legacy.version>21.12.5</coherence.legacy.version>

<coherence.version>22.06.8</coherence.version>
<coherence.version>22.06.10</coherence.version>
<coherence.groupId>com.oracle.coherence.ce</coherence.groupId>

<coherence.test.base.image>gcr.io/distroless/java11-debian11</coherence.test.base.image>
Expand Down

0 comments on commit 772ff9c

Please sign in to comment.