diff --git a/core/pom.xml b/core/pom.xml index 5e4cae316d08..f147ed0eb36d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -149,20 +149,44 @@ THE SOFTWARE. windows-package-checker 1.0 + + org.zeroturnaround + javarebel-sdk + 2.0.2 + runtime + org.kohsuke.stapler stapler-adjunct-zeroclipboard 1.3.5-1 + + + org.kohsuke.stapler + stapler + + org.kohsuke.stapler stapler-adjunct-timeline 1.4 + + + org.kohsuke.stapler + stapler + + org.kohsuke.stapler stapler-adjunct-codemirror 1.3 + + + org.kohsuke.stapler + stapler + + org.kohsuke.stapler @@ -170,6 +194,12 @@ THE SOFTWARE. 1.4 tests test + + + org.kohsuke.stapler + stapler + + diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java index 9690c39cd0d0..b7c4a7abe49d 100644 --- a/core/src/main/java/hudson/FilePath.java +++ b/core/src/main/java/hudson/FilePath.java @@ -1601,7 +1601,7 @@ private static void _chmod(File f, int mask) throws IOException { PosixAPI.jnr().chmod(f.getAbsolutePath(),mask); } - private static boolean CHMOD_WARNED = false; + /** * Gets the file permission bit mask. diff --git a/core/src/main/java/hudson/cli/handlers/package-info.java b/core/src/main/java/hudson/cli/handlers/package-info.java index ee7dee536f7c..65a4bb7adf56 100644 --- a/core/src/main/java/hudson/cli/handlers/package-info.java +++ b/core/src/main/java/hudson/cli/handlers/package-info.java @@ -3,4 +3,3 @@ */ package hudson.cli.handlers; -import org.kohsuke.args4j.spi.OptionHandler; \ No newline at end of file diff --git a/core/src/main/java/hudson/init/package-info.java b/core/src/main/java/hudson/init/package-info.java index 065b64a85cb1..1058a04a0857 100644 --- a/core/src/main/java/hudson/init/package-info.java +++ b/core/src/main/java/hudson/init/package-info.java @@ -44,4 +44,3 @@ */ package hudson.init; -import org.jvnet.hudson.reactor.Task; \ No newline at end of file diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index d60f144d554b..543fbd46da97 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -674,7 +674,7 @@ public void renameTo(String newName) throws IOException { @Override public void movedTo(DirectlyModifiableTopLevelItemGroup destination, AbstractItem newItem, File destDir) throws IOException { - Job newJob = (Job) newItem; // Missing covariant parameters type here. + // Missing covariant parameters type here. File oldBuildDir = getBuildDir(); super.movedTo(destination, newItem, destDir); File newBuildDir = getBuildDir(); diff --git a/core/src/main/java/hudson/model/LoadStatistics.java b/core/src/main/java/hudson/model/LoadStatistics.java index cd72f87b7ae3..d3b21b1b4a0e 100644 --- a/core/src/main/java/hudson/model/LoadStatistics.java +++ b/core/src/main/java/hudson/model/LoadStatistics.java @@ -27,7 +27,7 @@ import hudson.model.MultiStageTimeSeries.TimeScale; import hudson.model.MultiStageTimeSeries.TrendChart; import hudson.model.queue.SubTask; -import hudson.model.queue.Tasks; + import hudson.util.ColorPalette; import hudson.util.NoOverlapCategoryAxis; import jenkins.model.Jenkins; @@ -401,15 +401,7 @@ protected void doRun() { j.overallLoad.updateCounts(j.overallLoad.computeSnapshot(bis)); } - private int count(List bis, Label l) { - int q=0; - for (Queue.BuildableItem bi : bis) { - for (SubTask st : Tasks.getSubTasksOf(bi.task)) - if (bi.getAssignedLabelFor(st)==l) - q++; - } - return q; - } + } /** diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index 3976b8c69a7d..220dabffeba0 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -65,7 +65,7 @@ import hudson.model.queue.CauseOfBlockage.BecauseNodeIsBusy; import hudson.model.queue.WorkUnitContext; import hudson.security.AccessControlled; -import hudson.security.Permission; + import jenkins.security.QueueItemAuthenticatorProvider; import jenkins.util.Timer; import hudson.triggers.SafeTimerTask; diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java index d9dcf85a77c4..d53ebf350e99 100644 --- a/core/src/main/java/hudson/model/Slave.java +++ b/core/src/main/java/hudson/model/Slave.java @@ -52,10 +52,10 @@ import java.net.URL; import java.net.URLConnection; import java.util.ArrayList; -import java.util.Arrays; + import java.util.List; import java.util.Set; -import java.util.TreeSet; + import javax.servlet.ServletException; diff --git a/core/src/main/java/hudson/model/TransientUserActionFactory.java b/core/src/main/java/hudson/model/TransientUserActionFactory.java index d45aebdfbf44..c0354892336d 100644 --- a/core/src/main/java/hudson/model/TransientUserActionFactory.java +++ b/core/src/main/java/hudson/model/TransientUserActionFactory.java @@ -26,7 +26,7 @@ import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; -import jenkins.model.Jenkins; + import java.util.Collection; import java.util.Collections; @@ -57,4 +57,4 @@ public Collection createFor(User target) { public static ExtensionList all() { return ExtensionList.lookup(TransientUserActionFactory.class); } -} \ No newline at end of file +} diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java index b5fde8aac6c0..febbc4ffb4b4 100644 --- a/core/src/main/java/hudson/model/UpdateCenter.java +++ b/core/src/main/java/hudson/model/UpdateCenter.java @@ -62,11 +62,11 @@ import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import javax.annotation.Nonnull; + import javax.net.ssl.SSLHandshakeException; import javax.servlet.ServletException; import java.io.File; -import java.io.FileInputStream; + import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -74,7 +74,7 @@ import java.net.URL; import java.net.URLConnection; import java.net.UnknownHostException; -import java.security.DigestInputStream; + import java.security.DigestOutputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java index c79d4ea918e6..6c7caef5698f 100644 --- a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java +++ b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java @@ -175,12 +175,7 @@ public T get(Computer c) { return record.data.get(c); } - /** - * Is the monitoring activity currently in progress? - */ - private synchronized boolean isInProgress() { - return inProgress !=null && inProgress.isAlive(); - } + /** * The timestamp that indicates when the last round of the monitoring has completed. diff --git a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java b/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java index af1c3a79e46c..91681cf1ae73 100644 --- a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java +++ b/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java @@ -23,7 +23,7 @@ */ package hudson.node_monitors; -import hudson.Util; + import hudson.Extension; import hudson.model.Computer; import hudson.remoting.Callable; diff --git a/core/src/main/java/hudson/util/LRUStringConverter.java b/core/src/main/java/hudson/util/LRUStringConverter.java index 4be36ab0d737..ca4d3c5725a8 100644 --- a/core/src/main/java/hudson/util/LRUStringConverter.java +++ b/core/src/main/java/hudson/util/LRUStringConverter.java @@ -1,11 +1,11 @@ package hudson.util; import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter; -import com.thoughtworks.xstream.converters.basic.StringConverter; + import org.apache.commons.collections.map.LRUMap; import java.util.Collections; -import java.util.HashMap; + import java.util.Map; public class LRUStringConverter extends AbstractSingleValueConverter { @@ -38,4 +38,4 @@ public Object fromString(final String str) { return s; } -} \ No newline at end of file +} diff --git a/core/src/main/java/jenkins/model/GlobalConfigurationCategory.java b/core/src/main/java/jenkins/model/GlobalConfigurationCategory.java index f78c1eb3f9be..5a04f867d34b 100644 --- a/core/src/main/java/jenkins/model/GlobalConfigurationCategory.java +++ b/core/src/main/java/jenkins/model/GlobalConfigurationCategory.java @@ -4,7 +4,7 @@ import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.ModelObject; -import hudson.security.*; + import hudson.security.Messages; /** diff --git a/core/walkmod.xml b/core/walkmod.xml new file mode 100644 index 000000000000..2692b3ed7dba --- /dev/null +++ b/core/walkmod.xml @@ -0,0 +1,14 @@ + + + + + + + + true + ["hudson.FilePath#_syncIO()"] + ["hudson.model.Slave#labels", "hudson.model.JenkinsLocationConfiguration#charset", "jenkins.model.JenkinsLocationConfiguration#useSsl"] + + + +