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 | |
| 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
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | Dockerfile | 7 | ||||
| -rwxr-xr-x | run.sh | 12 |
3 files changed, 22 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ca0b8a..90ad9e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # GitLab License management changelog +## v1.2.5 + +- Feature: support Java 11 via an ENV variable (@haynes !26) + ## v1.2.4 - Fix: support multiple MAVEN_CLI_OPTS options (@haynes !27) @@ -6,6 +6,13 @@ MAINTAINER GitLab ARG LICENSE_FINDER_VERSION ENV LICENSE_FINDER_VERSION $LICENSE_FINDER_VERSION +# Install JDK 11 +RUN cd /tmp && \ + wget --quiet --no-cookies --no-check-certificate https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz -O jdk-11.tgz && \ + tar xf /tmp/jdk-11.tgz && \ + mv jdk-11.0.2+9 /usr/lib/jvm/adoptopen_jdk11 && \ + rm /tmp/jdk-11.tgz + RUN npm install npm-install-peers cheerio # Don't let Rubygem fail with the numerous projects using PG or MySQL, install realpath @@ -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..." |