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

Bump Jenkins version to 2.249; clean up plugin parent POM #480

Merged
merged 1 commit into from
Dec 28, 2021

Conversation

basil
Copy link
Member

@basil basil commented Dec 26, 2021

Implements recent suggestions from the "annotation versions" mailing list thread.

@basil basil force-pushed the cleanup branch 2 times, most recently from ede3804 to 3bba424 Compare December 26, 2021 23:18
pom.xml Outdated Show resolved Hide resolved
pom.xml Outdated Show resolved Hide resolved
Comment on lines -234 to -245
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<scope>provided</scope>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
Copy link
Member Author

Choose a reason for hiding this comment

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

As of 2.249, jenkins-core (which we depend on above) already depends on spotbugs-annotations transitively, so this is redundant. Furthermore, it causes Enforcer errors because of Maven's "nearest definition" algorithm. Better to remove it and have plugins get the version corresponding to their core baseline.

Comment on lines -268 to -280
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>access-modifier-annotation</artifactId>
<scope>provided</scope>
<optional>true</optional>
<exclusions>
<exclusion>
<!-- provided by Jenkins core -->
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
</exclusion>
</exclusions>
</dependency>
Copy link
Member Author

Choose a reason for hiding this comment

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

jenkins-core (which we depend on above) already depends on access-modifier-annotation transitively, so this is redundant. Furthermore, it causes Enforcer errors because of Maven's "nearest definition" algorithm. Better to remove it and have plugins get the version corresponding to their core baseline.

@basil basil requested a review from jglick December 26, 2021 23:21
@jglick jglick merged commit 05c9e09 into jenkinsci:master Dec 28, 2021
@jglick
Copy link
Member

jglick commented Dec 28, 2021

Feel free to release if you like.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants