Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Refresh plugin for June 2023 #554

Merged
merged 1 commit into from
Jun 23, 2023
Merged

Refresh plugin for June 2023 #554

merged 1 commit into from
Jun 23, 2023

Conversation

basil
Copy link
Member

@basil basil commented Jun 23, 2023

Closes #552. Tested with mvn clean verify on Java 17.

@@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.54</version>
<version>4.67</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.

Latest version at the time of this writing.

@@ -28,7 +28,7 @@
</properties>

<scm>
<connection>scm:git:git://github.com/${gitHubRepo}.git</connection>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
Copy link
Member Author

Choose a reason for hiding this comment

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

@@ -347,7 +347,7 @@
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.375.x</artifactId>
<version>2102.v854b_fec19c92</version>
<version>2179.v0884e842b_859</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.

Latest version at the time of this writing.

@@ -65,9 +65,8 @@ public class JiraCreateReleaseNotesTest {

@Before
public void createCommonMocks() throws IOException, InterruptedException {
when(build.getProject()).thenReturn(project);
Copy link
Member Author

Choose a reason for hiding this comment

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

Fixing a Mockito warning about an unnecessary stub by removing the unnecessary stub.

when(build.getEnvironment(buildListener)).thenReturn(env);
when(buildListener.fatalError(Mockito.anyString(), Mockito.any())).thenReturn(printWriter);
when(buildListener.fatalError(Mockito.anyString(), Mockito.any(Object[].class))).thenReturn(printWriter);
Copy link
Member Author

Choose a reason for hiding this comment

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

Adapting to the new Mockito 5 behavior for varargs.

import com.gargoylesoftware.htmlunit.Page;
import com.gargoylesoftware.htmlunit.WebRequest;
import com.gargoylesoftware.htmlunit.util.NameValuePair;
import org.htmlunit.HttpMethod;
Copy link
Member Author

Choose a reason for hiding this comment

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

Adapting to the new HtmlUnit imports.

@@ -172,6 +172,7 @@ public void comment() {
// mock build:
FreeStyleBuild build = mock(FreeStyleBuild.class);
FreeStyleProject project = mock(FreeStyleProject.class);
when(build.getParent()).thenReturn(project);
Copy link
Member Author

Choose a reason for hiding this comment

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

Adapting to a breaking change in Mockito.

@basil basil requested a review from rantoniuk June 23, 2023 22:26
@rantoniuk rantoniuk merged commit 5c886d0 into jenkinsci:master Jun 23, 2023
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants