diff options
| author | mo khan <mo.khan@gmail.com> | 2020-01-11 00:41:53 +0000 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-01-11 00:41:53 +0000 |
| commit | e8ee4b029b6b76a40d54a28f4db4d9632b12c7e8 (patch) | |
| tree | 2d911959230ed19958f678623c422deba7297353 | |
| parent | a073269a16c744916982c64c4c1dee3f3a502895 (diff) | |
| parent | 3acac4b5fa71321eb5b35afa8bda8d3cf7f096ed (diff) | |
Merge branch 'plafoucriere-master-patch-45126' into 'master'
DRY java version code
See merge request gitlab-org/security-products/license-management!71
| -rwxr-xr-x | run.sh | 16 |
1 files changed, 6 insertions, 10 deletions
@@ -161,23 +161,19 @@ case "$COMMAND" in fi fi + 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 + 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} skip_prepare=true fi if test -f build.gradle ; then - 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 ${GRADLE_CLI_OPTS:-x test} skip_prepare=true fi |