Merge pull request #63 from res0nance/hudson-to-jenkins

Rename hudson to jenkins
jenkinsci · Oct 16, 2019 · 78990a8 · 78990a8
2 parents ff90dc9 + 7b5809a
commit 78990a8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/com/sonyericsson/rebuild/RebuildAction.java b/src/main/java/com/sonyericsson/rebuild/RebuildAction.java
@@ -37,7 +37,6 @@
 import hudson.model.BooleanParameterValue;
 import hudson.model.Cause;
 import hudson.model.CauseAction;
-import hudson.model.Hudson;
 import hudson.model.Item;
 import hudson.model.Job;
 import hudson.model.ParameterValue;
@@ -50,6 +49,7 @@
 import hudson.model.PasswordParameterValue;
 import hudson.model.RunParameterValue;
 import hudson.model.StringParameterValue;
+import jenkins.model.Jenkins;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONNull;
 import net.sf.json.JSONObject;
@@ -231,7 +231,7 @@ public void parameterizedRebuild(Run currentBuild, StaplerResponse response) thr
 
             List<Action> actions = constructRebuildActions(build, currentBuild.getAction(ParametersAction.class));
 
-            Hudson.getInstance().getQueue().schedule((Queue.Task) build.getParent(), 0, actions);
+            Jenkins.getInstance().getQueue().schedule2((Queue.Task) build.getParent(), 0, actions);
             response.sendRedirect("../../");
         }
     }
@@ -250,7 +250,7 @@ public void nonParameterizedRebuild(Run currentBuild, StaplerResponse
         getProject().checkPermission(Item.BUILD);
 
         List<Action> actions = constructRebuildActions(build, null);
-        Hudson.getInstance().getQueue().schedule((Queue.Task) currentBuild.getParent(), 0, actions);
+        Jenkins.getInstance().getQueue().schedule2((Queue.Task) currentBuild.getParent(), 0, actions);
         response.sendRedirect("../../");
     }
 
@@ -309,7 +309,7 @@ public void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws Servl
             }
 
             List<Action> actions = constructRebuildActions(build, new ParametersAction(values));
-            Hudson.getInstance().getQueue().schedule((Queue.Task) build.getParent(), 0, actions);
+            Jenkins.getInstance().getQueue().schedule2((Queue.Task) build.getParent(), 0, actions);
 
             rsp.sendRedirect("../../");
         }

diff --git a/src/main/java/com/sonyericsson/rebuild/RebuildActionFactory.java b/src/main/java/com/sonyericsson/rebuild/RebuildActionFactory.java
@@ -26,10 +26,10 @@
 import hudson.matrix.MatrixConfiguration;
 import hudson.Extension;
 import hudson.model.Action;
-import hudson.model.Hudson;
 import hudson.model.Queue;
 import hudson.model.Run;
 import hudson.model.TransientBuildActionFactory;
+import jenkins.model.Jenkins;
 
 import java.util.Collection;
 
@@ -56,7 +56,7 @@ public Collection<? extends Action> createFor(Run build) {
         if (hasRebuildAction) {
             return emptyList();
         }
-        for (RebuildValidator rebuildValidator : Hudson.getInstance().
+        for (RebuildValidator rebuildValidator : Jenkins.getInstance().
                 getExtensionList(RebuildValidator.class)) {
             if (rebuildValidator.isApplicable(build)) {
                 return emptyList();

diff --git a/src/main/java/com/sonyericsson/rebuild/RebuildConfiguration.java b/src/main/java/com/sonyericsson/rebuild/RebuildConfiguration.java
@@ -25,7 +25,8 @@
 
 import hudson.model.Describable;
 import hudson.model.Descriptor;
-import hudson.model.Hudson;
+import jenkins.model.Jenkins;
+
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
@@ -57,7 +58,7 @@ public String toString() {
 
     @Override
     public Descriptor getDescriptor() {
-        return Hudson.getInstance().getDescriptorOrDie(RebuildConfiguration.class);
+        return Jenkins.getInstance().getDescriptorOrDie(RebuildConfiguration.class);
     }
 
     /**

diff --git a/src/main/java/com/sonyericsson/rebuild/Rebuilder.java b/src/main/java/com/sonyericsson/rebuild/Rebuilder.java
@@ -24,12 +24,11 @@
  */
 package com.sonyericsson.rebuild;
 
-
 import hudson.Extension;
-import hudson.model.Hudson;
 import hudson.model.Run;
 import hudson.model.TaskListener;
 import hudson.model.listeners.RunListener;
+import jenkins.model.Jenkins;
 
 /**
  * Runtime Listner class which allows the user to rebuild the parameterized build.
@@ -48,7 +47,7 @@ public Rebuilder() {
 
     @Override
     public void onCompleted(Run build, TaskListener listener) {
-            for (RebuildValidator rebuildValidator : Hudson.getInstance().
+            for (RebuildValidator rebuildValidator : Jenkins.getInstance().
                     getExtensionList(RebuildValidator.class)) {
                 if (rebuildValidator.isApplicable(build)) {
                     return;