Skip to content

Commit

Permalink
Use detached plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
basil committed Jan 8, 2022
1 parent bbcc05f commit 179e6c0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
10 changes: 3 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
<properties>
<changelist>999999-SNAPSHOT</changelist>
<java.level>8</java.level>
<jenkins.version>2.289.1</jenkins.version>
<jenkins.version>2.329-rc31971.64a_ea_b_b_c2945</jenkins.version> <!-- TODO https://github.com/jenkinsci/jenkins/pull/6165 -->
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.289.x</artifactId>
<version>1075.v14bef33e5d7b</version>
<artifactId>bom-weekly</artifactId>
<version>1090.v0a_33df40457a_</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand All @@ -53,10 +53,6 @@
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
<exclusion> <!-- TODO pending https://github.com/jenkinsci/plugin-util-api-plugin/releases/tag/v2.9.0 in bom -->
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
7 changes: 6 additions & 1 deletion src/test/java/hudson/tasks/MailerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
import jenkins.model.JenkinsLocationConfiguration;

import java.io.IOException;
import java.io.UncheckedIOException;
import java.lang.reflect.InvocationTargetException;
import java.util.Collection;
import java.util.Optional;
Expand Down Expand Up @@ -297,7 +298,11 @@ public CleanJenkinsLocationConfiguration() {

@Override
public synchronized void load() {
getConfigFile().delete();
try {
getConfigFile().delete();
} catch (IOException e) {
throw new UncheckedIOException(e);
}
super.load();
}
};
Expand Down

0 comments on commit 179e6c0

Please sign in to comment.