Skip to content

Commit 1a53327

Browse files
committed
[OPENJDK-781] maven module for openjdk17
Add a new maven module to install maven-openjdk17. Use it in the OpenJDK 17 image. Stop using the singleton-jdk module, which we shouldn't need anymore. Signed-off-by: Jonathan Dowland <[email protected]>
1 parent 00dea0c commit 1a53327

File tree

3 files changed

+39
-2
lines changed

3 files changed

+39
-2
lines changed

modules/maven/8.6.3.6.17/configure.sh

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

modules/maven/8.6.3.6.17/module.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
schema_version: 1
2+
name: jboss.container.maven
3+
# Version scheme: RHEL major . RHEL minor . Maven major . Maven minor . JDK version
4+
version: '8.6.3.6.17'
5+
description: Provides Maven v3.6 capabilities to an image.
6+
7+
labels:
8+
- name: io.fabric8.s2i.version.maven
9+
value: "3.6"
10+
11+
envs:
12+
- name: JBOSS_CONTAINER_MAVEN_36_MODULE
13+
value: /opt/jboss/container/maven/36/
14+
- name: MAVEN_VERSION
15+
value: "3.6"
16+
17+
modules:
18+
install:
19+
- name: jboss.container.maven.module
20+
21+
packages:
22+
install:
23+
- maven-openjdk17
24+
25+
execute:
26+
- script: configure.sh

ubi8-openjdk-17.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,8 @@ modules:
4747
- name: jboss.container.prometheus
4848
version: "8.6.17"
4949
- name: jboss.container.maven
50-
version: "8.2.3.6"
50+
version: "8.6.3.6.17"
5151
- name: jboss.container.java.s2i.bash
52-
- name: jboss.container.java.singleton-jdk
5352

5453
help:
5554
add: true

0 commit comments

Comments
 (0)