diff --git a/pom.xml b/pom.xml
index bb26b5645b..a417cc6844 100644
--- a/pom.xml
+++ b/pom.xml
@@ -306,7 +306,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.0.0-M3</version> <!-- TODO 3.0.0 when released -->
+          <version>3.0.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-install-plugin</artifactId>
@@ -537,8 +537,11 @@
                 </bannedDependencies>
                 <requireUpperBoundDeps>
                   <excludes>
+                    <exclude>javax.servlet:javax.servlet-api</exclude>
+                    <exclude>javax.servlet:servlet-api</exclude>
                     <exclude>com.google.guava:guava</exclude> <!-- TODO needed for Jenkins 2.71 and earlier -->
                     <exclude>commons-logging:commons-logging</exclude> <!-- ditto -->
+                    <exclude>com.google.code.findbugs:annotations</exclude>
                     <exclude>com.google.code.findbugs:jsr305</exclude> <!-- ditto -->
                     <exclude>net.java.dev.jna:jna</exclude> <!-- needed for Jenkins 1.585 and earlier -->
                   </excludes>
@@ -572,7 +575,7 @@
           <dependency>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.3</version>
+            <version>1.4</version>
           </dependency>
         </dependencies>
       </plugin>