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

Cleanup pom, add bom #243

Merged
merged 3 commits into from
Jan 3, 2021
Merged

Cleanup pom, add bom #243

merged 3 commits into from
Jan 3, 2021

Conversation

timja
Copy link
Member

@timja timja commented Dec 31, 2020

@KostyaSha

if this is merged then #237 can be closed

@@ -50,15 +50,18 @@
<revision>1.33.0</revision>
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/github-plugin</gitHubRepo>
<jenkins.version>2.164.3</jenkins.version>
<jenkins.version>2.222.4</jenkins.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.

97% of users are on this version (https://stats.jenkins.io/pluginversions/github.html), and it's the minimum supported for new versions of bom currently.

also see https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/

@@ -33,12 +32,11 @@

@Test
public void nullName() {
ManuallyEnteredRepositorySource instance = Mockito.spy(new ManuallyEnteredRepositorySource("https://github.com/jenkinsci/jenkins"));
doReturn(null).when(instance).createName(Matchers.anyString());
ManuallyEnteredRepositorySource instance = spy(new ManuallyEnteredRepositorySource("a"));
Copy link
Member Author

Choose a reason for hiding this comment

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

some weird mockito issue that only occurred when running all tests via CLI, couldn't reproduce in IDE or mvn test.

the test is checking nullName, so faking an impossible case didn't make sense anymore so I removed the mocking and the test works

@@ -185,10 +185,6 @@
<!-- Miscellaneous other checks. -->
<!-- See http://checkstyle.sf.net/config_misc.html -->
<module name="ArrayTypeStyle"/>
<module name="TodoComment">
Copy link
Member Author

Choose a reason for hiding this comment

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

this is what is causing other PRs to fail CI currently

@@ -32,6 +32,7 @@


<module name="Checker">
<property name="cacheFile" value="${checkstyle.cache.file}"/>
Copy link
Member Author

Choose a reason for hiding this comment

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

most changes in this file are just moving them around due to checkstyle update

@KostyaSha KostyaSha merged commit 3fdbf0f into jenkinsci:master Jan 3, 2021
@timja timja deleted the update-pom branch January 3, 2021 07:55
@timja timja mentioned this pull request Jan 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants