Skip to content

Commit be123a8

Browse files
jerboaaJonathan Dowland
jerboaa
authored and
Jonathan Dowland
committed
[OPENJDK-38] Add support for Maven 3.6
Signed-off-by: Severin Gehwolf <[email protected]>
1 parent 838fc92 commit be123a8

File tree

7 files changed

+201
-0
lines changed

7 files changed

+201
-0
lines changed

‎jboss/container/maven/36/36scl/README.adoc

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
////
2+
AUTOGENERATED FILE - this file was generated via ./gen_template_docs.py.
3+
Changes to .adoc or HTML files may be overwritten! Please change the
4+
generator or the input template (./*.jinja)
5+
////
6+
7+
8+
9+
= link:./module.yaml[jboss.container.maven.36.bash]
10+
:toc:
11+
:toc-placement!:
12+
:toclevels: 5
13+
14+
Provides Maven v3.6 capabilities to an image via SCL.
15+
16+
toc::[]
17+
18+
== Labels
19+
20+
The following labels will be defined on the image:
21+
22+
io.fabric8.s2i.version.maven:: 3.6
23+
24+
== Environment Variables
25+
26+
The following environment variables are used to configure the functionality provided by this module:
27+
28+
|=======================================================================
29+
|Name |Description |Example
30+
|=======================================================================
31+
32+
The following environment variables will be configured on the image:
33+
|=======================================================================
34+
|Name |Value
35+
|JBOSS_CONTAINER_MAVEN_36_MODULE |/opt/jboss/container/maven/36/
36+
|MAVEN_VERSION |3.6
37+
|=======================================================================
38+
39+
== Resources
40+
No additional resources will be installed through this module.
41+
42+
== RPM Packages
43+
44+
=== Installed RPM Packages
45+
46+
The following RPMs will be installed by this module:
47+
48+
* rh-maven36
49+
50+
=== RPM Package Repositories
51+
No additional RPM package repositories are required to install listed RPMs.
52+
53+
== Modules
54+
55+
=== Included Modules
56+
No additional modules will be installed through this module.
57+
58+
=== Module Repositories
59+
No module repositories defined.

‎jboss/container/maven/36/36scl/artifacts/opt/jboss/container/maven/36/scl-enable-maven

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
source /opt/rh/rh-maven36/enable

‎jboss/container/maven/36/36scl/configure.sh

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/sh
2+
# Configure module
3+
set -e
4+
5+
SCRIPT_DIR=$(dirname $0)
6+
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
7+
8+
chown -R jboss:root $ARTIFACTS_DIR
9+
chmod -R ug+rwX $ARTIFACTS_DIR
10+
chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/maven/36/scl-enable-maven
11+
12+
pushd ${ARTIFACTS_DIR}
13+
cp -pr * /
14+
popd
15+
16+
# maven pulls in jdk8, so we need to remove them if another jdk is the default
17+
if ! readlink /etc/alternatives/java | grep -q "java-1\.8\.0"; then
18+
for pkg in java-1.8.0-openjdk-devel \
19+
java-1.8.0-openjdk-headless \
20+
java-1.8.0-openjdk; do
21+
if rpm -q "$pkg"; then
22+
rpm -e --nodeps "$pkg"
23+
fi
24+
done
25+
fi

‎jboss/container/maven/36/36scl/module.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
schema_version: 1
2+
name: jboss.container.maven.36.bash
3+
version: '3.6scl'
4+
description: Provides Maven v3.6 capabilities to an image via SCL
5+
6+
labels:
7+
- name: io.fabric8.s2i.version.maven
8+
value: "3.6"
9+
10+
envs:
11+
- name: JBOSS_CONTAINER_MAVEN_36_MODULE
12+
value: /opt/jboss/container/maven/36/
13+
- name: MAVEN_VERSION
14+
value: "3.6"
15+
16+
execute:
17+
- script: configure.sh
18+
19+
packages:
20+
install:
21+
- rh-maven36
22+

‎jboss/container/maven/36/default/README.adoc

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
////
2+
AUTOGENERATED FILE - this file was generated via ./gen_template_docs.py.
3+
Changes to .adoc or HTML files may be overwritten! Please change the
4+
generator or the input template (./*.jinja)
5+
////
6+
7+
8+
9+
= link:./module.yaml[jboss.container.maven.36.bash]
10+
:toc:
11+
:toc-placement!:
12+
:toclevels: 5
13+
14+
Provides Maven v3.6 capabilities to an image.
15+
16+
toc::[]
17+
18+
== Labels
19+
20+
The following labels will be defined on the image:
21+
22+
io.fabric8.s2i.version.maven:: 3.6
23+
24+
== Environment Variables
25+
26+
The following environment variables are used to configure the functionality provided by this module:
27+
28+
|=======================================================================
29+
|Name |Description |Example
30+
|=======================================================================
31+
32+
The following environment variables will be configured on the image:
33+
|=======================================================================
34+
|Name |Value
35+
|JBOSS_CONTAINER_MAVEN_36_MODULE |/opt/jboss/container/maven/36/
36+
|MAVEN_VERSION |3.6
37+
|=======================================================================
38+
39+
== Resources
40+
No additional resources will be installed through this module.
41+
42+
== RPM Packages
43+
44+
=== Installed RPM Packages
45+
46+
The following RPMs will be installed by this module:
47+
48+
* maven
49+
50+
=== RPM Package Repositories
51+
No additional RPM package repositories are required to install listed RPMs.
52+
53+
== Modules
54+
55+
=== Included Modules
56+
No additional modules will be installed through this module.
57+
58+
=== Module Repositories
59+
No module repositories defined.

‎jboss/container/maven/36/default/configure.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# maven pulls in jdk8, so we need to remove them if another jdk is the default
5+
if ! readlink /etc/alternatives/java | grep -q "java-1\.8\.0"; then
6+
for pkg in java-1.8.0-openjdk-devel \
7+
java-1.8.0-openjdk-headless \
8+
java-1.8.0-openjdk; do
9+
if rpm -q "$pkg"; then
10+
rpm -e --nodeps "$pkg"
11+
fi
12+
done
13+
fi

‎jboss/container/maven/36/default/module.yaml

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

0 commit comments

Comments
 (0)