Skip to content

Commit da4c426

Browse files
Merge branch 'master' into migrate_to_junit5
2 parents 3e60cf1 + 9ee8a39 commit da4c426

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.mvn/extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<extension>
33
<groupId>io.jenkins.tools.incrementals</groupId>
44
<artifactId>git-changelist-maven-extension</artifactId>
5-
<version>1.8</version>
5+
<version>1.13</version>
66
</extension>
77
</extensions>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.jenkins-ci.plugins</groupId>
66
<artifactId>plugin</artifactId>
7-
<version>5.24</version>
7+
<version>5.28</version>
88
<relativePath />
99
</parent>
1010

src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigatorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
3131
import static org.hamcrest.MatcherAssert.assertThat;
3232
import static org.hamcrest.Matchers.*;
33-
import static org.junit.jupiter.api.Assertions.assertEquals;
3433
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
34+
import static org.junit.jupiter.api.Assertions.assertEquals;
3535

3636
import com.cloudbees.plugins.credentials.Credentials;
3737
import com.cloudbees.plugins.credentials.CredentialsScope;

0 commit comments

Comments
 (0)