Skip to content

Commit 772ff9c

Browse files
thegridmanthegridman
authored
Bump Coherence versions after Oct CPU releases (#678)
1 parent 201227c commit 772ff9c

File tree

18 files changed

+47
-47
lines changed

18 files changed

+47
-47
lines changed

‎.github/workflows/coherence-matrix.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ jobs:
3535
matrixName:
3636
- "15.1.1-0-SNAPSHOT"
3737
- "15.1.1-0-SNAPSHOT-Graal"
38-
- "24.03"
39-
- "24.03-Graal"
38+
- "24.09"
39+
- "24.09-Graal"
4040
- "22.06"
4141
- "14.1.2-0-SNAPSHOT"
4242
- "14.1.1-2206-SNAPSHOT"
@@ -58,21 +58,21 @@ jobs:
5858
javaVersion: 17
5959
baseImage: "gcr.io/distroless/java17-debian12"
6060

61-
- matrixName: "24.03"
62-
coherenceVersion: "24.03.1"
63-
coherenceImage: "ghcr.io/oracle/coherence-ce:24.03.1"
61+
- matrixName: "24.09"
62+
coherenceVersion: "24.09"
63+
coherenceImage: "ghcr.io/oracle/coherence-ce:24.09"
6464
javaVersion: 17
6565
baseImage: "gcr.io/distroless/java17-debian12"
6666

67-
- matrixName: "24.03-Graal"
68-
coherenceVersion: "24.03.1"
69-
coherenceImage: "ghcr.io/oracle/coherence-ce:24.03.1-graal"
67+
- matrixName: "24.09-Graal"
68+
coherenceVersion: "24.09"
69+
coherenceImage: "ghcr.io/oracle/coherence-ce:24.09-graal"
7070
javaVersion: 17
7171
baseImage: "gcr.io/distroless/java17-debian12"
7272

7373
- matrixName: "22.06"
74-
coherenceVersion: "22.06.9"
75-
coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.9"
74+
coherenceVersion: "22.06.10"
75+
coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.10"
7676
javaVersion: 11
7777
baseImage: "gcr.io/distroless/java11-debian11"
7878

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

9191
- matrixName: "14.1.1-0-SNAPSHOT"
92-
coherenceVersion: "14.1.1-0-19-SNAPSHOT"
92+
coherenceVersion: "14.1.1-0-20-SNAPSHOT"
9393
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-0-19-SNAPSHOT"
9494
javaVersion: 8
9595
baseImage: "gcr.io/distroless/java11-debian11"
9696

9797
- matrixName: "14.1.1-0"
98-
coherenceVersion: "14.1.1-0-18"
98+
coherenceVersion: "14.1.1-0-19"
9999
javaVersion: 8
100-
coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-18"
100+
coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-19"
101101
baseImage: "gcr.io/distroless/java11-debian11"
102102

103103
- matrixName: "14.1.1.0.0"
@@ -113,8 +113,8 @@ jobs:
113113
baseImage: "gcr.io/distroless/java11-debian11"
114114

115115
- matrixName: "12.2.1-4-SNAPSHOT"
116-
coherenceVersion: "12.2.1-4-21-SNAPSHOT"
117-
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:12.2.1-4-21-SNAPSHOT"
116+
coherenceVersion: "12.2.1-4-24-SNAPSHOT"
117+
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:12.2.1-4-24-SNAPSHOT"
118118
javaVersion: 8
119119
baseImage: "gcr.io/distroless/java11-debian11"
120120

‎.github/workflows/compatibility-tests.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,51 +51,51 @@ jobs:
5151
- 3.2.6
5252
include:
5353
- compatibilityVersion: 3.4.0
54-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
54+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
5555
compatibilitySelector: control-plane=coherence
5656
k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
5757
- compatibilityVersion: 3.3.5
58-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
58+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
5959
compatibilitySelector: control-plane=coherence
6060
k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
6161
- compatibilityVersion: 3.3.4
62-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
62+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
6363
compatibilitySelector: control-plane=coherence
6464
k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
6565
- compatibilityVersion: 3.3.3
66-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
66+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
6767
compatibilitySelector: control-plane=coherence
6868
k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
6969
- compatibilityVersion: 3.3.2
70-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
70+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
7171
compatibilitySelector: control-plane=coherence
7272
k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
7373
- compatibilityVersion: 3.3.1
74-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
74+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
7575
compatibilitySelector: control-plane=coherence
7676
k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
7777
- compatibilityVersion: 3.3.0
78-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
78+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
7979
compatibilitySelector: control-plane=coherence
8080
k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
8181
- compatibilityVersion: 3.2.11
82-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
82+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
8383
compatibilitySelector: control-plane=coherence
8484
k8s: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
8585
- compatibilityVersion: 3.2.10
86-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
86+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
8787
compatibilitySelector: control-plane=coherence
8888
k8s: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
8989
- compatibilityVersion: 3.2.9
90-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
90+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
9191
compatibilitySelector: control-plane=coherence
9292
k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16
9393
- compatibilityVersion: 3.2.7
94-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
94+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
9595
compatibilitySelector: control-plane=coherence
9696
k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16
9797
- compatibilityVersion: 3.2.6
98-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
98+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
9999
compatibilitySelector: control-plane=coherence
100100
k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16
101101

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ KUBERNETES_DOC_VERSION=v1.30
3939
# ----------------------------------------------------------------------------------------------------------------------
4040
# The Coherence version to build against - must be a Java 8 compatible version
4141
COHERENCE_VERSION ?= 21.12.5
42-
COHERENCE_VERSION_LTS ?= 22.06.9
42+
COHERENCE_VERSION_LTS ?= 22.06.10
4343
# The default Coherence image the Operator will run if no image is specified
4444
COHERENCE_IMAGE_REGISTRY ?= ghcr.io/oracle
4545
COHERENCE_IMAGE_NAME ?= coherence-ce

‎docs/management/100_tmb_test.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ spec:
5454
restartPolicy: Never
5555
containers:
5656
- name: coherence
57-
image: ghcr.io/oracle/coherence-ce:22.06 # <1>
57+
image: ghcr.io/oracle/coherence-ce:22.06.10 # <1>
5858
ports:
5959
- name: mbus
6060
containerPort: 8000
@@ -101,7 +101,7 @@ spec:
101101
restartPolicy: Never
102102
containers:
103103
- name: coherence
104-
image: ghcr.io/oracle/coherence-ce:22.06
104+
image: ghcr.io/oracle/coherence-ce:22.06.10
105105
command:
106106
- java # <1>
107107
- -cp

‎examples/015_simple_image/README.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ In the `build.gradle` file we add the bom as a platform dependency.
5252
.build.gradle
5353
----
5454
dependencies {
55-
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7")
55+
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.10")
5656
----
5757
5858
We can then add the `coherence` and `coherence-json` modules as dependencies
@@ -77,7 +77,7 @@ In the `build.gradle` file we add the bom as a platform dependency.
7777
.build.gradle
7878
----
7979
dependencies {
80-
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7")
80+
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.10")
8181
8282
implementation "com.oracle.coherence.ce:coherence"
8383
implementation "com.oracle.coherence.ce:coherence-json"

‎examples/015_simple_image/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ repositories {
1919
}
2020

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

2424
implementation "com.oracle.coherence.ce:coherence"
2525
implementation "com.oracle.coherence.ce:coherence-json"

‎examples/015_simple_image/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<maven.compiler.source>11</maven.compiler.source>
2525
<maven.compiler.target>11</maven.compiler.target>
2626

27-
<coherence.version>22.06.7</coherence.version>
27+
<coherence.version>22.06.10</coherence.version>
2828

2929
<version.plugin.jib>3.4.1</version.plugin.jib>
3030
</properties>

‎examples/016_simple_docker_image/README.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ The `image-assembly.xml` descriptor file is shown below, and configures the foll
205205
* There are two `<fileSets>` configured:
206206
** The first copies any class files in `target/classes` to `app/classes` (which will actually be `target/docker/app/classes`)
207207
** The second copies all files under `src/docker` (i.e. the `Dockerfile`) into `target/docker`
208-
* 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`.
208+
* 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`.
209209
210210
[source,xml]
211211
.src/assembly/image-assembly.xml
@@ -274,7 +274,7 @@ In the `build.gradle` file we add the bom as a platform dependency and then add
274274
.build.gradle
275275
----
276276
dependencies {
277-
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.7")
277+
implementation platform("com.oracle.coherence.ce:coherence-bom:22.06.10")
278278
279279
implementation "com.oracle.coherence.ce:coherence"
280280
implementation "com.oracle.coherence.ce:coherence-json"

‎examples/016_simple_docker_image/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ repositories {
1818
}
1919

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

2323
implementation "com.oracle.coherence.ce:coherence"
2424
implementation "com.oracle.coherence.ce:coherence-json"

‎examples/016_simple_docker_image/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<maven.compiler.source>11</maven.compiler.source>
2525
<maven.compiler.target>11</maven.compiler.target>
2626

27-
<coherence.version>22.06.7</coherence.version>
27+
<coherence.version>22.06.10</coherence.version>
2828

2929
<version.plugin.jib>3.3.2</version.plugin.jib>
3030
</properties>

0 commit comments

Comments
 (0)