diff --git a/Dockerfile b/Dockerfile index a7a5131f9926..bd8b12f0caa9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN mvn clean install --batch-mode -Plight-test # The image is based on https://github.com/jenkinsci/docker/tree/java11 # All documentation is applicable -FROM jenkins/jenkins-experimental:2.127-jdk11 +FROM jenkins/jenkins-experimental:2.128-jdk11 LABEL Description="This is an experimental image for Jenkins on Java 11" diff --git a/core/pom.xml b/core/pom.xml index 5040cd0ea529..3df9f7f20be1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -41,7 +41,7 @@ THE SOFTWARE. true 1.254 2.5.6.SEC03 - 2.4.11 + 2.4.12 diff --git a/docker/jenkins2.sh b/docker/jenkins2.sh index 2fd04f8c130e..da4d53f6a3c9 100755 --- a/docker/jenkins2.sh +++ b/docker/jenkins2.sh @@ -1,21 +1,6 @@ #! /bin/bash -e # Additional wrapper, which adds custom environment options for the run (if needed) -# Lazy debug -extra_java_opts=() -if [[ "$DEBUG" ]] ; then - extra_java_opts+=( \ - '-Xdebug' \ - '-Xrunjdwp:server=y,transport=dt_socket,address=5005,suspend=y' \ - ) -fi - -if [ ${#extra_java_opts[@]} -eq 0 ]; then - if [ -n "$JAVA_OPTS" ] ; then - export JAVA_OPTS="$JAVA_OPTS ${extra_java_opts[@]}" - else - export JAVA_OPTS="${extra_java_opts[@]}" - fi -fi +# Just a placeholder so that we can quickly add extra options if needed exec /usr/local/bin/jenkins.sh "$@"