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.

Sign up for GitHub

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

Use BOM 2.190.x #874

Merged
merged 5 commits into from
Apr 14, 2020
Merged

Use BOM 2.190.x #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
731c4da
Don't bundle validator dependencies
MarkEWaite Apr 13, 2020
312a839
Switch from hamcrest-core to hamcrest package
MarkEWaite Apr 13, 2020
fa8c684
Use Jenkins plugin BOM 2.190.x
MarkEWaite Apr 13, 2020
40fd016
Get git client plugin version from bom
MarkEWaite Apr 13, 2020
718c495
Shutdown JenkinsRule to reduce exceptions on teardown
MarkEWaite Apr 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git-client</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -146,10 +145,21 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<exclusions>
<exclusion> <!-- Hamcrest 2.x bundles all hamcrest-core functionality in the hamcrest artifact -->
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down Expand Up @@ -235,6 +245,12 @@
<artifactId>xmlunit-matchers</artifactId>
<version>2.6.4</version>
<scope>test</scope>
<exclusions>
<exclusion> <!-- Hamcrest 2.x bundles all hamcrest-core functionality in the hamcrest artifact -->
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -296,14 +312,18 @@
<artifactId>commons-validator</artifactId>
<version>1.6</version>
<exclusions>
<exclusion>
<exclusion> <!-- Jenkins 2.204.1 provides a newer version than commons-digester mandates -->
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
</exclusion>
<exclusion> <!-- Jenkins 2.204.1 provides a newer version than commons-validator mandates -->
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</exclusion>
<exclusion> <!-- Jenkins 2.204.1 provides commons-collections, no need to bundle it -->
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
Expand All @@ -312,7 +332,7 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.176.x</artifactId>
<artifactId>bom-2.190.x</artifactId>
<version>7</version>
<scope>import</scope>
<type>pom</type>
Expand Down
12 changes: 11 additions & 1 deletion src/test/java/hudson/plugins/git/GitStatusTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,17 @@ public void resetAllowNotifyCommitParameters() throws Exception {
}

@After
public void waitForAllJobsToComplete() {
public void waitForAllJobsToComplete() throws Exception {
// Put JenkinsRule into shutdown state, trying to reduce Windows cleanup exceptions
if (jenkins != null && jenkins.jenkins != null) {
jenkins.jenkins.doQuietDown();
}
// JenkinsRule cleanup throws exceptions during tearDown.
// Reduce exceptions by a random delay from 0.5 to 0.9 seconds.
// Adding roughly 0.7 seconds to these JenkinsRule tests is a small price
// for fewer exceptions and for better Windows job cleanup.
java.util.Random random = new java.util.Random();
Thread.sleep(500L + random.nextInt(400));
/* Windows job cleanup fails to delete build logs in some of these tests.
* Wait for the jobs to complete before exiting the test so that the
* build logs will not be active when the cleanup process tries to
Expand Down