From 6bed76f21a599efa703a6b3417f44f14e5588091 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Thu, 20 Jan 2022 10:37:06 -0800
Subject: [PATCH] Ignore Enforcer warnings for annotation API

---
 .github/dependabot.yml           | 2 --
 build-monitor-acceptance/pom.xml | 7 +------
 build-monitor-plugin/pom.xml     | 6 ------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c1c70fcc4..59838985a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,8 +9,6 @@ updates:
     ignore:
       # This is the minimum Jenkins version
       - dependency-name: "org.jenkins-ci.main:cli"
-      # Provided by Jenkins core
-      - dependency-name: "javax.annotation:javax.annotation-api"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
diff --git a/build-monitor-acceptance/pom.xml b/build-monitor-acceptance/pom.xml
index d4074316b..a60d246ed 100644
--- a/build-monitor-acceptance/pom.xml
+++ b/build-monitor-acceptance/pom.xml
@@ -114,12 +114,6 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
-            <!-- manage dependencies to fix maven enforcer RequireUpperBoundDeps -->
-            <dependency>
-                <groupId>javax.annotation</groupId>
-                <artifactId>javax.annotation-api</artifactId>
-                <version>1.3.1</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -376,6 +370,7 @@
                                 <requireUpperBoundDeps>
                                     <excludes combine.children="append">
                                         <exclude>com.squareup.okhttp3:okhttp</exclude>
+                                        <exclude>javax.annotation:javax.annotation-api</exclude>
                                         <exclude>org.eclipse.jetty:jetty-client</exclude>
                                         <exclude>org.eclipse.jetty:jetty-http</exclude>
                                         <exclude>org.eclipse.jetty:jetty-io</exclude>
diff --git a/build-monitor-plugin/pom.xml b/build-monitor-plugin/pom.xml
index 575dfeda3..3d33c4ffd 100644
--- a/build-monitor-plugin/pom.xml
+++ b/build-monitor-plugin/pom.xml
@@ -122,12 +122,6 @@
             <artifactId>build-failure-analyzer</artifactId>
             <version>1.27.1</version>
             <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.annotation</groupId>
-                    <artifactId>javax.annotation-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>