Skip to content

Commit 6c5c65f

Browse files
committed
Resolves: [JWS-3345] - Openshift image of JWS 6 with OpenJDK21 release
* Add jdk21 overrides file and maven setup for relevant container Signed-off-by: Sokratis Zappis <[email protected]>
1 parent 3e6d31b commit 6c5c65f

File tree

3 files changed

+71
-0
lines changed

3 files changed

+71
-0
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# This file is shipped by a Maven package and sets JAVA_HOME to
5+
# an OpenJDK-specific path. This causes problems for OpenJ9 containers
6+
# as the path is not correct for them. We don't need this in any of
7+
# the containers because we set JAVA_HOME in the container metadata.
8+
# Blank the file rather than removing it, to avoid a warning message
9+
# from /usr/bin/mvn.
10+
if [ -f /etc/java/maven.conf ]; then
11+
:> /etc/java/maven.conf
12+
fi
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
schema_version: 1
2+
name: jboss.container.maven
3+
version: '3.8.21'
4+
description: Provides Maven v3.8 capabilities to an image.
5+
6+
labels:
7+
- name: io.fabric8.s2i.version.maven
8+
value: "3.8"
9+
10+
envs:
11+
- name: JBOSS_CONTAINER_MAVEN_38_MODULE
12+
value: /opt/jboss/container/maven/38/
13+
- name: MAVEN_VERSION
14+
value: '3.8'
15+
16+
modules:
17+
install:
18+
- name: jboss.container.maven.module
19+
20+
packages:
21+
install:
22+
- maven-openjdk21
23+
24+
execute:
25+
- script: configure.sh

tomcat10/jdk21-overrides.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
schema_version: 1
2+
3+
name: "jboss-webserver-6/jws60-openjdk21-rhel8-openshift"
4+
description: "Red Hat JBoss Web Server 6.0 - Tomcat 10 OpenShift container image with OpenJDK21 on UBI8"
5+
version: "6.0.3"
6+
from: "jboss-webserver-6/webserver60-openjdk21-tomcat10-rhel8:6.0.3"
7+
labels:
8+
- name: "com.redhat.component"
9+
value: "jboss-webserver-60-openjdk21-rhel8-openshift-container"
10+
- name: "io.k8s.description"
11+
value: "Platform for building and running web applications on JBoss Web Server 6.0 with OpenJDK21 - Tomcat v10"
12+
modules:
13+
repositories:
14+
- name: cct_module
15+
git:
16+
url: https://github.com/jboss-openshift/cct_module.git
17+
ref: 0.45.6
18+
- name: jboss-eap-modules
19+
git:
20+
url: https://github.com/jboss-container-images/jboss-eap-modules.git
21+
ref: master
22+
- name: jboss-jws-modules
23+
git:
24+
url: https://github.com/web-servers/jboss-jws-container-images-modules
25+
ref: main
26+
- path: custom-modules
27+
install:
28+
- name: jboss.container.maven
29+
version: "3.8.21"
30+
31+
osbs:
32+
repository:
33+
name: containers/jboss-webserver-openjdk21-tomcat10
34+
branch: jws-6.0-openshift-dev-rhel-8

0 commit comments

Comments
 (0)