Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump okhttp-api from 4.10.0-125.v3593b_a_f8c97b_ to 4.10.0-127.vf711b_27a_f7fe in /bom-weekly #1851

Merged
merged 8 commits into from
Mar 18, 2023
Merged

Bump okhttp-api from 4.10.0-125.v3593b_a_f8c97b_ to 4.10.0-127.vf711b_27a_f7fe in /bom-weekly #1851

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5131dff
Bump okhttp-api in /bom-weekly
dependabot[bot] Mar 13, 2023
480fbef
Add org.jetbrains.annotations to sample plugin dep mgmt
MarkEWaite Mar 14, 2023
94d84c3
Can at least remove `kotlin-bom` now
jglick Mar 14, 2023
df80362
Better to use `exclusions` rather than pin a version
jglick Mar 14, 2023
bed3b15
Merge branch 'master' of https://github.com/jenkinsci/bom into depend…
jglick Mar 14, 2023
75a0e04
Merge branch 'master' into dependabot/maven/bom-weekly/io.jenkins.plu…
jglick Mar 14, 2023
62a8f37
Merge branch 'master' into dependabot/maven/bom-weekly/io.jenkins.plu…
MarkEWaite Mar 18, 2023
70d59fa
Merge branch 'master' into dependabot/maven/bom-weekly/io.jenkins.plu…
MarkEWaite Mar 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bom-weekly/pom.xml
View file
Open in desktop
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
View file
Open in desktop
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