[JENKINS-60474] streamline the pom and support the jenkins-bom #269

jtnord · 2019-12-16T23:58:52Z

JENKINS-60474 Streamlines the plugin pom by removing support for some older settings as per https://groups.google.com/d/topic/jenkinsci-dev/tm3F_vgK5vA/discussion

I did not remove the frontend parts for now - I have kicked that can down the road. but there are some other areas that have been streamlined.

downstream PRs

changelog suggestions

[internal] always run the integration tests in this module
libraries that are shipped with jenkins-core now have their dependency version unconditionally managed from the jenkins-bom. With this change the libaries used will be correct for a given jenkins.version however this requires a version of Jenkins that was published with the bom (2.195 or higher), or has been explicitly published (see here for a list of supported versions. The jenkins-bom and no-jenkins-bom profiles have been removed
findbugs properties have been removed, use the equivalent spotbugs property
support for compiling plugins with java < 7 has been removed. currently the only supported java.level is 8
concurrency property has been removed. use the forkCount surefire option directly from the command line (or pom) (e.g. mvn -DforkCount=4 verify)
support for the jgit provider of the release plugin has been removed. the git executable is now required to be installed
an extra enforcer rule has been added to prevent releases containing SNAPSHOT versions
the automatic re-running of failing tests has been removed. if this is desired it should be set per project by configuring surefire's rerunFailingTestsCount parameter
jmh benchmarks are now run by activating the jmh-benchmark directly rather than via a property. (mvn -P jmh-benchmark test)
skipping tests using surefire's skipTest property no longer skips other mojos execution.
a quick-build profile has been introduced that disabled things not related to just producing the desired artifacts. This is activated on the command line in the standard maven way (e.g. mvn -P quick-build package)

…al-sniffer

…p versions

Plugins that have flaky tests due to infra requirements etc should opt in to this.

Adding failsafe allows people to write JenkinsRule style tests as ITs so that they can easily run normal unit tests and git quicker feedback in isolation from failsafe style tests with slower feedback should they desire. jacoco needs to be bound to its default verify in order to pick up coverage from IT tests

installing and configuring git should be pretty simple.

jtnord · 2019-12-16T23:59:56Z

pom.xml

-    <jenkins.version>2.138.4</jenkins.version>
-    <!-- Should only need to override these if using timestamped snapshots (but better to use Incrementals instead): -->
+
+    <jenkins.version>2.204</jenkins.version>


closest thing to an LTS with the bom. 2.204.1 will be around in a couple of days.

timja · 2019-12-17T07:07:17Z

pom.xml

@@ -606,7 +635,7 @@
          <webApp>
              <contextPath>/jenkins</contextPath>
          </webApp>
-          <minimumJavaVersion>${plugin.minimumJavaVersion}</minimumJavaVersion>
+          <minimumJavaVersion>1.${java.level}</minimumJavaVersion>


I think the reason to make this a property was so that you could override it and set 11. With it here the only way to do that is to override the plugin configuration

I don't se how. If you require 11 at run time, then you should also compile with java 11..

compiling with a different java version that you require at run-time is highly likely to make things go bang at run-time - its such an advanced use case I do not believe we should hand a loaded gun to non advanced people so they can shoot themselves in the foot. Either that or I am missing a use case.

I'm not actually sure what the state of Java 11 is here. #133 is still open indicating that the only option today should be java 8. (I still to remove Java7 support to simplify)

maybe @oleg-nenashev could shed some light when he comes back from PTO?

(there are also no annimal-snifffer signatures for Java11 - at least defined in this pom)

WHilst the m-r-p should do this there are occaisons where it does not, and we do not actually force people to release with the m-r-p

snapshot parent...

(but in reality it is just 1.8)

thus this profile was as much use as a chocolate fire guard and has been terminated with extreme prejudice

jtnord · 2019-12-18T13:20:00Z

Jenkinsfile

@@ -5,7 +5,7 @@ node('maven') {
        // TODO Azure mirror
        ansiColor('xterm') {
            withEnv(['MAVEN_OPTS=-Djansi.force=true']) {
-                sh 'mvn -B -Dstyle.color=always -ntp -Prun-plugin-pom-its clean verify'
+                sh 'mvn -B -Dstyle.color=always -ntp clean verify'


this is no longer a profile it is in the main definition

do not be scared of profiles - activate them directly so you know what is happening (also removed in plugin-pom 4.0) jenkinsci/plugin-pom#269

pom.xml

Co-Authored-By: Oleg Nenashev <o.v.nenashev@gmail.com>

jtnord · 2019-12-23T14:07:31Z

@oleg-nenashev

Should we create a new integration branch for Plugin POM 4.x so that we incrementally integrate all changes there ?

I'm not sure what you are suggesting?

if you mean a new branch instead of master - I'm not sure, I would just like to roll forward quickly. the v4 should be the new, do we want a legacy branch for the current version incase some fixes are needed for it - but once I have published some older boms (2.138.[123], 2.164.[123]) I'm not sure if there would be a reason for people to stay on the old lines.
at the end of the day no one is forcing a parent update on plugins?

oleg-nenashev · 2019-12-23T14:24:51Z

@jtnord There are basically two ways:

We create a new branch for 4.x while it is in Beta. 3.x stays in master
We keep 4.x in master, 3.x branch will be created if needed due to whatever reason

Either way is fine with me, with slight preference towards (2)

jtnord · 2019-12-23T14:29:41Z

@oleg-nenashev option 2 sounds perfect.

oleg-nenashev · 2019-12-23T14:43:35Z

Summarized it in https://groups.google.com/d/msg/jenkinsci-dev/tm3F_vgK5vA/6Limi4RUCQAJ

oleg-nenashev

Approving it for 4.0 Beta. 3.55 has been released few minutes ago, so we can start integrating changes IMHO.

@jtnord could you please prepare a list of Removals and breaking changes in the PR summary? I will use it for the changelog

jtnord · 2019-12-23T17:35:43Z

@oleg-nenashev release note suggestions provided.

oleg-nenashev · 2019-12-23T18:41:54Z

Taking the number of changes, I will probably cut beta-1 just with this PR so that it can be evalyated without the JTH breaking changes

oleg-nenashev · 2019-12-24T10:09:50Z

I will merge it once the build passes

jtnord · 2019-12-24T10:15:00Z

CONTRIBUTING.adoc

@@ -31,6 +31,7 @@ Then you can just replace the Plugin POM version in your downstream PRs by this
 ### Managing release notes

 * Changelog drafts are automatically by link:https://github.com/toolmantim/release-drafter[Release Drafter]
+** See the documentation about Jenkins Release Drafter configuration link:https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc[here]


@oleg-nenashev why did you restore this it is garbage URL.

oleg-nenashev · 2019-12-24T10:23:48Z

OK, will proceed with the merge and beta-1 release preparation

jglick · 2022-09-14T16:15:05Z

pom.xml

-    <concurrency>1</concurrency> <!-- DEPRECATED use forkCount -->
-    <forkCount>${concurrency}</forkCount> <!-- may use e.g. 2C for 2 × (number of cores) -->


Cleanup from #80 FTR

jtnord added 15 commits December 13, 2019 13:57

remove findbugs legacy and skip profile

e5b32d4

always run integration tests for this pom

a0be78d

remove old concurrency override

9ca3bdb

junit-dep is not provided by jenkins-test-harness anymore

fdc501e

add a quick-build profile that skips enforcer,tests,spotbugs and anim…

0b4fdac

…al-sniffer

findbugs is dead

09cde37

executable-war is not needed, just use the war

38a5f3c

[JENKINS-60474] unconditionally enable the jenkins-bom for library de…

320374a

…p versions

there is no excuse for allowing evry single plugin to have falky tests.

4569982

Plugins that have flaky tests due to infra requirements etc should opt in to this.

remove an unneeded property (plugin.minimumJavaVersion)

50bfd73

whitespace changes to make following easier

f21e6cb

remove support for jgit provider

1115636

installing and configuring git should be pretty simple.

leave a better reference for people about timestamped snapshots

9afd792

InjectedTest is a generated test source and these are already excluded.

5efade2

jtnord commented Dec 16, 2019

View reviewed changes

timja reviewed Dec 17, 2019

View reviewed changes

jtnord mentioned this pull request Dec 17, 2019

Define slf4jVersion unconditionally #262

Closed

jtnord added 8 commits December 17, 2019 16:21

enforce no snapshots for releases.

755371c

WHilst the m-r-p should do this there are occaisons where it does not, and we do not actually force people to release with the m-r-p

the snapshot rule needs special handling so we can run an ITs against a

97cabd7

snapshot parent...

remove old animal sniffer versions we only need to support 1.8 or newer

367d4e9

(but in reality it is just 1.8)

you can not activate profiles based on properties defined in a project

48070e4

thus this profile was as much use as a chocolate fire guard and has been terminated with extreme prejudice

tidy up some comments

a498d8a

define spotbugs plugin version in pluginManagement

b28f137

make this a beta version as suggested by @oleg-nenashev

2e284e7

no need to enable the profile - its always active now

793f39f

jtnord marked this pull request as ready for review December 18, 2019 13:17

jtnord commented Dec 18, 2019

View reviewed changes

jtnord and others added 2 commits December 18, 2019 13:23

skip the invoker plugin in the quick-build profile

3e62514

Merge branch 'master' into JENKINS-60474

586d740

jtnord mentioned this pull request Dec 23, 2019

Activate the benchmark profile directly rather than indirectly via a property jenkins-infra/pipeline-library#124

Merged

oleg-nenashev reviewed Dec 23, 2019

View reviewed changes

pom.xml Outdated Show resolved Hide resolved

change version to 4.0-beta-1-SNAPSHOT

15e346f

Co-Authored-By: Oleg Nenashev <o.v.nenashev@gmail.com>

benchmark activation is via profile

19dab6c

oleg-nenashev mentioned this pull request Dec 23, 2019

Bump slf4jVersion from 1.7.25 to 1.7.30 #270

Closed

make it easier to consume a plugin-pom PR in a incrementals PR

8c9203c

Merge branch 'master' into JENKINS-60474

b9b10c3

oleg-nenashev approved these changes Dec 23, 2019

View reviewed changes

oleg-nenashev added removed enhancement breaking internal labels Dec 23, 2019

Restore the release drafter link

c13f626

jtnord commented Dec 24, 2019

View reviewed changes

oleg-nenashev merged commit f3787e6 into jenkinsci:master Dec 24, 2019

jglick mentioned this pull request Jan 31, 2020

Update to use BOM jenkinsci/github-branch-source-plugin#273

Merged

jglick mentioned this pull request Oct 5, 2020

Force rerunFailingTestsCount=4 in PCT jenkinsci/bom#316

Merged

jglick mentioned this pull request Mar 29, 2021

Using a plugin to implement RealJenkinsRuleInit rather than a Groovy init script jenkinsci/jenkins-test-harness#292

Merged

jglick mentioned this pull request Nov 16, 2021

Clean up old requireUpperBoundDeps exclusions #457

Closed

jglick reviewed Sep 14, 2022

View reviewed changes

Vlatombe mentioned this pull request Sep 15, 2022

Let the CI pass the appropriate forkCount jenkinsci/jenkins#7110

Merged

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[JENKINS-60474] streamline the pom and support the jenkins-bom #269

[JENKINS-60474] streamline the pom and support the jenkins-bom #269

jtnord commented Dec 16, 2019 •

edited

jtnord Dec 16, 2019 •

edited

timja Dec 17, 2019

jtnord Dec 17, 2019

jtnord Dec 17, 2019 •

edited

jtnord Dec 18, 2019

jtnord Dec 18, 2019

jtnord commented Dec 23, 2019

oleg-nenashev commented Dec 23, 2019

jtnord commented Dec 23, 2019

oleg-nenashev commented Dec 23, 2019

oleg-nenashev left a comment •

edited

jtnord commented Dec 23, 2019

oleg-nenashev commented Dec 23, 2019

oleg-nenashev commented Dec 24, 2019

jtnord Dec 24, 2019 •

edited

oleg-nenashev Dec 24, 2019

oleg-nenashev commented Dec 24, 2019

jglick Sep 14, 2022

		<concurrency>1</concurrency> <!-- DEPRECATED use forkCount -->
		<forkCount>${concurrency}</forkCount> <!-- may use e.g. 2C for 2 × (number of cores) -->

[JENKINS-60474] streamline the pom and support the jenkins-bom #269

[JENKINS-60474] streamline the pom and support the jenkins-bom #269

Conversation

jtnord commented Dec 16, 2019 • edited

jtnord Dec 16, 2019 • edited

Choose a reason for hiding this comment

timja Dec 17, 2019

Choose a reason for hiding this comment

jtnord Dec 17, 2019

Choose a reason for hiding this comment

jtnord Dec 17, 2019 • edited

Choose a reason for hiding this comment

jtnord Dec 18, 2019

Choose a reason for hiding this comment

jtnord Dec 18, 2019

Choose a reason for hiding this comment

jtnord commented Dec 23, 2019

oleg-nenashev commented Dec 23, 2019

jtnord commented Dec 23, 2019

oleg-nenashev commented Dec 23, 2019

oleg-nenashev left a comment • edited

Choose a reason for hiding this comment

jtnord commented Dec 23, 2019

oleg-nenashev commented Dec 23, 2019

oleg-nenashev commented Dec 24, 2019

jtnord Dec 24, 2019 • edited

Choose a reason for hiding this comment

oleg-nenashev Dec 24, 2019

Choose a reason for hiding this comment

oleg-nenashev commented Dec 24, 2019

jglick Sep 14, 2022

Choose a reason for hiding this comment

jtnord commented Dec 16, 2019 •

edited

jtnord Dec 16, 2019 •

edited

jtnord Dec 17, 2019 •

edited

oleg-nenashev left a comment •

edited

jtnord Dec 24, 2019 •

edited