From 3aa95fe179cb5534806b05d2f41947791a78b928 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Nov 2022 22:41:59 +0000
Subject: [PATCH] Bump jenkins from 1.90 to 1.91 (#415)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Basil Crow <me@basilcrow.com>
---
 .../org/kohsuke/stapler/HttpResponses.java    |  2 -
 pom.xml                                       |  8 +---
 ...otbugs-excludes.xml => excludesFilter.xml} | 38 -------------------
 3 files changed, 1 insertion(+), 47 deletions(-)
 rename src/spotbugs/{spotbugs-excludes.xml => excludesFilter.xml} (54%)

diff --git a/core/src/main/java/org/kohsuke/stapler/HttpResponses.java b/core/src/main/java/org/kohsuke/stapler/HttpResponses.java
index 92da804a3c..cbb7af8a2e 100644
--- a/core/src/main/java/org/kohsuke/stapler/HttpResponses.java
+++ b/core/src/main/java/org/kohsuke/stapler/HttpResponses.java
@@ -24,7 +24,6 @@
 package org.kohsuke.stapler;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -185,7 +184,6 @@ public static HttpResponseException redirectToContextRoot() {
     /**
      * Redirects the user back to where he came from.
      */
-    @SuppressFBWarnings(value = "MS_EXPOSE_REP", justification = "TODO needs triage")
     public static HttpResponseException forwardToPreviousPage() {
         return FORWARD_TO_PREVIOUS_PAGE;
     }
diff --git a/pom.xml b/pom.xml
index 99689ed07d..427f2b3781 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.90</version>
+    <version>1.91</version>
     <relativePath />
   </parent>
   <groupId>org.kohsuke.stapler</groupId>
@@ -44,7 +44,6 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <scmTag>HEAD</scmTag>
-    <spotbugs.excludeFilterFile>${project.basedir}/../src/spotbugs/spotbugs-excludes.xml</spotbugs.excludeFilterFile>
     <jetty.version>10.0.12</jetty.version>
     <gitHubRepo>jenkinsci/stapler</gitHubRepo>
   </properties>
@@ -71,11 +70,6 @@
         <artifactId>jetty-webapp</artifactId>
         <version>${jetty.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-core</artifactId>
-        <version>2.2</version>
-      </dependency>
       <dependency>
         <groupId>org.jenkins-ci.main</groupId>
         <artifactId>jenkins-test-harness-htmlunit</artifactId>
diff --git a/src/spotbugs/spotbugs-excludes.xml b/src/spotbugs/excludesFilter.xml
similarity index 54%
rename from src/spotbugs/spotbugs-excludes.xml
rename to src/spotbugs/excludesFilter.xml
index 3662ee1960..a7ddf72c81 100644
--- a/src/spotbugs/spotbugs-excludes.xml
+++ b/src/spotbugs/excludesFilter.xml
@@ -22,44 +22,6 @@
   <Match>
     <Confidence value="2"/>
     <Or>
-      <And>
-        <Bug pattern="EI_EXPOSE_REP"/>
-        <Or>
-          <Class name="org.kohsuke.stapler.compression.CompressionServletResponse"/>
-          <Class name="org.kohsuke.stapler.framework.AbstractWebAppMain"/>
-          <Class name="org.kohsuke.stapler.jelly.groovy.GroovyClosureScript"/>
-          <Class name="org.kohsuke.stapler.jelly.groovy.GroovyFacet"/>
-          <Class name="org.kohsuke.stapler.jelly.groovy.GroovyServerPageScript"/>
-          <Class name="org.kohsuke.stapler.jelly.groovy.JellyBuilder"/>
-          <Class name="org.kohsuke.stapler.jelly.JellyFacet"/>
-          <Class name="org.kohsuke.stapler.MetaClass"/>
-          <Class name="org.kohsuke.stapler.RequestImpl"/>
-          <Class name="org.kohsuke.stapler.ResponseImpl"/>
-          <Class name="org.kohsuke.stapler.Stapler"/>
-          <Class name="org.kohsuke.stapler.StaplerResponseWrapper"/>
-          <Class name="org.kohsuke.stapler.WebApp"/>
-        </Or>
-      </And>
-      <And>
-        <Bug pattern="EI_EXPOSE_REP2"/>
-        <Or>
-          <Class name="org.kohsuke.stapler.compression.FilterServletOutputStream"/>
-          <Class name="org.kohsuke.stapler.export.SchemaGenerator"/>
-          <Class name="org.kohsuke.stapler.framework.adjunct.AdjunctManager"/>
-          <Class name="org.kohsuke.stapler.framework.io.WriterOutputStream"/>
-          <Class name="org.kohsuke.stapler.interceptor.JsonOutputFilter$FilterPropertyFilter"/>
-          <Class name="org.kohsuke.stapler.jelly.CustomTagLibrary"/>
-          <Class name="org.kohsuke.stapler.jelly.FindAncestorTag"/>
-          <Class name="org.kohsuke.stapler.jelly.groovy.GroovyClassLoaderTearOff"/>
-          <Class name="org.kohsuke.stapler.jelly.groovy.GroovyClosureScript"/>
-          <Class name="org.kohsuke.stapler.jelly.groovy.JellyBuilder"/>
-          <Class name="org.kohsuke.stapler.jelly.JellyClassLoaderTearOff"/>
-          <Class name="org.kohsuke.stapler.json.JsonHttpResponse"/>
-          <Class name="org.kohsuke.stapler.ResponseImpl"/>
-          <Class name="org.kohsuke.stapler.StaplerResponseWrapper"/>
-          <Class name="org.kohsuke.stapler.WebApp"/>
-        </Or>
-      </And>
       <And>
         <Bug pattern="SSD_DO_NOT_USE_INSTANCE_LOCK_ON_SHARED_STATIC_DATA"/>
         <Class name="org.kohsuke.stapler.EvaluationTrace$ApplicationTracer"/>