Skip to content

Bump jenkins-test-harness to 2.56 #4301

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

Closed
wants to merge 3 commits into from
Closed

Bump jenkins-test-harness to 2.56 #4301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22bdbd8
Bump jenkins-test-harness to 2.56
slonopotamus Oct 18, 2019
5315b9d
Update hamcrest to use 2.x packaging
slonopotamus Oct 18, 2019
7e92923
Force garbage collection after stopping plugins
slonopotamus Oct 24, 2019
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
14 changes: 13 additions & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,22 @@ THE SOFTWARE.
<artifactId>jenkins-stapler-support</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3</version>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 4 additions & 0 deletions core/src/main/java/hudson/PluginManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,6 +1331,7 @@ public PluginWrapper whichPlugin(Class c) {
/**
* Orderly terminates all the plugins.
*/
@SuppressFBWarnings(value = "DM_GC", justification = "Garbage collection is required to release files held by plugin classloaders")
public void stop() {
for (PluginWrapper p : activePlugins) {
p.stop();
Expand All @@ -1340,6 +1341,9 @@ public void stop() {
// Work around a bug in commons-logging.
// See http://www.szegedi.org/articles/memleak.html
LogFactory.release(uberClassLoader);
// Java doesn't have any direct means to release unreferenced classloaders,
// so we force GC to do that so it becomes possible to delete plugin jar on Windows.
System.gc();
}

/**
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ THE SOFTWARE.
<project.patchManagement.url>https://api.github.com</project.patchManagement.url>
<patch.tracker.serverId>jenkins-jira</patch.tracker.serverId>

<hamcrest.version>2.1</hamcrest.version>
<matrix-auth.version>2.3</matrix-auth.version>
Copy link
Member

Choose a reason for hiding this comment

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

Use dependencyManagement instead?

Copy link
Contributor Author

@slonopotamus slonopotamus Oct 22, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

jenkins-test-harness doesn't do that, why do this here differently?

Copy link
Member

Choose a reason for hiding this comment

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

Less code, but no strong opinion

<matrix-project.version>1.14</matrix-project.version>
<sorcerer.version>0.11</sorcerer.version>
Expand Down
17 changes: 15 additions & 2 deletions test-pom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ THE SOFTWARE.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jenkins-test-harness</artifactId>
<version>2.55</version>
<version>2.56</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -164,10 +164,23 @@ THE SOFTWARE.
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<!-- for testing JNLP launch. -->
Expand Down