diff --git a/bom/pom.xml b/bom/pom.xml
index 0dd26d4471bb42444dff583fd16d0c3946ea52ec..8619afabdd63acd544b95798b0ad1818b01abae1 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 f975bb344795dc6014763cbe6c9fea51a99e1bef..8c96314066b39b16bb91588a4412e487e0596eb9 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>