Skip to content

Commit 879b892

Browse files
committed
Merge remote-tracking branch 'origin/ubi9' into jlink-dev
2 parents ef76045 + 6cc4abb commit 879b892

File tree

76 files changed

+134
-589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+134
-589
lines changed

.github/workflows/ubi9-openjdk-11-runtime.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/workflows/ubi9-openjdk-11.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

modules/jdk/11/artifacts/opt/jboss/container/openjdk/jdk/jvm-options

Lines changed: 0 additions & 10 deletions
This file was deleted.

modules/jdk/11/configure.sh

Lines changed: 0 additions & 30 deletions
This file was deleted.

modules/jdk/11/module.yaml

Lines changed: 0 additions & 36 deletions
This file was deleted.

modules/jdk/17/configure.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,6 @@
22
# Configure module
33
set -e
44

5-
SCRIPT_DIR=$(dirname $0)
6-
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
7-
8-
chown -R $USER:root $SCRIPT_DIR
9-
chmod -R ug+rwX $SCRIPT_DIR
10-
chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
11-
12-
pushd ${ARTIFACTS_DIR}
13-
cp -pr * /
14-
popd
15-
165
# Set this JDK as the alternative in use
176
_arch="$(uname -i)"
187
alternatives --set java java-17-openjdk.${_arch}

modules/jdk/17/module.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,7 @@ modules:
3333

3434
execute:
3535
- script: configure.sh
36+
37+
artifacts:
38+
- path: artifacts/jvm-options
39+
dest: /opt/jboss/container/openjdk/jdk

modules/jdk/21/configure.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,6 @@
22
# Configure module
33
set -e
44

5-
SCRIPT_DIR=$(dirname $0)
6-
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
7-
8-
chown -R $USER:root $SCRIPT_DIR
9-
chmod -R ug+rwX $SCRIPT_DIR
10-
chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
11-
12-
pushd ${ARTIFACTS_DIR}
13-
cp -pr * /
14-
popd
15-
165
# Set this JDK as the alternative in use
176
_arch="$(uname -i)"
187
alternatives --set java java-21-openjdk.${_arch}

0 commit comments

Comments
 (0)