Merge pull request #111 from krisstern/update-pom-and-tidy-up

Update pom.xml and revert previous unnecessary changes

Author: krisstern

pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.48</version>
+    <version>4.58</version>
     <relativePath />
   </parent>
 
@@ -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>
@@ -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>
@@ -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>

src/main/java/hudson/plugins/build_timeout/BuildTimeOutStrategy.java

@@ -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.

src/main/java/hudson/plugins/build_timeout/global/GlobalTimeOutConfiguration.java

@@ -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 {

src/main/java/hudson/plugins/build_timeout/global/GlobalTimeOutRunListener.java

@@ -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());

src/main/java/hudson/plugins/build_timeout/global/TimeOutProvider.java

@@ -12,7 +12,5 @@
 public interface TimeOutProvider {
     Optional<Duration> timeOutFor(AbstractBuild<?,?> build, BuildListener listener);
 
-    Optional<Duration> timeOutFor(AbstractProject<?,?> build, BuildListener listener);
-
     List<BuildTimeOutOperation> getOperations();
 }