From 17c8116f1535ea408f144cb6613f69bd8de953ae Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Wed, 4 Nov 2020 09:55:47 +0100
Subject: [PATCH] [JENKINS-64037] - Remove obsolete support for live class
 reloading with JRebel (#5040)

* [JENKINS-64037] - Remove obsolete support for live class reloading with JRebel

* [JENKINS-64037] - Add explicit dependency on Stapler which used o come from JRebel
---
 bom/pom.xml  |  4 ++--
 core/pom.xml | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 0dd26d4471..8619afabdd 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -351,12 +351,12 @@ THE SOFTWARE.
       <!--Stapler-->
       <dependency>
         <groupId>org.kohsuke.stapler</groupId>
-        <artifactId>stapler-groovy</artifactId>
+        <artifactId>stapler</artifactId>
         <version>${stapler.version}</version>
       </dependency>
       <dependency>
         <groupId>org.kohsuke.stapler</groupId>
-        <artifactId>stapler-jrebel</artifactId>
+        <artifactId>stapler-groovy</artifactId>
         <version>${stapler.version}</version>
       </dependency>
       <dependency>
diff --git a/core/pom.xml b/core/pom.xml
index f975bb3447..8c96314066 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -122,6 +122,16 @@ THE SOFTWARE.
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-posix</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.kohsuke.stapler</groupId>
+      <artifactId>stapler</artifactId>
+      <exclusions>
+        <exclusion> <!-- pick up from SpotBugs Annotations -->
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>jsr305</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler-groovy</artifactId>
@@ -145,10 +155,6 @@ THE SOFTWARE.
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.kohsuke.stapler</groupId>
-      <artifactId>stapler-jrebel</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.kohsuke</groupId>
       <artifactId>windows-package-checker</artifactId>
@@ -587,7 +593,7 @@ THE SOFTWARE.
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <exclusions>
-        <exclusion> <!-- pick up from Stapler -->
+        <exclusion> <!-- pick up from SpotBugs Annotations -->
           <groupId>com.google.code.findbugs</groupId>
           <artifactId>jsr305</artifactId>
         </exclusion>
-- 
GitLab