diff --git a/pom.xml b/pom.xml
index 3a7271759..b5f3df6ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.90</version>
+    <version>1.91</version>
     <relativePath />
   </parent>
 
@@ -63,7 +63,6 @@ THE SOFTWARE.
     <gitHubRepo>jenkinsci/${project.artifactId}</gitHubRepo>
     <build.type>private</build.type>
     <spotbugs.effort>Max</spotbugs.effort>
-    <spotbugs.excludeFilterFile>${basedir}/src/spotbugs/excludeFilter.xml</spotbugs.excludeFilterFile>
     <spotbugs.threshold>Low</spotbugs.threshold>
     <bc-version>1.72</bc-version>
   </properties>
@@ -156,8 +155,7 @@ THE SOFTWARE.
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <version>2.2</version>
+      <artifactId>hamcrest-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/src/spotbugs/excludeFilter.xml b/src/spotbugs/excludesFilter.xml
similarity index 62%
rename from src/spotbugs/excludeFilter.xml
rename to src/spotbugs/excludesFilter.xml
index dea04f300..e82b3a60c 100644
--- a/src/spotbugs/excludeFilter.xml
+++ b/src/spotbugs/excludesFilter.xml
@@ -36,66 +36,6 @@
   <Match>
     <Confidence value="2"/>
     <Or>
-      <And>
-        <Bug pattern="EI_EXPOSE_REP"/>
-        <Or>
-          <Class name="hudson.remoting.Channel"/>
-          <Class name="hudson.remoting.ChannelBuilder"/>
-          <Class name="hudson.remoting.ClassLoaderHolder"/>
-          <Class name="hudson.remoting.Command"/>
-          <Class name="hudson.remoting.DiagnosedStreamCorruptionException"/>
-          <Class name="hudson.remoting.Pipe"/>
-          <Class name="hudson.remoting.Response"/>
-          <Class name="org.jenkinsci.remoting.ChannelStateException"/>
-          <Class name="org.jenkinsci.remoting.engine.Jnlp4ConnectionState"/>
-          <Class name="org.jenkinsci.remoting.engine.JnlpAgentEndpoint"/>
-          <Class name="org.jenkinsci.remoting.engine.JnlpConnectionState"/>
-          <Class name="org.jenkinsci.remoting.nio.FifoBuffer"/>
-          <Class name="org.jenkinsci.remoting.protocol.impl.ChannelApplicationLayer"/>
-          <Class name="org.jenkinsci.remoting.protocol.NetworkLayer"/>
-          <Class name="org.jenkinsci.remoting.protocol.ProtocolStack$Ptr"/>
-        </Or>
-      </And>
-      <And>
-        <Bug pattern="EI_EXPOSE_REP2"/>
-        <Or>
-          <Class name="hudson.remoting.AbstractByteArrayCommandTransport"/>
-          <Class name="hudson.remoting.AbstractByteBufferCommandTransport"/>
-          <Class name="hudson.remoting.AsyncFutureImpl"/>
-          <Class name="hudson.remoting.Channel"/>
-          <Class name="hudson.remoting.ChannelBuilder"/>
-          <Class name="hudson.remoting.ClassLoaderHolder"/>
-          <Class name="hudson.remoting.Engine"/>
-          <Class name="hudson.remoting.ObjectInputStreamEx"/>
-          <Class name="hudson.remoting.PingThread"/>
-          <Class name="hudson.remoting.RemoteOutputStream"/>
-          <Class name="hudson.remoting.RemoteWriter"/>
-          <Class name="hudson.remoting.SocketInputStream"/>
-          <Class name="hudson.remoting.SocketOutputStream"/>
-          <Class name="hudson.remoting.StandardOutputStream"/>
-          <Class name="hudson.remoting.SynchronousCommandTransport"/>
-          <Class name="hudson.remoting.TeeOutputStream"/>
-          <Class name="org.jenkinsci.remoting.engine.JnlpAgentEndpointConfigurator"/>
-          <Class name="org.jenkinsci.remoting.engine.JnlpConnectionState"/>
-          <Class name="org.jenkinsci.remoting.engine.JnlpProtocol4Handler"/>
-          <Class name="org.jenkinsci.remoting.engine.JnlpProtocolHandlerFactory"/>
-          <Class name="org.jenkinsci.remoting.protocol.ApplicationLayer"/>
-          <Class name="org.jenkinsci.remoting.protocol.FilterLayer"/>
-          <Class name="org.jenkinsci.remoting.protocol.impl.BIONetworkLayer"/>
-          <Class name="org.jenkinsci.remoting.protocol.impl.NIONetworkLayer"/>
-          <Class name="org.jenkinsci.remoting.protocol.impl.SSLEngineFilterLayer"/>
-          <Class name="org.jenkinsci.remoting.protocol.NetworkLayer"/>
-          <Class name="org.jenkinsci.remoting.util.ByteBufferQueueInputStream"/>
-          <Class name="org.jenkinsci.remoting.util.ByteBufferQueueOutputStream"/>
-          <Class name="org.jenkinsci.remoting.util.FastByteBufferQueueInputStream"/>
-          <Class name="org.jenkinsci.remoting.util.LoggingChannelListener"/>
-          <Class name="org.jenkinsci.remoting.util.SettableFuture"/>
-        </Or>
-      </And>
-      <And>
-        <Bug pattern="MS_EXPOSE_REP"/>
-        <Class name="org.jenkinsci.remoting.engine.WorkDirManager"/>
-      </And>
       <And>
         <Bug pattern="NP_NONNULL_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
         <Class name="hudson.remoting.ClassFilter"/>