Skip to content

Commit 44bf06a

Browse files
committed
Maven module upgrade
1 parent 9ace3b2 commit 44bf06a

File tree

6 files changed

+54
-1
lines changed

6 files changed

+54
-1
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: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
schema_version: 1
2+
name: jboss.container.maven
3+
version: '3.8.17'
4+
description: Provides Maven v3.8 capabilities to an image.
5+
6+
envs:
7+
- name: JBOSS_CONTAINER_MAVEN_38_MODULE
8+
value: /opt/jboss/container/maven/38/
9+
- name: MAVEN_VERSION
10+
value: '3.8'
11+
12+
modules:
13+
install:
14+
- name: jboss.container.maven.module
15+
16+
packages:
17+
install:
18+
- maven-openjdk17
19+
20+
execute:
21+
- script: configure.sh
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[maven]
2+
name=maven
3+
stream=3.8
4+
profiles=
5+
state=enabled
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/sh
2+
set -e
3+
4+
SCRIPT_DIR=$(dirname $0)
5+
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
6+
7+
cp ${ARTIFACTS_DIR}/maven.module /etc/dnf/modules.d/maven.module
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
schema_version: 1
2+
name: jboss.container.maven.module
3+
version: '3.8'
4+
description: ^
5+
Enables the AppStream RPM Module for Maven 3.8 packages.
6+
7+
execute:
8+
- script: configure.sh

tomcat10/image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ modules:
9898
- path: custom-modules
9999
install:
100100
- name: jboss.container.maven
101-
version: "8.0.3.5"
101+
version: "3.8.17"
102102
- name: dynamic-resources
103103
- name: s2i-common
104104
- name: os-jws-s2i

0 commit comments

Comments
 (0)