From 809d627477d70eb660aca687256009af00143a1e Mon Sep 17 00:00:00 2001
From: Sam Van Oort <samvanoort@gmail.com>
Date: Mon, 18 Jun 2018 16:26:50 -0400
Subject: [PATCH 1/2] Bump groovy one version to potentially pick up module
 support

---
 core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.
     <staplerFork>true</staplerFork>
     <stapler.version>1.254</stapler.version>
     <spring.version>2.5.6.SEC03</spring.version>
-    <groovy.version>2.4.11</groovy.version>
+    <groovy.version>2.4.12</groovy.version>
   </properties>
 
   <dependencies>

From a52eb36534aa2ff423e8c746c633dbaf460525f6 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Tue, 19 Jun 2018 13:19:07 +0200
Subject: [PATCH 2/2] [JENKINS-52028] - Update Docker image baseline to 2.128
 to pick Incrementals support

---
 Dockerfile         |  2 +-
 docker/jenkins2.sh | 17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f8c7276c3ab4..a310cc8783ad 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/java10
 # All documentation is applicable
-FROM jenkins/jenkins-experimental:2.127-jdk10
+FROM jenkins/jenkins-experimental:2.128-jdk10
 
 LABEL Description="This is an experimental image for Jenkins on Java 10"
 
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 "$@"