diff options
| author | Lucas Charles <me@lucascharles.me> | 2019-03-21 19:59:51 +0000 |
|---|---|---|
| committer | Lucas Charles <me@lucascharles.me> | 2019-03-21 19:59:51 +0000 |
| commit | fddc574141339a76e2426f628b4f204668d63e27 (patch) | |
| tree | db7231f6a2b150cbd99f113ec15897bc06d48292 /run.sh | |
| parent | 663c87797b7e52d6db06603770d120958c65c0a3 (diff) | |
| parent | 3a52cda095fae55e13a94e42f3c83263454bcadd (diff) | |
Merge branch 'java_11' into 'master'v1.2.5
Add Java 11 support
See merge request gitlab-org/security-products/license-management!26
Diffstat (limited to 'run.sh')
| -rwxr-xr-x | run.sh | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -153,11 +153,21 @@ case "$COMMAND" in if test -f pom.xml ; then # Install Java Maven dependencies. + if [[ ${LM_JAVA_VERSION} = "11" ]]; then + JAVA_HOME=/usr/lib/jvm/adoptopen_jdk11 + elif [[ ${LM_JAVA_VERSION} = "8" ]]; then + JAVA_HOME=/usr/lib/jvm/oracle_jdk8 + fi mvn install ${MAVEN_CLI_OPTS:--DskipTests} fi if test -f build.gradle ; then - gradle build + if [[ ${LM_JAVA_VERSION} = "11" ]]; then + JAVA_HOME=/usr/lib/jvm/adoptopen_jdk11 + elif [[ ${LM_JAVA_VERSION} = "8" ]]; then + JAVA_HOME=/usr/lib/jvm/oracle_jdk8 + fi + gradle build fi else echo "Running '${SETUP_CMD[@]}' to install project dependencies..." |