Skip to content

Commit 5eae163

Browse files
samding01osnipso
samding01
authored and
osnipso
committed
Upgrade to 7.3.8 GA for multiarch
Upgrade to 7.3.8 GA for multiarch
1 parent a674452 commit 5eae163

File tree

5 files changed

+93
-29
lines changed

5 files changed

+93
-29
lines changed

‎docs/examples/s2i/configuration/clustered-openshift.xml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22

3-
<server xmlns="urn:jboss:domain:8.0">
3+
<server xmlns="urn:jboss:domain:11.0">
44
<extensions>
55
<extension module="org.infinispan.extension"/>
66
<extension module="org.infinispan.server.endpoint"/>
@@ -70,7 +70,7 @@
7070
</access-control>
7171
</management>
7272
<profile>
73-
<subsystem xmlns="urn:jboss:domain:logging:6.0">
73+
<subsystem xmlns="urn:jboss:domain:logging:8.0">
7474
<console-handler name="CONSOLE">
7575
<formatter>
7676
<named-formatter name="##CONSOLE-FORMATTER##"/>
@@ -154,7 +154,7 @@
154154
</drivers>
155155
</datasources>
156156
</subsystem>
157-
<subsystem xmlns="urn:wildfly:elytron:4.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
157+
<subsystem xmlns="urn:wildfly:elytron:8.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
158158
<providers>
159159
<aggregate-providers name="combined-providers">
160160
<providers name="elytron"/>
@@ -340,12 +340,8 @@
340340
<expose-expression-model/>
341341
<remoting-connector/>
342342
</subsystem>
343-
<subsystem xmlns="urn:jboss:domain:naming:2.0">
344-
<remote-naming/>
345-
</subsystem>
346-
<subsystem xmlns="urn:jboss:domain:remoting:4.0">
347-
<http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
348-
</subsystem>
343+
<subsystem xmlns="urn:jboss:domain:naming:2.0"/>
344+
<subsystem xmlns="urn:jboss:domain:remoting:4.0"/>
349345
<subsystem xmlns="urn:jboss:domain:security:2.0">
350346
<security-domains>
351347
<security-domain name="other" cache-type="default">

‎image.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
schema_version: 1
22
name: jboss-datagrid-7/datagrid73-openj9-11-openshift
3-
version: 1.7
3+
version: 1.8
44
description: "Red Hat JBoss Data Grid 7.3 for OpenShift container image"
55

6-
from: rh-osbs/ubi8:8-released
6+
from: registry.redhat.io/ubi8/ubi:latest
77

88
labels:
99
- name: "com.redhat.component"
1010
value: "jboss-datagrid-7-datagrid73-openj9-11-openshift-container"
1111
- name: "org.jboss.product"
1212
value: "datagrid"
1313
- name: "org.jboss.product.version"
14-
value: "7.3.7.GA"
14+
value: "7.3.8.GA"
1515
- name: "org.jboss.product.datagrid.version"
16-
value: "7.3.7.GA"
16+
value: "7.3.8.GA"
1717
- name: "org.jboss.deployments-dir"
1818
value: "/opt/datagrid/standalone/deployments"
1919
- name: "com.redhat.deployments-dir"
@@ -41,9 +41,9 @@ envs:
4141
- name: "JBOSS_PRODUCT"
4242
value: "datagrid"
4343
- name: "JBOSS_DATAGRID_VERSION"
44-
value: "7.3.7.GA"
44+
value: "7.3.8.GA"
4545
- name: "PRODUCT_VERSION"
46-
value: "7.3.7.GA"
46+
value: "7.3.8.GA"
4747
- name: "JBOSS_HOME"
4848
value: "/opt/datagrid"
4949
- name: "JBOSS_MODULES_SYSTEM_PKGS"
@@ -213,8 +213,8 @@ packages:
213213
- openssl
214214
artifacts:
215215
- name: jboss-datagrid-server.zip
216-
description: "Artifact (patch) is available on Customer Portal: https://access.redhat.com/jbossnetwork/restricted/softwareDownload.html?softwareId=87621"
217-
md5: 11f5ec9161af2896b98312d35e17d681
216+
description: "Artifact (patch) is available on Customer Portal: https://access.redhat.com/jbossnetwork/restricted/softwareDownload.html?softwareId=73761"
217+
md5: 3eb94c97620581181c31d76f77e8fbce
218218

219219
run:
220220
user: 185

‎modules/common/os-eap7-openshift/added/standalone.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ JAVA_OPTS="$JAVA_OPTS $JAVA_OPTS_APPEND"
1717

1818
JBOSS_LOGMANAGER_JAR=$(getfiles org/jboss/logmanager/main/jboss-logmanager)
1919
WILDFLY_COMMON_JAR=$(getfiles org/wildfly/common/main/wildfly-common)
20-
JAVAX_JSON_API=$(getfiles javax/json/api/main/javax.json-api)
21-
JAVAX_JSON_IMPL=$(getfiles org/glassfish/javax/json/main/javax.json)
20+
JAVAX_JSON_API=$(getfiles javax/json/api/main/jakarta.json-api)
21+
JAVAX_JSON_IMPL=$(getfiles org/glassfish/jakarta/json/main/jakarta.json)
2222

2323
# Correctly set the bootclasspath for the Logmanager
2424
JAVA_OPTS="$JAVA_OPTS -Xbootclasspath/a:${JBOSS_LOGMANAGER_JAR}:${JAVAX_JSON_IMPL}:${JAVAX_JSON_API}:${WILDFLY_COMMON_JAR}"

‎modules/datagrid/configuration/added/clustered-openshift.xml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22

3-
<server xmlns="urn:jboss:domain:8.0">
3+
<server xmlns="urn:jboss:domain:11.0">
44
<extensions>
55
<extension module="org.infinispan.extension"/>
66
<extension module="org.infinispan.server.endpoint"/>
@@ -70,7 +70,7 @@
7070
</access-control>
7171
</management>
7272
<profile>
73-
<subsystem xmlns="urn:jboss:domain:logging:6.0">
73+
<subsystem xmlns="urn:jboss:domain:logging:8.0">
7474
<console-handler name="CONSOLE">
7575
<formatter>
7676
<named-formatter name="##CONSOLE-FORMATTER##"/>
@@ -148,7 +148,7 @@
148148
</drivers>
149149
</datasources>
150150
</subsystem>
151-
<subsystem xmlns="urn:wildfly:elytron:4.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
151+
<subsystem xmlns="urn:wildfly:elytron:8.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
152152
<providers>
153153
<aggregate-providers name="combined-providers">
154154
<providers name="elytron"/>
@@ -319,12 +319,8 @@
319319
<expose-expression-model/>
320320
<remoting-connector/>
321321
</subsystem>
322-
<subsystem xmlns="urn:jboss:domain:naming:2.0">
323-
<remote-naming/>
324-
</subsystem>
325-
<subsystem xmlns="urn:jboss:domain:remoting:4.0">
326-
<http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
327-
</subsystem>
322+
<subsystem xmlns="urn:jboss:domain:naming:2.0"/>
323+
<subsystem xmlns="urn:jboss:domain:remoting:4.0"/>
328324
<subsystem xmlns="urn:jboss:domain:security:2.0">
329325
<security-domains>
330326
<security-domain name="other" cache-type="default">

‎templates/datagrid73-image-stream.json‎

Lines changed: 73 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"annotations": {
1818
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3",
1919
"openshift.io/provider-display-name": "Red Hat, Inc.",
20-
"version": "1.4"
20+
"version": "1.8"
2121
}
2222
},
2323
"spec": {
@@ -111,6 +111,78 @@
111111
"kind": "DockerImage",
112112
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.4"
113113
}
114+
},
115+
{
116+
"name": "1.5",
117+
"annotations": {
118+
"description": "Red Hat JBoss Data Grid 7.3 image",
119+
"iconClass": "icon-datagrid",
120+
"tags": "datagrid,jboss,hidden",
121+
"supports": "datagrid:7.3",
122+
"version": "1.5",
123+
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3"
124+
},
125+
"referencePolicy": {
126+
"type": "Local"
127+
},
128+
"from": {
129+
"kind": "DockerImage",
130+
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.5"
131+
}
132+
},
133+
{
134+
"name": "1.6",
135+
"annotations": {
136+
"description": "Red Hat JBoss Data Grid 7.3 image",
137+
"iconClass": "icon-datagrid",
138+
"tags": "datagrid,jboss,hidden",
139+
"supports": "datagrid:7.3",
140+
"version": "1.6",
141+
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3"
142+
},
143+
"referencePolicy": {
144+
"type": "Local"
145+
},
146+
"from": {
147+
"kind": "DockerImage",
148+
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.6"
149+
}
150+
},
151+
{
152+
"name": "1.7",
153+
"annotations": {
154+
"description": "Red Hat JBoss Data Grid 7.3 image",
155+
"iconClass": "icon-datagrid",
156+
"tags": "datagrid,jboss,hidden",
157+
"supports": "datagrid:7.3",
158+
"version": "1.7",
159+
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3"
160+
},
161+
"referencePolicy": {
162+
"type": "Local"
163+
},
164+
"from": {
165+
"kind": "DockerImage",
166+
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.7"
167+
}
168+
},
169+
{
170+
"name": "1.8",
171+
"annotations": {
172+
"description": "Red Hat JBoss Data Grid 7.3 image",
173+
"iconClass": "icon-datagrid",
174+
"tags": "datagrid,jboss,hidden",
175+
"supports": "datagrid:7.3",
176+
"version": "1.8",
177+
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3"
178+
},
179+
"referencePolicy": {
180+
"type": "Local"
181+
},
182+
"from": {
183+
"kind": "DockerImage",
184+
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.8"
185+
}
114186
}
115187
]
116188
}

0 commit comments

Comments
 (0)