diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 41ee6e1558..1f89558d83 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -322,6 +322,13 @@ THE SOFTWARE.
1.1
true
+
+
+ findbugs
+ annotations
+ 1.0.0
+ provided
+
junit
diff --git a/maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java b/maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
index 9dce13ea33..c3ea0c2931 100644
--- a/maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
+++ b/maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
@@ -150,6 +150,7 @@ public abstract class AbstractMavenProcessFactory
private static final long serialVersionUID = 1L;
static final class AcceptorImpl implements Acceptor, Serializable {
+ private static final long serialVersionUID = -2226788819948521018L;
private transient final ServerSocket serverSocket;
private transient Socket socket;
@@ -184,6 +185,8 @@ public abstract class AbstractMavenProcessFactory
}
private static final class GetCharset implements Callable {
+ private static final long serialVersionUID = 3459269768733083577L;
+
public String call() throws IOException {
return System.getProperty("file.encoding");
}
@@ -309,6 +312,8 @@ public abstract class AbstractMavenProcessFactory
protected static final class GetRemotingJar implements Callable {
+ private static final long serialVersionUID = 6022357183425911351L;
+
public String call() throws IOException {
return Which.jarFile(hudson.remoting.Launcher.class).getPath();
}
diff --git a/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java b/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java
index 26a7c66f97..645916ddef 100644
--- a/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java
+++ b/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java
@@ -53,6 +53,7 @@ import org.kohsuke.stapler.Stapler;
* @author Kohsuke Kawaguchi
*/
public final class ExecutedMojo implements Serializable {
+ private static final long serialVersionUID = -3048316415397586490L;
/**
* Plugin group ID.
*/
@@ -149,7 +150,7 @@ public final class ExecutedMojo implements Serializable {
*
* TODO: better if XStream has a declarative way of marking fields as "target for intern".
*/
- ExecutedMojo readResolve() {
+ protected Object readResolve() {
return new ExecutedMojo(intern(groupId),intern(artifactId),intern(version),intern(goal),intern(executionId),duration,intern(digest));
}
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
index 7f5654d7d3..fda22e7b75 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
@@ -27,7 +27,6 @@ package hudson.maven;
import static hudson.model.Result.FAILURE;
import hudson.AbortException;
import hudson.EnvVars;
-import hudson.ExtensionList;
import hudson.FilePath;
import hudson.FilePath.FileCallable;
import hudson.Launcher;
@@ -39,7 +38,6 @@ import hudson.maven.reporters.MavenMailer;
import hudson.maven.settings.GlobalMavenSettingsProvider;
import hudson.maven.settings.MavenSettingsProvider;
import hudson.maven.settings.SettingsProviderUtils;
-import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.Action;
import hudson.model.Build;
@@ -68,7 +66,6 @@ import hudson.util.IOUtils;
import hudson.util.MaskingClassLoader;
import hudson.util.StreamTaskListener;
-import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InterruptedIOException;
@@ -88,7 +85,6 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.BuildFailureException;
@@ -101,7 +97,6 @@ import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
import org.codehaus.plexus.util.PathTool;
-import org.jenkinsci.lib.configprovider.ConfigProvider;
import org.jenkinsci.lib.configprovider.model.Config;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
index c40df980c2..071a6e7da1 100755
--- a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
@@ -52,6 +52,8 @@ import org.apache.maven.artifact.versioning.ComparableVersion;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* @author Kohsuke Kawaguchi
*/
@@ -90,7 +92,7 @@ public class MavenUtil {
Properties systemProperties = null;
String privateRepository = null;
- AbstractProject project = build.getProject();
+ AbstractProject,?> project = build.getProject();
if (project instanceof ProjectWithMaven) {
m = ((ProjectWithMaven) project).inferMavenInstallation().forNode(Jenkins.getInstance(),listener);
@@ -136,6 +138,7 @@ public class MavenUtil {
* Creates a fresh {@link MavenEmbedder} instance.
*
*/
+ @SuppressWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")
public static MavenEmbedder createEmbedder(MavenEmbedderRequest mavenEmbedderRequest) throws MavenEmbedderException, IOException {
diff --git a/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java b/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java
index 90660fbb61..d8b462b1a2 100644
--- a/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java
+++ b/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java
@@ -138,7 +138,7 @@ public final class ModuleDependency implements Serializable {
/**
* Upon reading from the disk, intern strings.
*/
- public ModuleDependency readResolve() {
+ protected Object readResolve() {
return new ModuleDependency(groupId,artifactId,version,plugin);
}