Introduce set of ProjectProperties tests based on ProjectPropertyTest class. Implement test cases for CopyOnWriteListProperty, BaseProjectProperty, DescribableListProjectProperty, ExternalProjectProperty. A few fixes.

Signed-off-by: Winston Prakash <winston.prakash@gmail.com>

73 files changed, 74 insertions, 188 deletions

diff --git a/hudson-core/pom.xml b/hudson-core/pom.xml
index 9a9f0a1..a3ad898 100644
--- a/hudson-core/pom.xml
+++ b/hudson-core/pom.xml
@@ -318,6 +318,49 @@
             </plugins>
           </build>
         </profile>
+        <profile>
+            <id>pmd</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-pmd-plugin</artifactId>
+                        <configuration>
+                            <verbose>true</verbose>
+                            <targetJdk>1.5</targetJdk>
+                            <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
+                            <targetDirectory>${project.build.directory}</targetDirectory>
+                            <excludeRoots>
+                                <excludeRoot>${basedir}/target/generated-sources/</excludeRoot>
+                            </excludeRoots>
+                            <rulesets>
+                                <!--http://pmd.sourceforge.net/rules/index.html#Basic_Rules-->
+                                <!--<ruleset>/rulesets/basic.xml</ruleset>-->
+                                <!--http://pmd.sourceforge.net/rules/index.html#Unused_Code_Rules-->
+                                <!--<ruleset>/rulesets/unusedcode.xml</ruleset>-->
+                                <ruleset>/rulesets/imports.xml</ruleset>
+                                <!--http://pmd.sourceforge.net/rules/index.html#Braces_Rules-->
+                                <!--<ruleset>/rulesets/braces.xml</ruleset>-->
+                                <!--http://pmd.sourceforge.net/rules/index.html#Naming_Rules-->
+                                <!--<ruleset>/rulesets/naming.xml</ruleset>-->
+                            </rulesets>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>check</goal>
+                                    <!--<goal>cpd-check</goal>-->
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <dependencies>
diff --git a/hudson-core/src/main/java/hudson/ExtensionList.java b/hudson-core/src/main/java/hudson/ExtensionList.java
index 496aa21..53a5ee7 100644
--- a/hudson-core/src/main/java/hudson/ExtensionList.java
+++ b/hudson-core/src/main/java/hudson/ExtensionList.java
@@ -23,7 +23,6 @@ import hudson.util.DescriptorList;
 import hudson.util.Memoizer;
 import hudson.util.Iterators;
 import hudson.ExtensionPoint.LegacyInstancesAreScopedToHudson;
-import hudson.PluginStrategy;
 
 import java.util.AbstractList;
 import java.util.ArrayList;
@@ -31,7 +30,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 import java.util.Vector;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.logging.Level;
diff --git a/hudson-core/src/main/java/hudson/Functions.java b/hudson-core/src/main/java/hudson/Functions.java
index 914ed33..e2adbe1 100644
--- a/hudson-core/src/main/java/hudson/Functions.java
+++ b/hudson-core/src/main/java/hudson/Functions.java
@@ -59,7 +59,6 @@ import hudson.tasks.BuildWrappers;
 import hudson.tasks.Builder;
 import hudson.tasks.Publisher;
 import hudson.util.Area;
-import hudson.util.CascadingUtil;
 import hudson.util.Iterators;
 import hudson.scm.SCM;
 import hudson.scm.SCMDescriptor;
@@ -67,7 +66,6 @@ import hudson.security.captcha.CaptchaSupport;
 import hudson.util.Secret;
 import hudson.views.MyViewsTabBar;
 import hudson.views.ViewsTabBar;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken;
 import org.apache.commons.jelly.JellyContext;
diff --git a/hudson-core/src/main/java/hudson/ProxyConfiguration.java b/hudson-core/src/main/java/hudson/ProxyConfiguration.java
index 8f45d7a..b1f20bb 100644
--- a/hudson-core/src/main/java/hudson/ProxyConfiguration.java
+++ b/hudson-core/src/main/java/hudson/ProxyConfiguration.java
@@ -34,8 +34,6 @@ import com.thoughtworks.xstream.XStream;
 import java.net.ConnectException;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.StringTokenizer;
 import java.util.logging.Logger;
 import org.apache.commons.codec.binary.Base64;
diff --git a/hudson-core/src/main/java/hudson/Util.java b/hudson-core/src/main/java/hudson/Util.java
index ecafed5..02db474 100644
--- a/hudson-core/src/main/java/hudson/Util.java
+++ b/hudson-core/src/main/java/hudson/Util.java
@@ -25,7 +25,6 @@ import hudson.util.VariableResolver;
 import hudson.Proc.LocalProc;
 import hudson.util.jna.NativeAccessException;
 
-import hudson.util.jna.NativeFunction;
 import hudson.util.jna.NativeUtils;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
diff --git a/hudson-core/src/main/java/hudson/console/AnnotatedLargeText.java b/hudson-core/src/main/java/hudson/console/AnnotatedLargeText.java
index 2e8d8ea..d4b80d5 100644
--- a/hudson-core/src/main/java/hudson/console/AnnotatedLargeText.java
+++ b/hudson-core/src/main/java/hudson/console/AnnotatedLargeText.java
@@ -38,7 +38,6 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
-import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.nio.charset.Charset;
 import java.security.GeneralSecurityException;
diff --git a/hudson-core/src/main/java/hudson/init/InitializerFinder.java b/hudson-core/src/main/java/hudson/init/InitializerFinder.java
index 3cd2d27..4e0749d 100644
--- a/hudson-core/src/main/java/hudson/init/InitializerFinder.java
+++ b/hudson-core/src/main/java/hudson/init/InitializerFinder.java
@@ -33,7 +33,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import hudson.model.Hudson;
diff --git a/hudson-core/src/main/java/hudson/init/impl/GroovyInitScript.java b/hudson-core/src/main/java/hudson/init/impl/GroovyInitScript.java
index 344f358..d7490b3 100644
--- a/hudson-core/src/main/java/hudson/init/impl/GroovyInitScript.java
+++ b/hudson-core/src/main/java/hudson/init/impl/GroovyInitScript.java
@@ -24,11 +24,9 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.logging.Logger;
 
-import hudson.FilePath;
 import hudson.model.Hudson;
 import static hudson.init.InitMilestone.JOB_LOADED;
 import hudson.init.Initializer;
-import org.apache.commons.io.FileUtils;
 
 /**
  * Run the initialization script, if it exists.
diff --git a/hudson-core/src/main/java/hudson/init/package-info.java b/hudson-core/src/main/java/hudson/init/package-info.java
index 01fa895..5eb1d9d 100644
--- a/hudson-core/src/main/java/hudson/init/package-info.java
+++ b/hudson-core/src/main/java/hudson/init/package-info.java
@@ -16,4 +16,3 @@
 
 package hudson.init;
 
-import org.jvnet.hudson.reactor.Task;
diff --git a/hudson-core/src/main/java/hudson/lifecycle/UnixLifecycle.java b/hudson-core/src/main/java/hudson/lifecycle/UnixLifecycle.java
index ca1fea2..f0a5773 100644
--- a/hudson-core/src/main/java/hudson/lifecycle/UnixLifecycle.java
+++ b/hudson-core/src/main/java/hudson/lifecycle/UnixLifecycle.java
@@ -18,7 +18,6 @@ package hudson.lifecycle;
 
 import hudson.model.Hudson;
 import hudson.util.jna.NativeAccessException;
-import hudson.util.jna.NativeFunction;
 import hudson.util.jna.NativeUtils;
 import java.io.IOException;
 
diff --git a/hudson-core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java b/hudson-core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
index f4b2e30..fcb7120 100644
--- a/hudson-core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
+++ b/hudson-core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
@@ -23,7 +23,6 @@ import hudson.AbortException;
 import hudson.Extension;
 import hudson.util.StreamTaskListener;
 import hudson.util.jna.NativeAccessException;
-import hudson.util.jna.NativeFunction;
 import hudson.util.jna.NativeUtils;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
diff --git a/hudson-core/src/main/java/hudson/logging/LogRecorderManager.java b/hudson-core/src/main/java/hudson/logging/LogRecorderManager.java
index 0a84050..b6b5c58 100644
--- a/hudson-core/src/main/java/hudson/logging/LogRecorderManager.java
+++ b/hudson-core/src/main/java/hudson/logging/LogRecorderManager.java
@@ -23,7 +23,6 @@ import static hudson.init.InitMilestone.PLUGINS_PREPARED;
 import hudson.model.AbstractModelObject;
 import hudson.model.Hudson;
 import hudson.model.RSS;
-import hudson.model.Failure;
 import hudson.tasks.Mailer;
 import hudson.util.CopyOnWriteMap;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
diff --git a/hudson-core/src/main/java/hudson/matrix/Axis.java b/hudson-core/src/main/java/hudson/matrix/Axis.java
index 52d15af..4f46026 100644
--- a/hudson-core/src/main/java/hudson/matrix/Axis.java
+++ b/hudson-core/src/main/java/hudson/matrix/Axis.java
@@ -20,7 +20,6 @@ import hudson.DescriptorExtensionList;
 import hudson.ExtensionPoint;
 import hudson.Util;
 import hudson.model.AbstractDescribableImpl;
-import hudson.model.Descriptor;
 import hudson.model.Hudson;
 import hudson.util.QuotedStringTokenizer;
 import org.apache.commons.collections.CollectionUtils;
diff --git a/hudson-core/src/main/java/hudson/matrix/MatrixBuild.java b/hudson-core/src/main/java/hudson/matrix/MatrixBuild.java
index 31f0718..3f18bff 100644
--- a/hudson-core/src/main/java/hudson/matrix/MatrixBuild.java
+++ b/hudson-core/src/main/java/hudson/matrix/MatrixBuild.java
@@ -19,7 +19,6 @@ package hudson.matrix;
 import hudson.Util;
 import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
-import hudson.model.Build;
 import hudson.model.BuildListener;
 import hudson.model.Executor;
 import hudson.model.Fingerprint;
diff --git a/hudson-core/src/main/java/hudson/matrix/MatrixProject.java b/hudson-core/src/main/java/hudson/matrix/MatrixProject.java
index 2265f42..de2d8fd 100644
--- a/hudson-core/src/main/java/hudson/matrix/MatrixProject.java
+++ b/hudson-core/src/main/java/hudson/matrix/MatrixProject.java
@@ -20,11 +20,8 @@ import hudson.CopyOnWrite;
 import hudson.Extension;
 import hudson.Util;
 import hudson.XmlFile;
-import hudson.model.AbstractProject;
-import hudson.model.Action;
 import hudson.model.BaseBuildableProject;
 import hudson.model.BuildableItemWithBuildWrappers;
-import hudson.model.DependencyGraph;
 import hudson.model.Descriptor;
 import hudson.model.Descriptor.FormException;
 import hudson.model.Hudson;
@@ -39,9 +36,6 @@ import hudson.model.Result;
 import hudson.model.SCMedItem;
 import hudson.model.Saveable;
 import hudson.model.TopLevelItem;
-import hudson.tasks.BuildStepDescriptor;
-import hudson.tasks.BuildWrappers;
-import hudson.tasks.Builder;
 import hudson.tasks.Publisher;
 import hudson.util.CascadingUtil;
 import hudson.util.CopyOnWriteMap;
@@ -51,12 +45,7 @@ import hudson.util.FormValidation;
 import hudson.util.FormValidation.Kind;
 import net.sf.json.JSONObject;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.hudson.api.matrix.IMatrixProject;
-import org.eclipse.hudson.api.model.project.property.AxisListProjectProperty;
-import org.eclipse.hudson.api.model.project.property.BooleanProjectProperty;
-import org.eclipse.hudson.api.model.project.property.ResultProjectProperty;
-import org.eclipse.hudson.api.model.project.property.StringProjectProperty;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
diff --git a/hudson-core/src/main/java/hudson/model/AbstractProject.java b/hudson-core/src/main/java/hudson/model/AbstractProject.java
index 1e33b1d..e5165c6 100644
--- a/hudson-core/src/main/java/hudson/model/AbstractProject.java
+++ b/hudson-core/src/main/java/hudson/model/AbstractProject.java
@@ -36,12 +36,8 @@ import hudson.model.Queue.Executable;
 import hudson.model.Queue.Task;
 import hudson.model.Queue.WaitingItem;
 import hudson.model.RunMap.Constructor;
-import hudson.model.labels.LabelAtom;
-import hudson.model.labels.LabelExpression;
 import hudson.util.CascadingUtil;
 import hudson.util.DescribableListUtil;
-import org.eclipse.hudson.api.model.IProjectProperty;
-import org.eclipse.hudson.api.model.project.property.BooleanProjectProperty;
 import org.eclipse.hudson.api.model.project.property.IntegerProjectProperty;
 import hudson.model.queue.CauseOfBlockage;
 import hudson.model.queue.SubTask;
@@ -98,7 +94,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.eclipse.hudson.api.model.IAbstractProject;
 import org.eclipse.hudson.api.model.project.property.SCMProjectProperty;
-import org.eclipse.hudson.api.model.project.property.StringProjectProperty;
 import org.eclipse.hudson.api.model.project.property.TriggerProjectProperty;
 import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.CmdLineException;
diff --git a/hudson-core/src/main/java/hudson/model/Api.java b/hudson-core/src/main/java/hudson/model/Api.java
index 9df238b..d74128a 100644
--- a/hudson-core/src/main/java/hudson/model/Api.java
+++ b/hudson-core/src/main/java/hudson/model/Api.java
@@ -37,7 +37,6 @@ import java.io.OutputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.List;
-import java.util.logging.Logger;
 
 /**
  * Used to expose remote access API for ".../api/"
diff --git a/hudson-core/src/main/java/hudson/model/BaseBuildableProject.java b/hudson-core/src/main/java/hudson/model/BaseBuildableProject.java
index a7e2100..bc7fb8f 100644
--- a/hudson-core/src/main/java/hudson/model/BaseBuildableProject.java
+++ b/hudson-core/src/main/java/hudson/model/BaseBuildableProject.java
@@ -29,14 +29,9 @@ import hudson.util.DescribableListUtil;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.servlet.ServletException;
 import net.sf.json.JSONObject;
 import org.eclipse.hudson.api.model.IProject;
-import org.eclipse.hudson.api.model.project.property.BaseProjectProperty;
-import org.eclipse.hudson.api.model.project.property.ExternalProjectProperty;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
diff --git a/hudson-core/src/main/java/hudson/model/BooleanParameterValue.java b/hudson-core/src/main/java/hudson/model/BooleanParameterValue.java
index 581e6b0..2c0885f 100644
--- a/hudson-core/src/main/java/hudson/model/BooleanParameterValue.java
+++ b/hudson-core/src/main/java/hudson/model/BooleanParameterValue.java
@@ -21,7 +21,6 @@ import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.export.Exported;
 
 import java.util.Locale;
-import java.util.Map;
 
 import hudson.util.VariableResolver;
 
diff --git a/hudson-core/src/main/java/hudson/model/BuildTimelineWidget.java b/hudson-core/src/main/java/hudson/model/BuildTimelineWidget.java
index 279e6fe..bd83534 100644
--- a/hudson-core/src/main/java/hudson/model/BuildTimelineWidget.java
+++ b/hudson-core/src/main/java/hudson/model/BuildTimelineWidget.java
@@ -33,7 +33,6 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Locale;
 import org.kohsuke.stapler.QueryParameter;
 
 /**
diff --git a/hudson-core/src/main/java/hudson/model/ChoiceParameterDefinition.java b/hudson-core/src/main/java/hudson/model/ChoiceParameterDefinition.java
index f714b71..8bc053d 100644
--- a/hudson-core/src/main/java/hudson/model/ChoiceParameterDefinition.java
+++ b/hudson-core/src/main/java/hudson/model/ChoiceParameterDefinition.java
@@ -22,12 +22,10 @@ import org.kohsuke.stapler.export.Exported;
 import org.apache.commons.lang3.StringUtils;
 import net.sf.json.JSONObject;
 import hudson.Extension;
-import hudson.cli.CLICommand;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Arrays;
-import java.io.IOException;
 
 /**
  * @author huybrechts
diff --git a/hudson-core/src/main/java/hudson/model/DownloadService.java b/hudson-core/src/main/java/hudson/model/DownloadService.java
index eb098c9..d540dda 100644
--- a/hudson-core/src/main/java/hudson/model/DownloadService.java
+++ b/hudson-core/src/main/java/hudson/model/DownloadService.java
@@ -24,7 +24,6 @@ import hudson.util.IOUtils;
 import hudson.util.QuotedStringTokenizer;
 import hudson.util.TextFile;
 import hudson.util.TimeUnit2;
-import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
 
 import java.io.File;
diff --git a/hudson-core/src/main/java/hudson/model/EnvironmentContributingAction.java b/hudson-core/src/main/java/hudson/model/EnvironmentContributingAction.java
index 0453dcc..29f1b7d 100644
--- a/hudson-core/src/main/java/hudson/model/EnvironmentContributingAction.java
+++ b/hudson-core/src/main/java/hudson/model/EnvironmentContributingAction.java
@@ -17,24 +17,21 @@
 package hudson.model;
 
 import hudson.EnvVars;
-import hudson.model.Queue.Task;
-import hudson.tasks.Builder;
-import hudson.tasks.BuildWrapper;
 
 /**
  * {@link Action} that contributes environment variables during a build.
  *
  * <p>
- * For example, your {@link Builder} can add an {@link EnvironmentContributingAction} so that
+ * For example, your {@link hudson.tasks.Builder} can add an {@link EnvironmentContributingAction} so that
  * the rest of the builders or publishers see some behavior changes.
  *
- * Another use case is for you to {@linkplain Queue#schedule(Task, int, Action...) submit a job} with
+ * Another use case is for you to {@linkplain Queue#schedule(hudson.model.Queue.Task, int, Action...) submit a job} with
  * {@link EnvironmentContributingAction}s.
  *
  * @author Kohsuke Kawaguchi
  * @since 1.318
  * @see AbstractBuild#getEnvironment(TaskListener)
- * @see BuildWrapper
+ * @see hudson.tasks.BuildWrapper
  */
 public interface EnvironmentContributingAction extends Action {
     /**
diff --git a/hudson-core/src/main/java/hudson/model/FreeStyleProject.java b/hudson-core/src/main/java/hudson/model/FreeStyleProject.java
index 68ae6c1..31e38d8 100644
--- a/hudson-core/src/main/java/hudson/model/FreeStyleProject.java
+++ b/hudson-core/src/main/java/hudson/model/FreeStyleProject.java
@@ -22,9 +22,7 @@ import hudson.util.CascadingUtil;
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.hudson.api.model.IFreeStyleProject;
-import org.eclipse.hudson.api.model.project.property.StringProjectProperty;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
diff --git a/hudson-core/src/main/java/hudson/model/Hudson.java b/hudson-core/src/main/java/hudson/model/Hudson.java
index 6f24bd3..c9a4c8d 100644
--- a/hudson-core/src/main/java/hudson/model/Hudson.java
+++ b/hudson-core/src/main/java/hudson/model/Hudson.java
@@ -17,8 +17,6 @@
 package hudson.model;
 
 import antlr.ANTLRException;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
 import com.thoughtworks.xstream.XStream;
 import hudson.BulkChange;
 import hudson.DNSMultiCast;
@@ -178,8 +176,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import static hudson.init.InitMilestone.*;
 import hudson.stapler.WebAppController;
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
+import static javax.servlet.http.HttpServletResponse.*;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
@@ -223,7 +220,6 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
-import static java.util.logging.Level.SEVERE;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
@@ -606,7 +602,7 @@ public final class Hudson extends Node implements ItemGroup<TopLevelItem>, Stapl
             try {
                 proxy = ProxyConfiguration.load();
             } catch (IOException e) {
-                LOGGER.log(SEVERE, "Failed to load proxy configuration", e);
+                LOGGER.log(java.util.logging.Level.SEVERE, "Failed to load proxy configuration", e);
             }
 
             if (pluginManager == null) {
@@ -744,7 +740,7 @@ public final class Hudson extends Node implements ItemGroup<TopLevelItem>, Stapl
             }
 
             public void onTaskFailed(Task t, Throwable err, boolean fatal) {
-                LOGGER.log(SEVERE, "Failed " + t.getDisplayName(), err);
+                LOGGER.log(java.util.logging.Level.SEVERE, "Failed " + t.getDisplayName(), err);
             }
 
             public void onAttained(Milestone milestone) {
@@ -2952,11 +2948,11 @@ public final class Hudson extends Node implements ItemGroup<TopLevelItem>, Stapl
                     SecurityContextHolder.getContext().setAuthentication(ACL.SYSTEM);
                     reload();
                 } catch (IOException e) {
-                    LOGGER.log(SEVERE, "Failed to reload Hudson config", e);
+                    LOGGER.log(java.util.logging.Level.SEVERE, "Failed to reload Hudson config", e);
                 } catch (ReactorException e) {
-                    LOGGER.log(SEVERE, "Failed to reload Hudson config", e);
+                    LOGGER.log(java.util.logging.Level.SEVERE, "Failed to reload Hudson config", e);
                 } catch (InterruptedException e) {
-                    LOGGER.log(SEVERE, "Failed to reload Hudson config", e);
+                    LOGGER.log(java.util.logging.Level.SEVERE, "Failed to reload Hudson config", e);
                 }
             }
         }.start();
diff --git a/hudson-core/src/main/java/hudson/model/ItemGroupMixIn.java b/hudson-core/src/main/java/hudson/model/ItemGroupMixIn.java
index 057ed55..513fd8a 100644
--- a/hudson-core/src/main/java/hudson/model/ItemGroupMixIn.java
+++ b/hudson-core/src/main/java/hudson/model/ItemGroupMixIn.java
@@ -22,7 +22,6 @@ import hudson.security.AccessControlled;
 import hudson.util.CopyOnWriteMap;
 import hudson.util.Function1;
 import hudson.util.IOUtils;
-import org.kohsuke.stapler.Ancestor;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
@@ -32,7 +31,6 @@ import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.List;
 import java.util.Map;
 
 /**
diff --git a/hudson-core/src/main/java/hudson/model/Job.java b/hudson-core/src/main/java/hudson/model/Job.java
index 2dcb2fb..4f3fdc0 100644
--- a/hudson-core/src/main/java/hudson/model/Job.java
+++ b/hudson-core/src/main/java/hudson/model/Job.java
@@ -22,19 +22,8 @@ import hudson.util.CascadingUtil;
 import java.util.concurrent.CopyOnWriteArraySet;
 import org.apache.commons.collections.ListUtils;
 import org.apache.commons.collections.MapUtils;
-import org.eclipse.hudson.api.model.project.property.AxisListProjectProperty;
-import org.eclipse.hudson.api.model.project.property.BaseProjectProperty;
-import org.eclipse.hudson.api.model.project.property.BooleanProjectProperty;
-import org.eclipse.hudson.api.model.project.property.DescribableListProjectProperty;
-import org.eclipse.hudson.api.model.project.property.ExternalProjectProperty;
-import org.eclipse.hudson.api.model.project.property.IntegerProjectProperty;
-import org.eclipse.hudson.api.model.project.property.LogRotatorProjectProperty;
-import org.eclipse.hudson.api.model.project.property.ResultProjectProperty;
-import org.eclipse.hudson.api.model.project.property.SCMProjectProperty;
-import org.eclipse.hudson.api.model.project.property.StringProjectProperty;
 import hudson.util.graph.GraphSeries;
 import hudson.widgets.Widget;
-import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import org.apache.commons.lang3.StringUtils;
@@ -99,6 +88,7 @@ import net.sf.json.JSONObject;
 
 import org.eclipse.hudson.api.model.IJob;
 import org.eclipse.hudson.api.model.IProjectProperty;
+import org.eclipse.hudson.api.model.project.property.ExternalProjectProperty;
 import org.jvnet.localizer.Localizable;
 import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.CmdLineException;
@@ -175,7 +165,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
 
     /**
      * List of {@link UserProperty}s configured for this project.
-     * According to new implementation {@link ParametersDefinitionProperty} were moved from this collection. So, this
+     * According to new implementation {@link org.eclipse.hudson.api.model.project.property.ParametersDefinitionProperty} were moved from this collection. So, this
      * field was left protected for backward compatibility. Don't use this field directly for adding or removing
      * values. Use {@link #addProperty(JobProperty)}, {@link #removeProperty(JobProperty)},
      * {@link #removeProperty(Class)} instead.
diff --git a/hudson-core/src/main/java/hudson/model/JobParameterValue.java b/hudson-core/src/main/java/hudson/model/JobParameterValue.java
index ff87d80..db188f3 100644
--- a/hudson-core/src/main/java/hudson/model/JobParameterValue.java
+++ b/hudson-core/src/main/java/hudson/model/JobParameterValue.java
@@ -20,7 +20,6 @@ import hudson.EnvVars;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import java.util.Locale;
-import java.util.Map;
 
 public class JobParameterValue extends ParameterValue {
     //TODO: review and check whether we can do it private
diff --git a/hudson-core/src/main/java/hudson/model/LoadBalancer.java b/hudson-core/src/main/java/hudson/model/LoadBalancer.java
index bd1b40b..9f2d51d 100644
--- a/hudson-core/src/main/java/hudson/model/LoadBalancer.java
+++ b/hudson-core/src/main/java/hudson/model/LoadBalancer.java
@@ -22,7 +22,6 @@ import hudson.model.queue.MappingWorksheet.ExecutorChunk;
 import hudson.model.queue.MappingWorksheet.Mapping;
 import hudson.util.ConsistentHash;
 import hudson.util.ConsistentHash.Hash;
-import hudson.matrix.MatrixConfiguration;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hudson-core/src/main/java/hudson/model/LoadStatistics.java b/hudson-core/src/main/java/hudson/model/LoadStatistics.java
index f2409af..dd685a4 100644
--- a/hudson-core/src/main/java/hudson/model/LoadStatistics.java
+++ b/hudson-core/src/main/java/hudson/model/LoadStatistics.java
@@ -21,7 +21,6 @@ import hudson.util.ColorPalette;
 import hudson.util.graph.MultiStageTimeSeries;
 import hudson.util.graph.MultiStageTimeSeries.TimeScale;
 import hudson.util.graph.MultiStageTimeSeries.TrendChart;
-import java.awt.Color;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.export.ExportedBean;
 import org.kohsuke.stapler.export.Exported;
diff --git a/hudson-core/src/main/java/hudson/model/OverallLoadStatistics.java b/hudson-core/src/main/java/hudson/model/OverallLoadStatistics.java
index bec3fb8..68d7762 100644
--- a/hudson-core/src/main/java/hudson/model/OverallLoadStatistics.java
+++ b/hudson-core/src/main/java/hudson/model/OverallLoadStatistics.java
@@ -20,7 +20,6 @@ import hudson.util.ColorPalette;
 import hudson.util.graph.MultiStageTimeSeries;
 import hudson.util.graph.MultiStageTimeSeries.TimeScale;
 import hudson.util.graph.MultiStageTimeSeries.TrendChart;
-import java.awt.Color;
 import org.kohsuke.stapler.export.Exported;
 
 /**
diff --git a/hudson-core/src/main/java/hudson/model/ParameterValue.java b/hudson-core/src/main/java/hudson/model/ParameterValue.java
index 84c6e97..5716df1 100644
--- a/hudson-core/src/main/java/hudson/model/ParameterValue.java
+++ b/hudson-core/src/main/java/hudson/model/ParameterValue.java
@@ -18,7 +18,6 @@ package hudson.model;
 
 import hudson.EnvVars;
 import hudson.Util;
-import hudson.slaves.OfflineCause;
 import hudson.tasks.BuildWrapper;
 import hudson.tasks.Builder;
 import hudson.util.VariableResolver;
@@ -26,16 +25,13 @@ import hudson.util.VariableResolver;
 import java.io.Serializable;
 import java.util.Map;
 
-import net.sf.json.JSONObject;
-
-import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 
 /**
  * A value for a parameter in a build.
  *
- * Created by {@link ParameterDefinition#createValue(StaplerRequest, JSONObject)} for
+ * Created by {@link ParameterDefinition#createValue(org.kohsuke.stapler.StaplerRequest, net.sf.json.JSONObject)} for
  * a particular build (although this 'owner' build object is passed in for every method
  * call as a parameter so that the parameter won't have to persist it.)
  *
diff --git a/hudson-core/src/main/java/hudson/model/Project.java b/hudson-core/src/main/java/hudson/model/Project.java
index 1c00dfa..328effa 100644
--- a/hudson-core/src/main/java/hudson/model/Project.java
+++ b/hudson-core/src/main/java/hudson/model/Project.java
@@ -18,25 +18,11 @@ package hudson.model;
 
 import hudson.Util;
 import hudson.diagnosis.OldDataMonitor;
-import hudson.model.Descriptor.FormException;
-import hudson.tasks.BuildStep;
-import hudson.tasks.BuildStepDescriptor;
-import hudson.tasks.BuildWrappers;
-import hudson.tasks.Builder;
 import hudson.tasks.Fingerprinter;
-import hudson.tasks.Publisher;
 import hudson.tasks.Maven;
 import hudson.tasks.Maven.ProjectWithMaven;
 import hudson.tasks.Maven.MavenInstallation;
-import hudson.util.CascadingUtil;
-import hudson.util.DescribableListUtil;
-import net.sf.json.JSONObject;
 import org.eclipse.hudson.api.model.IProject;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
-
-import javax.servlet.ServletException;
-import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/hudson-core/src/main/java/hudson/model/Queue.java b/hudson-core/src/main/java/hudson/model/Queue.java
index 046cf22..56277a8 100644
--- a/hudson-core/src/main/java/hudson/model/Queue.java
+++ b/hudson-core/src/main/java/hudson/model/Queue.java
@@ -83,7 +83,6 @@ import java.util.logging.Logger;
 import javax.management.timer.Timer;
 import javax.servlet.ServletException;
 
-import org.springframework.security.AccessDeniedException;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.export.Exported;
@@ -1039,7 +1038,7 @@ public class Queue extends ResourceController implements Saveable {
          * Checks the permission to see if the current user can abort this executable.
          * Returns normally from this method if it's OK.
          *
-         * @throws AccessDeniedException if the permission is not granted.
+         * @throws org.acegisecurity.AccessDeniedException if the permission is not granted.
          */
         void checkAbortPermission();
 
diff --git a/hudson-core/src/main/java/hudson/model/Result.java b/hudson-core/src/main/java/hudson/model/Result.java
index 5687d42..1964a71 100644
--- a/hudson-core/src/main/java/hudson/model/Result.java
+++ b/hudson-core/src/main/java/hudson/model/Result.java
@@ -18,7 +18,6 @@ package hudson.model;
 
 import com.thoughtworks.xstream.converters.SingleValueConverter;
 import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter;
-import hudson.Extension;
 import hudson.cli.declarative.OptionHandlerExtension;
 import hudson.util.EditDistance;
 import org.kohsuke.args4j.CmdLineException;
@@ -28,8 +27,6 @@ import org.kohsuke.args4j.spi.*;
 import org.kohsuke.stapler.export.CustomExportedBean;
 
 import java.io.Serializable;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/hudson-core/src/main/java/hudson/model/Run.java b/hudson-core/src/main/java/hudson/model/Run.java
index dd02057..271d46c 100644
--- a/hudson-core/src/main/java/hudson/model/Run.java
+++ b/hudson-core/src/main/java/hudson/model/Run.java
@@ -89,7 +89,6 @@ import net.sf.json.JSONObject;
 import org.apache.commons.io.input.NullInputStream;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.QueryParameter;
diff --git a/hudson-core/src/main/java/hudson/model/RunParameterDefinition.java b/hudson-core/src/main/java/hudson/model/RunParameterDefinition.java
index 4ae2053..b3cff9e 100644
--- a/hudson-core/src/main/java/hudson/model/RunParameterDefinition.java
+++ b/hudson-core/src/main/java/hudson/model/RunParameterDefinition.java
@@ -24,9 +24,6 @@ import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.export.Exported;
 import hudson.Extension;
-import hudson.cli.CLICommand;
-
-import java.io.IOException;
 
 public class RunParameterDefinition extends SimpleParameterDefinition {
 
diff --git a/hudson-core/src/main/java/hudson/model/Saveable.java b/hudson-core/src/main/java/hudson/model/Saveable.java
index f59e243..a3be7fd 100644
--- a/hudson-core/src/main/java/hudson/model/Saveable.java
+++ b/hudson-core/src/main/java/hudson/model/Saveable.java
@@ -16,15 +16,13 @@
 
 package hudson.model;
 
-import hudson.BulkChange;
-import hudson.model.listeners.SaveableListener;
 import java.io.IOException;
 
 /**
  * Object whose state is persisted to XML.
  *
  * @author Kohsuke Kawaguchi
- * @see BulkChange
+ * @see hudson.BulkChange
  * @since 1.249
  */
 public interface Saveable {
@@ -32,10 +30,10 @@ public interface Saveable {
      * Persists the state of this object into XML.
      *
      * <p>
-     * For making a bulk change efficiently, see {@link BulkChange}.
+     * For making a bulk change efficiently, see {@link hudson.BulkChange}.
      *
      * <p>
-     * To support listeners monitoring changes to this object, call {@link SaveableListener.fireOnChange}
+     * To support listeners monitoring changes to this object, call {@link hudson.model.listeners.SaveableListener#fireOnChange(Saveable, hudson.XmlFile)}
      * @throws IOException
      *      if the persistence failed.
      */
diff --git a/hudson-core/src/main/java/hudson/model/StringParameterValue.java b/hudson-core/src/main/java/hudson/model/StringParameterValue.java
index 107fd57..e25294c 100644
--- a/hudson-core/src/main/java/hudson/model/StringParameterValue.java
+++ b/hudson-core/src/main/java/hudson/model/StringParameterValue.java
@@ -21,7 +21,6 @@ import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.export.Exported;
 
 import java.util.Locale;
-import java.util.Map;
 
 import hudson.util.VariableResolver;
 
diff --git a/hudson-core/src/main/java/hudson/model/View.java b/hudson-core/src/main/java/hudson/model/View.java
index 6d23f3a..2d0b4bb 100644
--- a/hudson-core/src/main/java/hudson/model/View.java
+++ b/hudson-core/src/main/java/hudson/model/View.java
@@ -35,7 +35,6 @@ import hudson.util.RunList;
 import hudson.widgets.Widget;
 
 import java.io.IOException;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
diff --git a/hudson-core/src/main/java/hudson/model/labels/LabelAtom.java b/hudson-core/src/main/java/hudson/model/labels/LabelAtom.java
index c0d6489..cb17457 100644
--- a/hudson-core/src/main/java/hudson/model/labels/LabelAtom.java
+++ b/hudson-core/src/main/java/hudson/model/labels/LabelAtom.java
@@ -28,7 +28,6 @@ import hudson.model.Descriptor.FormException;
 import hudson.model.Failure;
 import hudson.model.Hudson;
 import hudson.model.Label;
-import hudson.model.Messages;
 import hudson.model.Saveable;
 import hudson.model.listeners.SaveableListener;
 import hudson.util.DescribableList;
diff --git a/hudson-core/src/main/java/hudson/model/labels/LabelAtomProperty.java b/hudson-core/src/main/java/hudson/model/labels/LabelAtomProperty.java
index 1c06979..0d39b29 100644
--- a/hudson-core/src/main/java/hudson/model/labels/LabelAtomProperty.java
+++ b/hudson-core/src/main/java/hudson/model/labels/LabelAtomProperty.java
@@ -21,8 +21,6 @@ import hudson.ExtensionPoint;
 import hudson.model.AbstractDescribableImpl;
 import hudson.model.Action;
 import hudson.model.Hudson;
-import hudson.slaves.NodeDescriptor;
-import hudson.slaves.NodePropertyDescriptor;
 import org.kohsuke.stapler.export.ExportedBean;
 
 import java.util.Collection;
diff --git a/hudson-core/src/main/java/hudson/model/listeners/RunListener.java b/hudson-core/src/main/java/hudson/model/listeners/RunListener.java
index 5859678..81195f3 100644
--- a/hudson-core/src/main/java/hudson/model/listeners/RunListener.java
+++ b/hudson-core/src/main/java/hudson/model/listeners/RunListener.java
@@ -19,12 +19,9 @@ package hudson.model.listeners;
 import hudson.ExtensionPoint;
 import hudson.ExtensionListView;
 import hudson.Extension;
-import hudson.DescriptorExtensionList;
 import hudson.ExtensionList;
-import hudson.scm.RepositoryBrowser;
 import hudson.model.Run;
 import hudson.model.TaskListener;
-import hudson.model.Descriptor;
 import hudson.model.Hudson;
 import hudson.util.CopyOnWriteList;
 import org.jvnet.tiger_types.Types;
diff --git a/hudson-core/src/main/java/hudson/model/listeners/SaveableListener.java b/hudson-core/src/main/java/hudson/model/listeners/SaveableListener.java
index 16906a1..fb8e359 100644
--- a/hudson-core/src/main/java/hudson/model/listeners/SaveableListener.java
+++ b/hudson-core/src/main/java/hudson/model/listeners/SaveableListener.java
@@ -17,13 +17,11 @@
 package hudson.model.listeners;
 
 import hudson.ExtensionPoint;
-import hudson.ExtensionListView;
 import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.XmlFile;
 import hudson.model.Hudson;
 import hudson.model.Saveable;
-import hudson.util.CopyOnWriteList;
 
 /**
  * Receives notifications about save actions on {@link Saveable} objects in Hudson.
diff --git a/hudson-core/src/main/java/hudson/model/queue/QueueSorter.java b/hudson-core/src/main/java/hudson/model/queue/QueueSorter.java
index d59786e..76155cb 100644
--- a/hudson-core/src/main/java/hudson/model/queue/QueueSorter.java
+++ b/hudson-core/src/main/java/hudson/model/queue/QueueSorter.java
@@ -18,7 +18,6 @@ import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.init.Initializer;
 import hudson.model.Hudson;
-import hudson.model.LoadBalancer;
 import hudson.model.Queue;
 import hudson.model.Queue.BuildableItem;
 
@@ -53,7 +52,7 @@ public abstract class QueueSorter implements ExtensionPoint {
     /**
      * Installs the default queue sorter.
      *
-     * {@link Queue#Queue(LoadBalancer)} is too early to do this
+     * {@link Queue#Queue(hudson.model.LoadBalancer)} is too early to do this
      */
     @Initializer(after=JOB_LOADED)
     public static void installDefaultQueueSorter() {
diff --git a/hudson-core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java b/hudson-core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
index 96fc3b5..2341409 100644
--- a/hudson-core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
+++ b/hudson-core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
@@ -16,7 +16,6 @@
 
 package hudson.node_monitors;
 
-import hudson.Functions.ThreadGroupMap;
 import hudson.model.Computer;
 import hudson.model.Descriptor;
 import hudson.model.Hudson;
diff --git a/hudson-core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java b/hudson-core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java
index 2f8da67..9d1948b 100644
--- a/hudson-core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java
+++ b/hudson-core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java
@@ -22,7 +22,6 @@ import hudson.model.Computer;
 import hudson.model.Hudson;
 import hudson.remoting.Callable;
 import hudson.util.jna.NativeAccessException;
-import hudson.util.jna.NativeFunction;
 import hudson.util.jna.NativeUtils;
 import hudson.util.jna.NativeSystemMemory;
 import net.sf.json.JSONObject;
diff --git a/hudson-core/src/main/java/hudson/scm/ChangeLogSet.java b/hudson-core/src/main/java/hudson/scm/ChangeLogSet.java
index 4114097..7989422 100644
--- a/hudson-core/src/main/java/hudson/scm/ChangeLogSet.java
+++ b/hudson-core/src/main/java/hudson/scm/ChangeLogSet.java
@@ -19,7 +19,6 @@ package hudson.scm;
 import hudson.MarkupText;
 import hudson.Util;
 import hudson.model.AbstractBuild;
-import hudson.model.User;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/hudson-core/src/main/java/hudson/scm/EmptyChangeLogSet.java b/hudson-core/src/main/java/hudson/scm/EmptyChangeLogSet.java
index 2d97fdb..bcdabe3 100644
--- a/hudson-core/src/main/java/hudson/scm/EmptyChangeLogSet.java
+++ b/hudson-core/src/main/java/hudson/scm/EmptyChangeLogSet.java
@@ -20,7 +20,6 @@ import hudson.model.AbstractBuild;
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 
 /**
  * {@link ChangeLogSet} that's empty.
diff --git a/hudson-core/src/main/java/hudson/scm/PollingResult.java b/hudson-core/src/main/java/hudson/scm/PollingResult.java
index 5a652af..ffd4d57 100644
--- a/hudson-core/src/main/java/hudson/scm/PollingResult.java
+++ b/hudson-core/src/main/java/hudson/scm/PollingResult.java
@@ -14,15 +14,10 @@
 
 package hudson.scm;
 
-import hudson.model.AbstractProject;
-import hudson.model.TaskListener;
-import hudson.Launcher;
-import hudson.FilePath;
-
 import java.io.Serializable;
 
 /**
- * Immutable object that represents the result of {@linkplain SCM#poll(AbstractProject, Launcher, FilePath, TaskListener, SCMRevisionState) SCM polling}.
+ * Immutable object that represents the result of {@linkplain SCM#poll(hudson.model.AbstractProject, hudson.Launcher, hudson.FilePath, hudson.model.TaskListener, SCMRevisionState) SCM polling}.
  *
  * <p>
  * This object is marked serializable just to be remoting friendly &mdash; Hudson by itself
diff --git a/hudson-core/src/main/java/hudson/scm/RepositoryBrowsers.java b/hudson-core/src/main/java/hudson/scm/RepositoryBrowsers.java
index d616c38..34472ed 100644
--- a/hudson-core/src/main/java/hudson/scm/RepositoryBrowsers.java
+++ b/hudson-core/src/main/java/hudson/scm/RepositoryBrowsers.java
@@ -17,9 +17,7 @@
 package hudson.scm;
 
 import hudson.model.Descriptor;
-import hudson.model.Hudson;
 import hudson.model.Descriptor.FormException;
-import hudson.scm.browsers.*;
 import hudson.util.DescriptorList;
 import hudson.Extension;
 import org.kohsuke.stapler.StaplerRequest;
@@ -28,7 +26,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.sf.json.JSONObject;
-import net.sf.json.JSONArray;
 
 /**
  * List of all installed {@link RepositoryBrowsers}.
diff --git a/hudson-core/src/main/java/hudson/scm/SCMRevisionState.java b/hudson-core/src/main/java/hudson/scm/SCMRevisionState.java
index e5061dd..b0a5777 100644
--- a/hudson-core/src/main/java/hudson/scm/SCMRevisionState.java
+++ b/hudson-core/src/main/java/hudson/scm/SCMRevisionState.java
@@ -14,17 +14,12 @@
 
 package hudson.scm;
 
-import hudson.FilePath;
-import hudson.Launcher;
-import hudson.model.AbstractBuild;
-import hudson.model.AbstractProject;
 import hudson.model.Action;
-import hudson.model.TaskListener;
 
 /**
  * Immutable object that represents revisions of the files in the repository,
  * used to represent the result of
- * {@linkplain SCM#poll(AbstractProject, Launcher, FilePath, TaskListener, SCMRevisionState) a SCM polling}.
+ * {@linkplain SCM#poll(hudson.model.AbstractProject, hudson.Launcher, hudson.FilePath, hudson.model.TaskListener, SCMRevisionState) a SCM polling}.
  *
  * <p>
  * This object is used so that the successive polling can compare the tip of the repository now vs
@@ -32,7 +27,7 @@ import hudson.model.TaskListener;
  * of the repository vs the state of the workspace, which resulted in a problem like HUDSON-2180.
  *
  * <p>
- * {@link SCMRevisionState} is persisted as an action to {@link AbstractBuild}.
+ * {@link SCMRevisionState} is persisted as an action to {@link hudson.model.AbstractBuild}.
  *
  * @author Kohsuke Kawaguchi
  * @since 1.345
diff --git a/hudson-core/src/main/java/hudson/scm/SCMS.java b/hudson-core/src/main/java/hudson/scm/SCMS.java
index bc8f5c3..c866639 100644
--- a/hudson-core/src/main/java/hudson/scm/SCMS.java
+++ b/hudson-core/src/main/java/hudson/scm/SCMS.java
@@ -16,12 +16,9 @@
 
 package hudson.scm;
 
-import hudson.model.Descriptor;
-import hudson.model.Hudson;
 import hudson.model.AbstractProject;
 import hudson.model.Descriptor.FormException;
 import hudson.util.DescriptorList;
-import hudson.DescriptorExtensionList;
 import hudson.Extension;
 
 import java.util.List;
diff --git a/hudson-core/src/main/java/hudson/security/ACL.java b/hudson-core/src/main/java/hudson/security/ACL.java
index a7c47a5..832b4dd 100644
--- a/hudson-core/src/main/java/hudson/security/ACL.java
+++ b/hudson-core/src/main/java/hudson/security/ACL.java
@@ -16,7 +16,6 @@
 
 package hudson.security;
 
-import org.springframework.security.AccessDeniedException;
 import org.springframework.security.Authentication;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.security.acls.sid.PrincipalSid;
@@ -37,7 +36,7 @@ public abstract class ACL {
      * <p>
      * This is just a convenience function.
      *
-     * @throws AccessDeniedException
+     * @throws org.acegisecurity.AccessDeniedException
      *      if the user doesn't have the permission.
      */
     public final void checkPermission(Permission p) {
diff --git a/hudson-core/src/main/java/hudson/security/BasicAuthenticationFilter.java b/hudson-core/src/main/java/hudson/security/BasicAuthenticationFilter.java
index 74a5b74..28ee7db 100644
--- a/hudson-core/src/main/java/hudson/security/BasicAuthenticationFilter.java
+++ b/hudson-core/src/main/java/hudson/security/BasicAuthenticationFilter.java
@@ -20,8 +20,6 @@ import hudson.model.Hudson;
 import hudson.util.Scrambler;
 import org.springframework.security.GrantedAuthorityImpl;
 import org.springframework.security.context.SecurityContextHolder;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
@@ -55,7 +53,7 @@ import java.net.URLEncoder;
  * This causes the container to perform authentication, but there's no way
  * to find out whether the user has been successfully authenticated or not.
  * So to find this out, we then redirect the user to
- * {@link Hudson#doSecured(StaplerRequest, StaplerResponse) <tt>/secured/...</tt> page}.
+ * {@link Hudson#doSecured(org.kohsuke.stapler.StaplerRequest, org.kohsuke.stapler.StaplerResponse) <tt>/secured/...</tt> page}.
  *
  * <p>
  * The handler of the above URL checks if the user is authenticated,
diff --git a/hudson-core/src/main/java/hudson/security/LDAPSecurityRealm.java b/hudson-core/src/main/java/hudson/security/LDAPSecurityRealm.java
index 176f516..356a562 100644
--- a/hudson-core/src/main/java/hudson/security/LDAPSecurityRealm.java
+++ b/hudson-core/src/main/java/hudson/security/LDAPSecurityRealm.java
@@ -33,7 +33,6 @@ import org.springframework.security.GrantedAuthority;
 import org.springframework.security.SpringSecurityException;
 import org.springframework.security.AuthenticationException;
 import org.springframework.ldap.core.ContextSource;
-import org.springframework.security.ldap.LdapDataAccessException;
 import org.springframework.security.ldap.LdapUserSearch;
 import org.springframework.security.ldap.search.FilterBasedLdapUserSearch;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
diff --git a/hudson-core/src/main/java/hudson/security/ProjectMatrixAuthorizationStrategy.java b/hudson-core/src/main/java/hudson/security/ProjectMatrixAuthorizationStrategy.java
index d526c86..ddcac5d 100644
--- a/hudson-core/src/main/java/hudson/security/ProjectMatrixAuthorizationStrategy.java
+++ b/hudson-core/src/main/java/hudson/security/ProjectMatrixAuthorizationStrategy.java
@@ -19,7 +19,6 @@ package hudson.security;
 import hudson.model.Descriptor;
 import hudson.model.Hudson;
 import hudson.model.Job;
-import hudson.model.TopLevelItem;
 import hudson.util.RobustReflectionConverter;
 import hudson.Extension;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
diff --git a/hudson-core/src/main/java/hudson/slaves/ComputerLauncher.java b/hudson-core/src/main/java/hudson/slaves/ComputerLauncher.java
index 38c4425..610bd8d 100644
--- a/hudson-core/src/main/java/hudson/slaves/ComputerLauncher.java
+++ b/hudson-core/src/main/java/hudson/slaves/ComputerLauncher.java
@@ -19,13 +19,10 @@ package hudson.slaves;
 import hudson.ExtensionPoint;
 import hudson.Extension;
 import hudson.model.*;
-import hudson.remoting.Channel;
 import hudson.util.DescriptorList;
 import hudson.util.StreamTaskListener;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 
 /**
  * Extension point to allow control over how {@link Computer}s are "launched",
@@ -56,7 +53,7 @@ public abstract class ComputerLauncher extends AbstractDescribableImpl<ComputerL
      * Launches the slave agent for the given {@link Computer}.
      *
      * <p>
-     * If the slave agent is launched successfully, {@link SlaveComputer#setChannel(InputStream, OutputStream, TaskListener, Channel.Listener)}
+     * If the slave agent is launched successfully, {@link SlaveComputer#setChannel(java.io.InputStream, java.io.OutputStream, TaskListener, hudson.remoting.Channel.Listener)}
      * should be invoked in the end to notify Hudson of the established connection.
      * The operation could also fail, in which case there's no need to make any callback notification,
      * (except to notify the user of the failure through {@link StreamTaskListener}.)
diff --git a/hudson-core/src/main/java/hudson/tasks/ArtifactArchiver.java b/hudson-core/src/main/java/hudson/tasks/ArtifactArchiver.java
index 734836e..6037634 100644
--- a/hudson-core/src/main/java/hudson/tasks/ArtifactArchiver.java
+++ b/hudson-core/src/main/java/hudson/tasks/ArtifactArchiver.java
@@ -23,7 +23,6 @@ import hudson.Util;
 import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
 import hudson.model.BuildListener;
-import hudson.model.Descriptor;
 import hudson.model.Hudson;
 import hudson.model.Result;
 import hudson.util.FormValidation;
diff --git a/hudson-core/src/main/java/hudson/tasks/BuildStepCompatibilityLayer.java b/hudson-core/src/main/java/hudson/tasks/BuildStepCompatibilityLayer.java
index e959b03..6077110 100644
--- a/hudson-core/src/main/java/hudson/tasks/BuildStepCompatibilityLayer.java
+++ b/hudson-core/src/main/java/hudson/tasks/BuildStepCompatibilityLayer.java
@@ -22,8 +22,6 @@ import hudson.model.Action;
 import hudson.model.Project;
 import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
-import hudson.model.Run;
-import hudson.model.CheckPoint;
 import hudson.Launcher;
 
 import java.io.IOException;
diff --git a/hudson-core/src/main/java/hudson/tasks/test/TestResultParser.java b/hudson-core/src/main/java/hudson/tasks/test/TestResultParser.java
index c57364a..1c48efd 100644
--- a/hudson-core/src/main/java/hudson/tasks/test/TestResultParser.java
+++ b/hudson-core/src/main/java/hudson/tasks/test/TestResultParser.java
@@ -16,14 +16,12 @@
 
 package hudson.tasks.test;
 
-import hudson.AbortException;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.Launcher;
 import hudson.model.AbstractBuild;
 import hudson.model.Hudson;
 import hudson.model.TaskListener;
-import hudson.tasks.Publisher;
 
 import java.io.IOException;
 
@@ -33,15 +31,15 @@ import java.io.IOException;
  * <p>
  * This extension point encapsulates the knowledge of a particular test report format and its parsing process,
  * thereby improving the pluggability of test result parsing; integration with a new test tool can be done
- * by just writing a parser, without writing a custom {@link Publisher}, and the test reports are displayed
+ * by just writing a parser, without writing a custom {@link hudson.tasks.Publisher}, and the test reports are displayed
  * with the default UI and recognized by the rest of Hudson as test reports.
  *
  * <p>
  * Most typical implementations of this class should extend from {@link DefaultTestResultParserImpl},
- * which handles a set of default error checks on user inputs. 
+ * which handles a set of default error checks on user inputs.
  *
  * <p>
- * Parsers are stateless, and the {@link #parse(String, AbstractBuild, Launcher, TaskListener)} method
+ * Parsers are stateless, and the {@link #parse(String, hudson.model.AbstractBuild, hudson.Launcher, hudson.model.TaskListener)} method
  * can be concurrently invoked by multiple threads for different builds.
  *
  * @since 1.343
diff --git a/hudson-core/src/main/java/hudson/triggers/Trigger.java b/hudson-core/src/main/java/hudson/triggers/Trigger.java
index 1f761da..041d4ce 100644
--- a/hudson-core/src/main/java/hudson/triggers/Trigger.java
+++ b/hudson-core/src/main/java/hudson/triggers/Trigger.java
@@ -23,7 +23,6 @@ import hudson.ExtensionPoint;
 import hudson.DescriptorExtensionList;
 import hudson.Extension;
 import hudson.init.Initializer;
-import hudson.init.InitMilestone;
 import static hudson.init.InitMilestone.JOB_LOADED;
 import hudson.model.AbstractProject;
 import hudson.model.Action;
diff --git a/hudson-core/src/main/java/hudson/triggers/Triggers.java b/hudson-core/src/main/java/hudson/triggers/Triggers.java
index 9e5b2d9..239d06e 100644
--- a/hudson-core/src/main/java/hudson/triggers/Triggers.java
+++ b/hudson-core/src/main/java/hudson/triggers/Triggers.java
@@ -16,13 +16,11 @@
 
 package hudson.triggers;
 
-import hudson.model.Descriptor;
 import hudson.model.Item;
 import hudson.util.DescriptorList;
 import hudson.Extension;
 
 import java.util.List;
-import java.util.ArrayList;
 
 /**
  * List of all installed {@link Trigger}s.
diff --git a/hudson-core/src/main/java/hudson/util/ComboBoxModel.java b/hudson-core/src/main/java/hudson/util/ComboBoxModel.java
index c4c9813..a3fe3fc 100644
--- a/hudson-core/src/main/java/hudson/util/ComboBoxModel.java
+++ b/hudson-core/src/main/java/hudson/util/ComboBoxModel.java
@@ -26,7 +26,6 @@ import javax.servlet.ServletException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 
 import static java.util.Arrays.asList;
diff --git a/hudson-core/src/main/java/hudson/util/FormFieldValidator.java b/hudson-core/src/main/java/hudson/util/FormFieldValidator.java
index ca1441e..7005f5b 100644
--- a/hudson-core/src/main/java/hudson/util/FormFieldValidator.java
+++ b/hudson-core/src/main/java/hudson/util/FormFieldValidator.java
@@ -21,7 +21,6 @@ import hudson.EnvVars;
 import hudson.FilePath;
 import hudson.ProxyConfiguration;
 import hudson.Util;
-import hudson.tasks.JavadocArchiver;
 import hudson.model.AbstractProject;
 import hudson.model.Hudson;
 import hudson.model.Item;
@@ -393,7 +392,7 @@ public abstract class FormFieldValidator {
      * the current workspace.
      * @since 1.116
      * @deprecated as of 1.294. Use {@link FilePath#validateRelativeDirectory(String, boolean)}
-     *      (see {@link JavadocArchiver.DescriptorImpl#doCheck(AbstractProject, String)}
+     *      (see {@link hudson.tasks.JavadocArchiver.DescriptorImpl#doCheck(AbstractProject, String)}
      */
     public static class WorkspaceDirectory extends WorkspaceFilePath {
         public WorkspaceDirectory(StaplerRequest request, StaplerResponse response, boolean errorIfNotExist) {
diff --git a/hudson-core/src/main/java/hudson/util/FormValidation.java b/hudson-core/src/main/java/hudson/util/FormValidation.java
index 6c37afa..ff60bd6 100644
--- a/hudson-core/src/main/java/hudson/util/FormValidation.java
+++ b/hudson-core/src/main/java/hudson/util/FormValidation.java
@@ -18,13 +18,9 @@ package hudson.util;
 
 import hudson.EnvVars;
 import hudson.Functions;
-import hudson.Launcher;
 import hudson.ProxyConfiguration;
 import hudson.Util;
 import hudson.FilePath;
-import hudson.model.AbstractBuild;
-import hudson.model.BuildListener;
-import hudson.tasks.Builder;
 import static hudson.Util.fixEmpty;
 import hudson.model.Hudson;
 import org.kohsuke.stapler.HttpResponse;
@@ -82,7 +78,7 @@ import java.util.Locale;
  *
  * ...
  *
- * public void {@linkplain Builder#perform(AbstractBuild, Launcher, BuildListener) perform}(...) {
+ * public void {@linkplain hudson.tasks.Builder#perform(hudson.model.AbstractBuild, hudson.Launcher, hudson.model.BuildListener) perform}(...) {
  *     String version = getAntVersion(antHome);
  *     ...
  * }
diff --git a/hudson-core/src/main/java/hudson/util/ProcessKiller.java b/hudson-core/src/main/java/hudson/util/ProcessKiller.java
index 7a86604..2f3a4aa 100644
--- a/hudson-core/src/main/java/hudson/util/ProcessKiller.java
+++ b/hudson-core/src/main/java/hudson/util/ProcessKiller.java
@@ -19,7 +19,6 @@ package hudson.util;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.model.Hudson;
-import hudson.util.ProcessTree.OSProcess;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -32,18 +31,18 @@ import java.io.Serializable;
  * <p>
  * Each implementation of {@link ProcessKiller} is instantiated once on the master.
  * Whenever a process needs to be killed, those implementations are serialized and sent over
- * to the appropriate slave, then the {@link #kill(OSProcess)} method is invoked
+ * to the appropriate slave, then the {@link #kill(hudson.util.ProcessTree.OSProcess)} method is invoked
  * to attempt to kill the process.
  *
  * <p>
  * One of the consequences of this design is that the implementation should be stateless
- * and concurrent-safe. That is, the {@link #kill(OSProcess)} method can be invoked by multiple threads
+ * and concurrent-safe. That is, the {@link #kill(hudson.util.ProcessTree.OSProcess)} method can be invoked by multiple threads
  * concurrently on the single instance.
  *
  * <p>
  * Another consequence of this design is that if your {@link ProcessKiller} requires configuration,
  * it needs to be serializable, and configuration needs to be updated atomically, as another
- * thread may be calling into {@link #kill(OSProcess)} just when you are updating your configuration.
+ * thread may be calling into {@link #kill(hudson.util.ProcessTree.OSProcess)} just when you are updating your configuration.
  *
  * @author jpederzolli
  * @author Kohsuke Kawaguchi
diff --git a/hudson-core/src/main/java/hudson/util/ReflectionUtils.java b/hudson-core/src/main/java/hudson/util/ReflectionUtils.java
index f5417c7..a392666 100644
--- a/hudson-core/src/main/java/hudson/util/ReflectionUtils.java
+++ b/hudson-core/src/main/java/hudson/util/ReflectionUtils.java
@@ -21,7 +21,6 @@ import org.kohsuke.stapler.ClassDescriptor;
 
 import java.beans.PropertyDescriptor;
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IProject.java b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IProject.java
index 5151a05..4871b73 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IProject.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IProject.java
@@ -20,7 +20,6 @@ import hudson.tasks.Builder;
 import hudson.tasks.Publisher;
 import java.util.List;
 import java.util.Map;
-import org.eclipse.hudson.api.model.IAbstractProject;
 
 /**
  * Project interface
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/AxisListProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/AxisListProjectProperty.java
index 4ef3eef..4e92283 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/AxisListProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/AxisListProjectProperty.java
@@ -16,7 +16,6 @@
 package org.eclipse.hudson.api.model.project.property;
 
 import hudson.matrix.AxisList;
-import org.apache.commons.lang3.ObjectUtils;
 import org.eclipse.hudson.api.model.IJob;
 
 /**
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/BooleanProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/BooleanProjectProperty.java
index 73a2750..786de4a 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/BooleanProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/BooleanProjectProperty.java
@@ -15,7 +15,6 @@
 package org.eclipse.hudson.api.model.project.property;
 
 import org.eclipse.hudson.api.model.IJob;
-import org.eclipse.hudson.api.model.project.property.BaseProjectProperty;
 
 /**
  * Represents boolean property.
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/IntegerProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/IntegerProjectProperty.java
index 482f231..be099b2 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/IntegerProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/IntegerProjectProperty.java
@@ -15,7 +15,6 @@
 package org.eclipse.hudson.api.model.project.property;
 
 import org.eclipse.hudson.api.model.IJob;
-import org.eclipse.hudson.api.model.project.property.BaseProjectProperty;
 
 /**
  * Represents integer property.
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/StringProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/StringProjectProperty.java
index 9565332..d4b499d 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/StringProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/StringProjectProperty.java
@@ -17,7 +17,6 @@ package org.eclipse.hudson.api.model.project.property;
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.hudson.api.model.IJob;
-import org.eclipse.hudson.api.model.project.property.BaseProjectProperty;
 
 /**
  * String property for project.