From 261077410b06fac60597fb5bec9ca813715d7c79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Mar 2023 18:34:48 +0000
Subject: [PATCH] Bump okhttp-api from 4.10.0-125.v3593b_a_f8c97b_ to
 4.10.0-127.vf711b_27a_f7fe in /bom-weekly (#1851)

* Bump okhttp-api in /bom-weekly

Bumps [okhttp-api](https://github.com/jenkinsci/okhttp-api-plugin) from 4.10.0-125.v3593b_a_f8c97b_ to 4.10.0-127.vf711b_27a_f7fe.
- [Release notes](https://github.com/jenkinsci/okhttp-api-plugin/releases)
- [Commits](https://github.com/jenkinsci/okhttp-api-plugin/commits)

---
updated-dependencies:
- dependency-name: io.jenkins.plugins:okhttp-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Add org.jetbrains.annotations to sample plugin dep mgmt

Needed for okhttp 4.10.0-127.vf711b_27a_f7fe

* Can at least remove `kotlin-bom` now

* Better to use `exclusions` rather than pin a version

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>
Co-authored-by: Jesse Glick <jglick@cloudbees.com>
---
 bom-weekly/pom.xml    |  2 +-
 sample-plugin/pom.xml | 34 +++++++++++++++++++++-------------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/bom-weekly/pom.xml b/bom-weekly/pom.xml
index a9e9d9345..95995a345 100644
--- a/bom-weekly/pom.xml
+++ b/bom-weekly/pom.xml
@@ -198,7 +198,7 @@
             <dependency>
                 <groupId>io.jenkins.plugins</groupId>
                 <artifactId>okhttp-api</artifactId>
-                <version>4.10.0-125.v3593b_a_f8c97b_</version>
+                <version>4.10.0-127.vf711b_27a_f7fe</version>
             </dependency>
             <dependency>
                 <groupId>io.jenkins.plugins</groupId>
diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml
index d9f37bb14..ef781981e 100644
--- a/sample-plugin/pom.xml
+++ b/sample-plugin/pom.xml
@@ -26,19 +26,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <!-- Require upper bound dependencies error from okhttp api plugin -->
-            <dependency>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-bom</artifactId>
-                <version>${kotlin.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.json</groupId>
-                <artifactId>json</artifactId>
-                <version>20230227</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -175,6 +162,13 @@
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>okhttp-api</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <!-- TODO conflict with configuration-as-code -->
+                <exclusion>
+                    <groupId>org.jetbrains</groupId>
+                    <artifactId>annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
@@ -321,6 +315,13 @@
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>jackson2-api</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <!-- TODO conflict with configuration-as-code and slack -->
+                <exclusion>
+                    <groupId>org.json</groupId>
+                    <artifactId>json</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
@@ -405,6 +406,13 @@
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>slack</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <!-- TODO conflict with configuration-as-code and jackson2-api -->
+                <exclusion>
+                    <groupId>org.json</groupId>
+                    <artifactId>json</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>