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.

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

Introduce bom and bump minimum required version #95

Merged
merged 7 commits into from
Apr 13, 2020

Conversation

timja
Copy link
Member

@timja timja commented Apr 9, 2020

According to http://stats.jenkins.io/pluginversions/workflow-cps-global-lib.html

98% of users on the latest version are on this version or above
88% on the previous version are on this version or above
97% on the previous version are on one of the previous LTS releases in
this line and could likely easily upgrade

When testing #94 I was unable to test it interactively due to conflicts in plugin loading, ssh-credentials and git both failed to load. With these changes I was able to test it

Can lower the core and use 3.x plugin-pom if maintainers prefer

cc @dwnusbaum @bitwiseman

According to http://stats.jenkins.io/pluginversions/workflow-cps-global-lib.html

98% of users on the latest version are on this version or above
88% on the previous version are on this version or above
97% on the previous version are on one of the previous LTS releases in
this line and could likely easily upgrade
<subversion-plugin.version>2.13.0</subversion-plugin.version>
<workflow-scm-step-plugin.version>2.7</workflow-scm-step-plugin.version>
<workflow-multibranch-plugin.version>2.21</workflow-multibranch-plugin.version>
Copy link
Member Author

Choose a reason for hiding this comment

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

needs adding to bom, will try take a look, but shouldn't block this

Copy link
Member

Choose a reason for hiding this comment

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

Included in jenkinsci/bom#179, FYI.

<subversion-plugin.version>2.13.0</subversion-plugin.version>
<workflow-scm-step-plugin.version>2.7</workflow-scm-step-plugin.version>
<workflow-multibranch-plugin.version>2.21</workflow-multibranch-plugin.version>
Copy link
Member

Choose a reason for hiding this comment

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

Included in jenkinsci/bom#179, FYI.

pom.xml Outdated
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Copy link
Member

Choose a reason for hiding this comment

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

or #94

pom.xml Outdated Show resolved Hide resolved
pom.xml Show resolved Hide resolved
pom.xml Outdated Show resolved Hide resolved
pom.xml Outdated Show resolved Hide resolved
@timja
Copy link
Member Author

timja commented Apr 10, 2020

Could someone else resubmit this due to needing to change the jenkinsfile bff6324
and jenkins-infra/pipeline-library#94

@timja
Copy link
Member Author

timja commented Apr 13, 2020

Merged after commons-lang removal but will need someone with write access to re-submit this, or yolo merge

@jglick jglick mentioned this pull request Apr 13, 2020
@jglick
Copy link
Member

jglick commented Apr 13, 2020

will need someone with write access to re-submit this

check #97

Copy link
Member

@dwnusbaum dwnusbaum left a comment

Choose a reason for hiding this comment

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

Thanks for the PR! Looks good to me, but can you check the output of jar -tf target/workflow-cps-global-lib.hpi to make no unusual JARs are being bundled after the POM changes?

@jglick
Copy link
Member

jglick commented Apr 13, 2020

check the output of

Or just look in the build log, as of jenkinsci/maven-hpi-plugin#130

@jglick
Copy link
Member

jglick commented Apr 13, 2020

pom.xml Show resolved Hide resolved
Requires plugin versions bumped above trilead split which would require
a baseline of at least 2.190.x
@timja
Copy link
Member Author

timja commented Apr 13, 2020

Can't build against 2.222.x unless we bump to 2.190.x as minimum due to trilead-api problems in other dependencies.

@timja
Copy link
Member Author

timja commented Apr 13, 2020

Build passed

@bitwiseman
Copy link
Contributor

@dwnusbaum

This looks good to me. Just ivy being bundled, right?

[2020-04-13T17:15:20.958Z] [INFO] --- maven-hpi-plugin:3.13:hpi (default-hpi) @ workflow-cps-global-lib ---

[2020-04-13T17:15:20.958Z] [INFO] Generating /home/jenkins/workspace/flow-cps-global-lib-plugin_PR-97/target/workflow-cps-global-lib/META-INF/MANIFEST.MF

[2020-04-13T17:15:20.958Z] [INFO] Checking for attached .jar artifact ...

[2020-04-13T17:15:20.958Z] [INFO] Generating jar /home/jenkins/workspace/flow-cps-global-lib-plugin_PR-97/target/workflow-cps-global-lib.jar

[2020-04-13T17:15:20.958Z] [INFO] Building jar: /home/jenkins/workspace/flow-cps-global-lib-plugin_PR-97/target/workflow-cps-global-lib.jar

[2020-04-13T17:15:21.533Z] [INFO] Exploding webapp...

[2020-04-13T17:15:21.533Z] [INFO] Copy webapp webResources to /home/jenkins/workspace/flow-cps-global-lib-plugin_PR-97/target/workflow-cps-global-lib

[2020-04-13T17:15:21.533Z] [INFO] Assembling webapp workflow-cps-global-lib in /home/jenkins/workspace/flow-cps-global-lib-plugin_PR-97/target/workflow-cps-global-lib

[2020-04-13T17:15:21.533Z] [INFO] Bundling direct dependency ivy-2.4.0.jar

[2020-04-13T17:15:21.533Z] [INFO] Generating hpi /home/jenkins/workspace/flow-cps-global-lib-plugin_PR-97/target/workflow-cps-global-lib.hpi

[2020-04-13T17:15:21.533Z] [INFO] Building jar: /home/jenkins/workspace/flow-cps-global-lib-plugin_PR-97/target/workflow-cps-global-lib.hpi

@timja
Copy link
Member Author

timja commented Apr 13, 2020

Yup

@timja timja requested a review from dwnusbaum April 13, 2020 17:30
@dwnusbaum dwnusbaum merged commit a5a0ab7 into jenkinsci:master Apr 13, 2020
@timja timja deleted the use-bom-bump-core branch April 13, 2020 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants