Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Openjdk 3029] no singleton jdk - maven module edition #498

Merged
merged 1 commit into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions modules/maven/21/configure.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh
set -e

# This file is shipped by a Maven package and sets JAVA_HOME to
# an OpenJDK-specific path. This causes problems for OpenJ9 containers
# as the path is not correct for them. We don't need this in any of
# the containers because we set JAVA_HOME in the container metadata.
# Blank the file rather than removing it, to avoid a warning message
# from /usr/bin/mvn.
if [ -f /etc/java/maven.conf ]; then
:> /etc/java/maven.conf
fi
25 changes: 25 additions & 0 deletions modules/maven/21/module.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
schema_version: 1
name: jboss.container.maven
version: '3.8.21'
description: Provides Maven v3.8 capabilities to an image.

labels:
- name: io.fabric8.s2i.version.maven
value: "3.8"

envs:
- name: JBOSS_CONTAINER_MAVEN_38_MODULE
value: /opt/jboss/container/maven/38/
- name: MAVEN_VERSION
value: '3.8'

modules:
install:
- name: jboss.container.maven.module

packages:
install:
- maven-openjdk21

execute:
- script: configure.sh
2 changes: 1 addition & 1 deletion ubi8-openjdk-21.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ modules:
- name: jboss.container.openjdk.jdk
version: "21"
- name: jboss.container.maven
version: "3.8.17"
version: "3.8.21"
- name: jboss.container.util.tzdata
- name: jboss.container.java.s2i.bash

Expand Down
Loading