Skip to content

Update pom.xml and revert previous unnecessary changes #111

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.

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

Merged
merged 1 commit into from
Apr 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.48</version>
<version>4.58</version>
<relativePath />
</parent>

Expand All @@ -14,7 +14,7 @@
<packaging>hpi</packaging>

<name>Build Timeout</name>
<description>Terminates a build if it is taking too long</description>
<description>To terminate a build if it is taking too long</description>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
<licenses>
<license>
Expand All @@ -34,7 +34,7 @@
<properties>
<revision>1.30</revision>
<changelist>-SNAPSHOT</changelist>
<jenkins.version>2.361.4</jenkins.version>
<jenkins.version>2.375.4</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<!-- To be removed once Jenkins.MANAGE permission gets out of beta -->
<useBeta>true</useBeta>
Expand Down Expand Up @@ -62,7 +62,7 @@
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.375.x</artifactId>
<version>1742.vb_70478c1b_25f</version>
<version>1968.vb_14a_29e76128</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ public long getTimeOut(@NonNull AbstractBuild<?,?> build, @NonNull BuildListener
return getTimeOut(build);
}

public long getTimeOut(@NonNull Run build, @NonNull BuildListener listener)
throws InterruptedException, MacroEvaluationException, IOException {
return getTimeOut(build);
}

/**
* Called when some output to console.
* Override this to capture the activity.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,6 @@ public synchronized void load() {
});
}

@Override
public Optional<Duration> timeOutFor(AbstractProject<?,?> build, BuildListener listener) {
return Optional.empty();
}

@Override
public Optional<Duration> timeOutFor(AbstractBuild<?,?> build, BuildListener listener) {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,6 @@ public Environment setUpEnvironment(AbstractBuild build, Launcher launcher, Buil
return super.setUpEnvironment(build, launcher, listener);
}

public Environment setUpEnvironment(AbstractProject<?,?> build, Launcher launcher, BuildListener listener) {
return new Environment() {
@Override
public void buildEnvVars(Map<String, String> env) {
super.buildEnvVars(env);
}
};
}

@Override
public void onCompleted(Run<?, ?> run, @Nonnull TaskListener listener) {
store.cancel(run.getExternalizableId());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,5 @@
public interface TimeOutProvider {
Optional<Duration> timeOutFor(AbstractBuild<?,?> build, BuildListener listener);

Optional<Duration> timeOutFor(AbstractProject<?,?> build, BuildListener listener);

List<BuildTimeOutOperation> getOperations();
}

This file was deleted.