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 2 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
5 changes: 5 additions & 0 deletions sample-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
<artifactId>json</artifactId>
<version>20230227</version>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jtnord @MarkEWaite I thought the point of this update was to remove all of these overrides?

Copy link
Member

@jtnord jtnord Mar 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the kotlin override above (line 30) should now be removed - alas the annotation is real conflict as it is bundled in multiple (two) plugins (config as code and okhttp) and at a lower version on config-as-code.

Given the dependencies are listed alphabetically maven sees the dependency from c-as-c first and then gives you the lower bound.

I had thought about introducing a kotlin dependency - but a quick look seemed to show only okhttp requiring it, and introducing it just for a class retention annotation seemed like overkill.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jenkinsci/okhttp-api-plugin#142. Yet when they are removed:

[ERROR] Failed to execute goal org.apache.maven.plugins:maven-enforcer-plugin:3.2.1:enforce (display-info) on project sample: 
[ERROR] Rule 5: org.apache.maven.enforcer.rules.dependency.RequireUpperBoundDeps failed with message:
[ERROR] Failed while enforcing RequireUpperBoundDeps. The error(s) are [
[ERROR] Require upper bound dependencies error for org.jetbrains:annotations:13.0 [test] paths to dependency are:
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-io.jenkins.plugins:okhttp-api:4.10.0-127.vf711b_27a_f7fe [test]
[ERROR]     +-org.jetbrains:annotations:13.0 [test]
[ERROR] and
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-io.jenkins.plugins:okhttp-api:4.10.0-127.vf711b_27a_f7fe [test]
[ERROR]     +-org.jetbrains.kotlin:kotlin-stdlib:1.8.10 [test]
[ERROR]       +-org.jetbrains:annotations:13.0 [test]
[ERROR] and
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-io.jenkins.configuration-as-code:test-harness:1569.vb_72405b_80249 [test]
[ERROR]     +-com.vladsch.flexmark:flexmark-all:0.62.2 [test]
[ERROR]       +-com.vladsch.flexmark:flexmark-util-ast:0.62.2 [test]
[ERROR]         +-org.jetbrains:annotations:15.0 [test]
[ERROR] and
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-io.jenkins.configuration-as-code:test-harness:1569.vb_72405b_80249 [test]
[ERROR]     +-com.vladsch.flexmark:flexmark-all:0.62.2 [test]
[ERROR]       +-com.vladsch.flexmark:flexmark-util-builder:0.62.2 [test]
[ERROR]         +-org.jetbrains:annotations:15.0 [test]
[ERROR] and
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-io.jenkins.configuration-as-code:test-harness:1569.vb_72405b_80249 [test]
[ERROR]     +-com.vladsch.flexmark:flexmark-all:0.62.2 [test]
[ERROR]       +-com.vladsch.flexmark:flexmark-util-collection:0.62.2 [test]
[ERROR]         +-org.jetbrains:annotations:15.0 [test]
[ERROR] and
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-io.jenkins.configuration-as-code:test-harness:1569.vb_72405b_80249 [test]
[ERROR]     +-com.vladsch.flexmark:flexmark-all:0.62.2 [test]
[ERROR]       +-com.vladsch.flexmark:flexmark-util-data:0.62.2 [test]
[ERROR]         +-org.jetbrains:annotations:15.0 [test]
[ERROR] and
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-io.jenkins.configuration-as-code:test-harness:1569.vb_72405b_80249 [test]
[ERROR]     +-com.vladsch.flexmark:flexmark-all:0.62.2 [test]
[ERROR]       +-com.vladsch.flexmark:flexmark-util-dependency:0.62.2 [test]
[ERROR]         +-org.jetbrains:annotations:15.0 [test]
[ERROR] and
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-io.jenkins.configuration-as-code:test-harness:1569.vb_72405b_80249 [test]
[ERROR]     +-com.vladsch.flexmark:flexmark-all:0.62.2 [test]
[ERROR]       +-com.vladsch.flexmark:flexmark-util-format:0.62.2 [test]
[ERROR]         +-org.jetbrains:annotations:15.0 [test]
[ERROR] and
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-io.jenkins.configuration-as-code:test-harness:1569.vb_72405b_80249 [test]
[ERROR]     +-com.vladsch.flexmark:flexmark-all:0.62.2 [test]
[ERROR]       +-com.vladsch.flexmark:flexmark-util-html:0.62.2 [test]
[ERROR]         +-org.jetbrains:annotations:15.0 [test]
[ERROR] and
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-io.jenkins.configuration-as-code:test-harness:1569.vb_72405b_80249 [test]
[ERROR]     +-com.vladsch.flexmark:flexmark-all:0.62.2 [test]
[ERROR]       +-com.vladsch.flexmark:flexmark-util-misc:0.62.2 [test]
[ERROR]         +-org.jetbrains:annotations:15.0 [test]
[ERROR] and
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-io.jenkins.configuration-as-code:test-harness:1569.vb_72405b_80249 [test]
[ERROR]     +-com.vladsch.flexmark:flexmark-all:0.62.2 [test]
[ERROR]       +-com.vladsch.flexmark:flexmark-util-options:0.62.2 [test]
[ERROR]         +-org.jetbrains:annotations:15.0 [test]
[ERROR] and
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-io.jenkins.configuration-as-code:test-harness:1569.vb_72405b_80249 [test]
[ERROR]     +-com.vladsch.flexmark:flexmark-all:0.62.2 [test]
[ERROR]       +-com.vladsch.flexmark:flexmark-util-sequence:0.62.2 [test]
[ERROR]         +-org.jetbrains:annotations:15.0 [test]
[ERROR] and
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-io.jenkins.configuration-as-code:test-harness:1569.vb_72405b_80249 [test]
[ERROR]     +-com.vladsch.flexmark:flexmark-all:0.62.2 [test]
[ERROR]       +-com.vladsch.flexmark:flexmark-util-visitor:0.62.2 [test]
[ERROR]         +-org.jetbrains:annotations:15.0 [test]
[ERROR] and
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-io.jenkins.configuration-as-code:test-harness:1569.vb_72405b_80249 [test]
[ERROR]     +-com.vladsch.flexmark:flexmark-all:0.62.2 [test]
[ERROR]       +-com.vladsch.flexmark:flexmark-ext-abbreviation:0.62.2 [test]
[ERROR]         +-com.vladsch.flexmark:flexmark-util:0.62.2 [test]
[ERROR]           +-org.jetbrains:annotations:15.0 [test]
[ERROR] , 
[ERROR] Require upper bound dependencies error for org.json:json:20220320 [test] paths to dependency are:
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-io.jenkins:configuration-as-code:1569.vb_72405b_80249 [test]
[ERROR]     +-org.json:json:20220320 [test]
[ERROR] and
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-org.jenkins-ci.plugins:slack:629.vf00ea_cb_40d53 [test]
[ERROR]     +-org.json:json:20220924 [test]
[ERROR] and
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-io.jenkins.configuration-as-code:test-harness:1569.vb_72405b_80249 [test]
[ERROR]     +-com.github.erosb:everit-json-schema:1.14.1 [test]
[ERROR]       +-org.json:json:20220320 [test]
[ERROR] and
[ERROR] +-io.jenkins.tools.bom:sample:999999-SNAPSHOT
[ERROR]   +-org.jenkins-ci.plugins:jackson2-api:2.14.2-319.v37853346a_229 [test]
[ERROR]     +-com.fasterxml.jackson.datatype:jackson-datatype-json-org:2.14.2 [test]
[ERROR]       +-org.json:json:20190722 [test]
[ERROR] ]

org.jetbrains:annotations should I guess be excluded as a dep from both okhttp-api and configuration-as-code. org.json:json seems like an actual conflict (missing library plugin) between configuration-as-code, slack, and jackson2-api.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should I guess be excluded as a dep from ... configuration-as-code

Last time I did that it broke config as code as it could no longer tell what was optional vs required by reading the various nullability annotations.

Granted this appears to be the test harness and flexmark which is just a markdown parser....

As it was an older version of an annotation I was concerned that the annotation could have changed in an incompatible way that would somehow break classloading. (I know it is fine if missing - unless the annotation has RUNTIME retention - but was not sure if the annotation was present yet incompatible how things would fall out)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well the annotation dep could certainly be excluded from okhttp-api, right?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what could possibly go wrong right :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jenkinsci/okhttp-api-plugin#144

<version>15.0</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
Expand Down