Set MAVEN_NASHORN env

ron190 · May 24, 2020 · d11a1dd · d11a1dd
1 parent e8dc28c
commit d11a1dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,11 +12,11 @@ jobs:
     - JSQL_DOCKERFILE=3.6.3-jdk-8-slim
 
   - env:
-    - MAVEN_NASHORN="-Dnashorn.args=--no-deprecation-warning"
+    - MAVEN_NASHORN=-Dnashorn.args=--no-deprecation-warning
     - JSQL_DOCKERFILE=3.6.3-jdk-11-slim
 
   - env:
-    - MAVEN_NASHORN="-Dnashorn.args=--no-deprecation-warning"
+    - MAVEN_NASHORN=-Dnashorn.args=--no-deprecation-warning
     - JSQL_DOCKERFILE=3.6.3-openjdk-14-slim
 
 branches:

diff --git a/model/src/test/resources/docker/Dockerfile.jsql b/model/src/test/resources/docker/Dockerfile.jsql
@@ -7,6 +7,8 @@ COPY ./ ./
 # ENV SONARQUBE_SCANNER_PARAMS '{ "sonar.branch.name" : "master-docker", "sonar.organization" : "ron190-github", "sonar.host.url" : "https://sonarcloud.io", "sonar.login" : "" }'
 # ENV SONAR_TOKEN ${SONAR_TOKEN}
 
+ENV MAVEN_NASHORN ${MAVEN_NASHORN}
+
 # Ignore repositories errors
 RUN apt-get update -y || true
 

diff --git a/model/src/test/resources/vnc/execute-on-vnc.sh b/model/src/test/resources/vnc/execute-on-vnc.sh
@@ -29,6 +29,8 @@ OLD_DISPLAY=${DISPLAY}
 vncserver ":${NEW_DISPLAY}" -localhost -geometry 1920x1080 -depth 24 
 export DISPLAY=:${NEW_DISPLAY}
 
+echo MAVEN_NASHORN=${MAVEN_NASHORN}
+
 "$@"
 
 export DISPLAY=${OLD_DISPLAY}