Support using Jenkins core BOM available since Jenkins 2.195 #229

jtnord · 2019-08-13T17:30:34Z

oleg-nenashev

Would it make sense to put BOM into a profile with a useJenkinsBOM activator property (or whatever?). In such case we can define different behaviors for cases when BOM is defined or not so that we can apply change retrospectively to plugins which require Jenkins versions without Core BOM

jtnord · 2019-08-14T09:52:41Z

apply change retrospectively to plugins which require Jenkins versions without Core BOM

I was thinking of publishing some BOMs retrospectivly for some common versions like 2.138.1 etc)?

Both approaches are equally valid (but would like to keep things simple at the same time (the pom is getting a bit over grown and is in need of a prune in other areas (to be followed up later)).

Let's see if anyone else has any opinions on the way to go here. @jenkinsci/code-reviewers

markawm · 2019-08-23T14:46:17Z

Here's an example of using the BOM in a plugin (cloudbees-folder-plugin): https://github.com/markawm/cloudbees-folder-plugin/tree/use-jenkins-bom

jetersen · 2019-08-23T22:26:08Z

conflicts 😓

oleg-nenashev

It cannot be merged until there is a solution for Jenkins core versions which do not provide BOM (profiles?)... or until BOM is available for all LTS releases since 2.60.1.

jglick · 2019-08-27T12:42:25Z

Is there a way to make this opt-in somehow, like jenkinsci/bom is? The problem as I understand it is that dependency management from a parent overrides imported dependency management; so could the dependency management in the parent which is being deleted here be moved into a profile which is active by default but which you can suppress while also importing a BOM?

jglick

I suspect this is all doing too much and all we actually need to align is SLF4j, which may be an easier problem.

jglick · 2019-08-27T12:43:22Z

pom.xml

-      </dependency>
-
-      <!--
-      Recommended versions of Mockito and PowerMock for build with Java 11 (JENKINS-55098)


Why would these need to be aligned with versions used by Jenkins core? I would revert all this and let the plugin POM manage test frameworks independently.

jglick · 2019-08-27T12:43:51Z

pom.xml

@@ -143,21 +136,12 @@
        <artifactId>test-annotations</artifactId>
        <version>1.3</version>
      </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>


jglick · 2019-08-27T12:44:15Z

pom.xml

      <dependency> <!-- used in JTH and jenkins core > 2.x -->
        <groupId>javax.servlet</groupId>
        <artifactId>javax.servlet-api</artifactId>
        <version>3.1.0</version>
      </dependency>
-      <dependency>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-annotations</artifactId>


Is there any particular reason annotations need to be aligned in version with Jenkins core? I do not believe so. Recommend reverting.

oleg-nenashev · 2019-08-27T12:46:21Z

Yes. My expectation is to have profiles as well. Can be easily done via useBOM property. We can also hide https://github.com/jenkinsci/bom under the profile once there is a clear mapping for jenkins.version -> bom.version

…ent.

markawm · 2019-09-05T13:13:34Z

Updated now to add a no-jenkins-bom profile that captures the current/previous behaviour. Also a use-jenkins-bom profile that imports the BOM for when that is being used.
Either one or the other is activated according to the property use-jenkins-bom, and the default is to recreate the old behaviour by having no-jenkins-bom active.

markawm · 2019-09-05T15:12:39Z

Couple of draft PRs showing usage of this version with and without bom:
jenkinsci/cloudbees-folder-plugin#130 - example of latest plugin-pom with bom.
jenkinsci/cloudbees-folder-plugin#131 - example of latest plugin-pom without bom.

pom.xml

Co-Authored-By: Tim Jacomb <[email protected]>

pom.xml

markawm · 2019-10-07T10:56:26Z

Added some short info. to the README and referenced longer core bom usage information here.

markawm · 2019-10-10T08:58:51Z

@oleg-nenashev, @jglick: documentation for this is now merged (thanks); can we merge this? If not, what can I do to get it in the right shape?

markawm · 2019-10-14T09:20:17Z

@oleg-nenashev, I think I've addressed all the comments on this now; can we get it merged? Thanks.

EstherAF

lgtm

timja · 2019-10-20T10:02:09Z

Are we able to move ahead with this?
It's already documented on the website =/

https://jenkins.io/doc/developer/plugin-development/dependency-management/

jetersen

LGTM, one minor nit for documentation.

jetersen · 2019-10-20T11:10:15Z

README.md

+
+Since version 2.195, Jenkins provides a [Maven Bill Of Materials (BOM)](https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies)
+that centrally defines versions of various libraries used by Jenkins Core.
+The default behaviour of `plugin-pom` is to _not_ use the BOM, but when jenkins.version>=2.195 (and plugin-pom>=4.0) you can switch on Jenkins BOM support by setting the Maven property `use-jenkins-bom`.


nit: suggest to use .mvn/maven.config for adding -Duse-jenkins-bom

Agreed, its the preferred way and what the docs describe - was just keeping it brief here and referencing the docs for details.

oleg-nenashev

I am releasing the new Plugin POM now to clear a runway for this change.
Please cleanup the merge conflict so that we could cut a release this week or early next week

jetersen · 2019-10-22T19:12:17Z

Looking forward to!
🚢 📦 🚀

oleg-nenashev

Just 2 comments, but it is ready to go overall

pom.xml

oleg-nenashev · 2019-11-11T13:05:38Z

src/it/beta-just-testing/pom.xml

@@ -14,7 +14,7 @@
    <packaging>pom</packaging>
    <properties>
        <jenkins.version>2.7.3</jenkins.version>
-        <java.level>7</java.level>
+        <java.level>8</java.level>


Phasing out Java 7 is already confirmed in https://groups.google.com/forum/#!msg/jenkinsci-dev/SdMOMKs7XIQ/_XADhodoBQAJ , no need in extra approvals for it.

If the Jenkins Version in this test is bumped to 2.60.3, everything will be fine IMHO

Co-Authored-By: Oleg Nenashev <[email protected]>

timja

LGTM

oleg-nenashev · 2019-11-11T19:32:21Z

I plan to merge it tomorrow if no negative feedback

oleg-nenashev · 2019-11-13T17:05:05Z

Sorry for the squash merge, was not intended here

jglick · 2019-11-14T13:18:08Z

This seems to break all incrementalified plugins. Do not use 3.52.

jglick · 2019-11-14T14:04:45Z

pom.xml

+      <!--
+       The 'no-jenkins-bom' profile captures the properties & dependencies when _not_ using the Jenkins BOM:
+        https://github.com/jenkinsci/jenkins/blob/master/bom/pom.xml
+       When the BOM is not being used, this profile is adding back the <dependencyManagement/> entries that were


BTW use <dependencyManagement /> since otherwise MRP will make this change for you.

…ied plugins.

Use BOM from Jenkins

b4162d1

jtnord added the work-in-progress label Aug 13, 2019

oleg-nenashev reviewed Aug 14, 2019

View reviewed changes

markawm added 2 commits August 23, 2019 11:42

Remove dependencies duplicated from jenkins-bom.

8d67526

Moved some more entries from dependencyManagement to bom.

ab58921

oleg-nenashev requested changes Aug 23, 2019

View reviewed changes

jglick self-requested a review August 27, 2019 12:40

jglick reviewed Aug 27, 2019

View reviewed changes

markawm added 3 commits September 4, 2019 17:53

Created no-jenkins-bom profile to capture the 'old' dependencyManagem…

a680689

…ent.

Merge remote-tracking branch 'upstream/master' into jenkins-bom

d06e5fc

Add some missing dependencies when not using Jenkins BOM.

075612f

Reset jenkins.version to 2.190-SNAPSHOT.

10c9b53

This was referenced Sep 5, 2019

Example of using latest plugin-pom and Jenkins bom jenkinsci/cloudbees-folder-plugin#130

Closed

Example of using latest plugin-pom and no Jenkins bom jenkinsci/cloudbees-folder-plugin#131

Closed

timja reviewed Sep 6, 2019

View reviewed changes

pom.xml Outdated Show resolved Hide resolved

timja approved these changes Sep 6, 2019

View reviewed changes

Update pom.xml

9a3c3c9

Co-Authored-By: Tim Jacomb <[email protected]>

jtnord removed the work-in-progress label Sep 6, 2019

jglick reviewed Sep 9, 2019

View reviewed changes

pom.xml Show resolved Hide resolved

jglick mentioned this pull request Sep 10, 2019

Use "provided" scope for slf4j-api dependency (instead of compile) #226

Merged

markawm added 3 commits September 16, 2019 12:15

Merge remote-tracking branch 'upstream/master' into jenkins-bom

fe3c303

Use jenkins.version 2.195 now that it includes the BOM.

0745473

java.level=8 for compatibility with [email protected]

831e48f

oleg-nenashev mentioned this pull request Oct 6, 2019

Update Jenkins Core to 2.195+ and use BOM to define core dependencies jenkinsci/jenkinsfile-runner#174

Closed

markawm mentioned this pull request Oct 7, 2019

Add Jenkins BOM usage information to plugin development. jenkins-infra/jenkins.io#2547

Merged

Add some Core BOM info & links to README.

4c7f1ca

oleg-nenashev self-requested a review October 15, 2019 17:25

EstherAF approved these changes Oct 16, 2019

View reviewed changes

jetersen approved these changes Oct 20, 2019

View reviewed changes

oleg-nenashev requested changes Oct 22, 2019

View reviewed changes

Merge remote-tracking branch 'upstream/master' into jenkins-bom

1779729

oleg-nenashev approved these changes Nov 11, 2019

View reviewed changes

markawm and others added 2 commits November 11, 2019 13:35

Update pom.xml

9eb4da9

Co-Authored-By: Oleg Nenashev <[email protected]>

Match test jenkins.version to java.level.

815abe8

markawm mentioned this pull request Nov 11, 2019

Correct min plugin-pom version for use-jenkins-bom profile jenkins-infra/jenkins.io#2634

Merged

timja approved these changes Nov 11, 2019

View reviewed changes

oleg-nenashev merged commit fcedbce into jenkinsci:master Nov 13, 2019

oleg-nenashev added the enhancement label Nov 13, 2019

oleg-nenashev changed the title ~~Use BOM from Jenkins~~ Support using Jenkins core BOM available since Jenkins 2.195 Nov 13, 2019

basil mentioned this pull request Nov 13, 2019

Update plugin parent POM to latest version jenkinsci/throttle-concurrent-builds-plugin#62

Merged

jglick reviewed Nov 14, 2019

View reviewed changes

jglick added a commit to jglick/plugin-pom that referenced this pull request Nov 14, 2019

Reverting jenkinsci#229 (Jenkins core BOM) as it breaks incrementalif…

47fac61

…ied plugins.

jglick mentioned this pull request Nov 14, 2019

Revert the BOM support from 3.52 to fix incremental plugin builds + Add integration tests for Incrementals #252

Merged

oleg-nenashev mentioned this pull request Nov 22, 2019

Add phase to animal-sniffer to fix mvn test #258

Merged

jtnord deleted the jenkins-bom branch November 22, 2019 17:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support using Jenkins core BOM available since Jenkins 2.195 #229

Support using Jenkins core BOM available since Jenkins 2.195 #229

jtnord commented Aug 13, 2019

oleg-nenashev left a comment •

edited

Loading

jtnord commented Aug 14, 2019

markawm commented Aug 23, 2019

jetersen commented Aug 23, 2019

oleg-nenashev left a comment

jglick commented Aug 27, 2019

jglick left a comment

jglick Aug 27, 2019

jglick Aug 27, 2019

jglick Aug 27, 2019

oleg-nenashev commented Aug 27, 2019

markawm commented Sep 5, 2019

markawm commented Sep 5, 2019

markawm commented Oct 7, 2019

markawm commented Oct 10, 2019

markawm commented Oct 14, 2019

EstherAF left a comment

timja commented Oct 20, 2019

jetersen left a comment

jetersen Oct 20, 2019

markawm Oct 21, 2019

oleg-nenashev left a comment

jetersen commented Oct 22, 2019

oleg-nenashev left a comment

oleg-nenashev Nov 11, 2019

timja left a comment

oleg-nenashev commented Nov 11, 2019

oleg-nenashev commented Nov 13, 2019

jglick commented Nov 14, 2019

jglick Nov 14, 2019

Support using Jenkins core BOM available since Jenkins 2.195 #229

Support using Jenkins core BOM available since Jenkins 2.195 #229

Conversation

jtnord commented Aug 13, 2019

oleg-nenashev left a comment • edited Loading

Choose a reason for hiding this comment

jtnord commented Aug 14, 2019

markawm commented Aug 23, 2019

jetersen commented Aug 23, 2019

oleg-nenashev left a comment

Choose a reason for hiding this comment

jglick commented Aug 27, 2019

jglick left a comment

Choose a reason for hiding this comment

jglick Aug 27, 2019

Choose a reason for hiding this comment

jglick Aug 27, 2019

Choose a reason for hiding this comment

jglick Aug 27, 2019

Choose a reason for hiding this comment

oleg-nenashev commented Aug 27, 2019

markawm commented Sep 5, 2019

markawm commented Sep 5, 2019

markawm commented Oct 7, 2019

markawm commented Oct 10, 2019

markawm commented Oct 14, 2019

EstherAF left a comment

Choose a reason for hiding this comment

timja commented Oct 20, 2019

jetersen left a comment

Choose a reason for hiding this comment

jetersen Oct 20, 2019

Choose a reason for hiding this comment

markawm Oct 21, 2019

Choose a reason for hiding this comment

oleg-nenashev left a comment

Choose a reason for hiding this comment

jetersen commented Oct 22, 2019

oleg-nenashev left a comment

Choose a reason for hiding this comment

oleg-nenashev Nov 11, 2019

Choose a reason for hiding this comment

timja left a comment

Choose a reason for hiding this comment

oleg-nenashev commented Nov 11, 2019

oleg-nenashev commented Nov 13, 2019

jglick commented Nov 14, 2019

jglick Nov 14, 2019

Choose a reason for hiding this comment

oleg-nenashev left a comment •

edited

Loading