Skip to content

Commit

Permalink
Bump okhttp-api from 4.10.0-125.v3593b_a_f8c97b_ to 4.10.0-127.vf711b…
Browse files Browse the repository at this point in the history
…_27a_f7fe in /bom-weekly (jenkinsci#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] <[email protected]>

* 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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mark Waite <[email protected]>
Co-authored-by: Jesse Glick <[email protected]>
  • Loading branch information
3 people authored and lemeurherve committed Mar 31, 2023
1 parent 451f2b5 commit 2610774
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 14 deletions.
2 changes: 1 addition & 1 deletion bom-weekly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
34 changes: 21 additions & 13 deletions sample-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 2610774

Please sign in to comment.