diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java
index 18b56f2ca4..2a4fa57fd2 100644
--- a/core/src/main/java/hudson/tasks/Maven.java
+++ b/core/src/main/java/hudson/tasks/Maven.java
@@ -38,11 +38,11 @@ import hudson.model.Computer;
import hudson.model.EnvironmentSpecific;
import hudson.model.Node;
import jenkins.model.Jenkins;
+import jenkins.mvn.DefaultGlobalSettingsProvider;
+import jenkins.mvn.DefaultSettingsProvider;
+import jenkins.mvn.GlobalSettingsProvider;
+import jenkins.mvn.SettingsProvider;
import hudson.model.TaskListener;
-import hudson.mvn.DefaultGlobalSettingsProvider;
-import hudson.mvn.DefaultSettingsProvider;
-import hudson.mvn.GlobalSettingsProvider;
-import hudson.mvn.SettingsProvider;
import hudson.remoting.Callable;
import hudson.remoting.VirtualChannel;
import hudson.slaves.NodeSpecific;
@@ -127,13 +127,13 @@ public class Maven extends Builder {
/**
* Provides access to the settings.xml to be used for a build.
- * @since 1.481
+ * @since 1.488
*/
private SettingsProvider settings = new DefaultSettingsProvider();
/**
* Provides access to the global settings.xml to be used for a build.
- * @since 1.481
+ * @since 1.488
*/
private GlobalSettingsProvider globalSettings = new DefaultGlobalSettingsProvider();
diff --git a/core/src/main/java/hudson/mvn/DefaultGlobalSettingsProvider.java b/core/src/main/java/jenkins/mvn/DefaultGlobalSettingsProvider.java
similarity index 97%
rename from core/src/main/java/hudson/mvn/DefaultGlobalSettingsProvider.java
rename to core/src/main/java/jenkins/mvn/DefaultGlobalSettingsProvider.java
index 0a1b805ada..1eb5c462be 100644
--- a/core/src/main/java/hudson/mvn/DefaultGlobalSettingsProvider.java
+++ b/core/src/main/java/jenkins/mvn/DefaultGlobalSettingsProvider.java
@@ -1,4 +1,4 @@
-package hudson.mvn;
+package jenkins.mvn;
import hudson.Extension;
import hudson.FilePath;
diff --git a/core/src/main/java/hudson/mvn/DefaultSettingsProvider.java b/core/src/main/java/jenkins/mvn/DefaultSettingsProvider.java
similarity index 97%
rename from core/src/main/java/hudson/mvn/DefaultSettingsProvider.java
rename to core/src/main/java/jenkins/mvn/DefaultSettingsProvider.java
index 117d41a1c4..a18a0b1f60 100644
--- a/core/src/main/java/hudson/mvn/DefaultSettingsProvider.java
+++ b/core/src/main/java/jenkins/mvn/DefaultSettingsProvider.java
@@ -1,4 +1,4 @@
-package hudson.mvn;
+package jenkins.mvn;
import hudson.Extension;
import hudson.FilePath;
diff --git a/core/src/main/java/hudson/mvn/FilePathGlobalSettingsProvider.java b/core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java
similarity index 97%
rename from core/src/main/java/hudson/mvn/FilePathGlobalSettingsProvider.java
rename to core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java
index 8604461c7c..4406a105d0 100644
--- a/core/src/main/java/hudson/mvn/FilePathGlobalSettingsProvider.java
+++ b/core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java
@@ -1,4 +1,4 @@
-package hudson.mvn;
+package jenkins.mvn;
import hudson.Extension;
import hudson.FilePath;
@@ -7,7 +7,6 @@ import hudson.model.TaskListener;
import hudson.util.IOUtils;
import java.io.File;
-import java.io.IOException;
import org.apache.commons.lang.StringUtils;
import org.kohsuke.stapler.DataBoundConstructor;
diff --git a/core/src/main/java/hudson/mvn/FilePathSettingsProvider.java b/core/src/main/java/jenkins/mvn/FilePathSettingsProvider.java
similarity index 98%
rename from core/src/main/java/hudson/mvn/FilePathSettingsProvider.java
rename to core/src/main/java/jenkins/mvn/FilePathSettingsProvider.java
index 592b8d0d72..aa6218b4a4 100644
--- a/core/src/main/java/hudson/mvn/FilePathSettingsProvider.java
+++ b/core/src/main/java/jenkins/mvn/FilePathSettingsProvider.java
@@ -1,4 +1,4 @@
-package hudson.mvn;
+package jenkins.mvn;
import hudson.Extension;
import hudson.FilePath;
diff --git a/core/src/main/java/hudson/mvn/GlobalSettingsProvider.java b/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java
similarity index 99%
rename from core/src/main/java/hudson/mvn/GlobalSettingsProvider.java
rename to core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java
index 303435728e..c7484cd15a 100644
--- a/core/src/main/java/hudson/mvn/GlobalSettingsProvider.java
+++ b/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java
@@ -1,4 +1,4 @@
-package hudson.mvn;
+package jenkins.mvn;
import hudson.ExtensionPoint;
import hudson.FilePath;
diff --git a/core/src/main/java/hudson/mvn/GlobalSettingsProviderDescriptor.java b/core/src/main/java/jenkins/mvn/GlobalSettingsProviderDescriptor.java
similarity index 95%
rename from core/src/main/java/hudson/mvn/GlobalSettingsProviderDescriptor.java
rename to core/src/main/java/jenkins/mvn/GlobalSettingsProviderDescriptor.java
index 3a9449e1e3..782a34095c 100644
--- a/core/src/main/java/hudson/mvn/GlobalSettingsProviderDescriptor.java
+++ b/core/src/main/java/jenkins/mvn/GlobalSettingsProviderDescriptor.java
@@ -1,10 +1,11 @@
-package hudson.mvn;
+package jenkins.mvn;
import hudson.model.Descriptor;
-import jenkins.model.Jenkins;
import java.util.List;
+import jenkins.model.Jenkins;
+
/**
* @author Nicolas De Loof
* @author Dominik Bartholdi (imod)
diff --git a/core/src/main/java/hudson/mvn/SettingsProvider.java b/core/src/main/java/jenkins/mvn/SettingsProvider.java
similarity index 99%
rename from core/src/main/java/hudson/mvn/SettingsProvider.java
rename to core/src/main/java/jenkins/mvn/SettingsProvider.java
index 078f92c12a..736cbd2fff 100644
--- a/core/src/main/java/hudson/mvn/SettingsProvider.java
+++ b/core/src/main/java/jenkins/mvn/SettingsProvider.java
@@ -1,4 +1,4 @@
-package hudson.mvn;
+package jenkins.mvn;
import hudson.ExtensionPoint;
import hudson.FilePath;
diff --git a/core/src/main/java/hudson/mvn/SettingsProviderDescriptor.java b/core/src/main/java/jenkins/mvn/SettingsProviderDescriptor.java
similarity index 94%
rename from core/src/main/java/hudson/mvn/SettingsProviderDescriptor.java
rename to core/src/main/java/jenkins/mvn/SettingsProviderDescriptor.java
index 30844f0c7e..1c4cba9de2 100644
--- a/core/src/main/java/hudson/mvn/SettingsProviderDescriptor.java
+++ b/core/src/main/java/jenkins/mvn/SettingsProviderDescriptor.java
@@ -1,10 +1,11 @@
-package hudson.mvn;
+package jenkins.mvn;
import hudson.model.Descriptor;
-import jenkins.model.Jenkins;
import java.util.List;
+import jenkins.model.Jenkins;
+
/**
* @author Nicolas De Loof
*/
diff --git a/core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/config.jelly b/core/src/main/resources/jenkins/mvn/DefaultGlobalSettingsProvider/config.jelly
similarity index 100%
rename from core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/config.jelly
rename to core/src/main/resources/jenkins/mvn/DefaultGlobalSettingsProvider/config.jelly
diff --git a/core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/help.html b/core/src/main/resources/jenkins/mvn/DefaultGlobalSettingsProvider/help.html
similarity index 100%
rename from core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/help.html
rename to core/src/main/resources/jenkins/mvn/DefaultGlobalSettingsProvider/help.html
diff --git a/core/src/main/resources/hudson/mvn/DefaultSettingsProvider/config.jelly b/core/src/main/resources/jenkins/mvn/DefaultSettingsProvider/config.jelly
similarity index 100%
rename from core/src/main/resources/hudson/mvn/DefaultSettingsProvider/config.jelly
rename to core/src/main/resources/jenkins/mvn/DefaultSettingsProvider/config.jelly
diff --git a/core/src/main/resources/hudson/mvn/DefaultSettingsProvider/help.html b/core/src/main/resources/jenkins/mvn/DefaultSettingsProvider/help.html
similarity index 100%
rename from core/src/main/resources/hudson/mvn/DefaultSettingsProvider/help.html
rename to core/src/main/resources/jenkins/mvn/DefaultSettingsProvider/help.html
diff --git a/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/config.jelly b/core/src/main/resources/jenkins/mvn/FilePathGlobalSettingsProvider/config.jelly
similarity index 100%
rename from core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/config.jelly
rename to core/src/main/resources/jenkins/mvn/FilePathGlobalSettingsProvider/config.jelly
diff --git a/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help-path.html b/core/src/main/resources/jenkins/mvn/FilePathGlobalSettingsProvider/help-path.html
similarity index 100%
rename from core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help-path.html
rename to core/src/main/resources/jenkins/mvn/FilePathGlobalSettingsProvider/help-path.html
diff --git a/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help.html b/core/src/main/resources/jenkins/mvn/FilePathGlobalSettingsProvider/help.html
similarity index 100%
rename from core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help.html
rename to core/src/main/resources/jenkins/mvn/FilePathGlobalSettingsProvider/help.html
diff --git a/core/src/main/resources/hudson/mvn/FilePathSettingsProvider/config.jelly b/core/src/main/resources/jenkins/mvn/FilePathSettingsProvider/config.jelly
similarity index 100%
rename from core/src/main/resources/hudson/mvn/FilePathSettingsProvider/config.jelly
rename to core/src/main/resources/jenkins/mvn/FilePathSettingsProvider/config.jelly
diff --git a/core/src/main/resources/hudson/mvn/FilePathSettingsProvider/help-path.html b/core/src/main/resources/jenkins/mvn/FilePathSettingsProvider/help-path.html
similarity index 100%
rename from core/src/main/resources/hudson/mvn/FilePathSettingsProvider/help-path.html
rename to core/src/main/resources/jenkins/mvn/FilePathSettingsProvider/help-path.html
diff --git a/core/src/main/resources/hudson/mvn/FilePathSettingsProvider/help.html b/core/src/main/resources/jenkins/mvn/FilePathSettingsProvider/help.html
similarity index 100%
rename from core/src/main/resources/hudson/mvn/FilePathSettingsProvider/help.html
rename to core/src/main/resources/jenkins/mvn/FilePathSettingsProvider/help.html
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java
index 69f76142bf..1455fc19e6 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java
@@ -40,7 +40,6 @@ import hudson.model.Node;
import hudson.model.Result;
import hudson.model.Run;
import hudson.model.TaskListener;
-import hudson.mvn.SettingsProvider;
import hudson.remoting.Channel;
import hudson.scm.ChangeLogSet;
import hudson.scm.ChangeLogSet.Entry;
@@ -74,6 +73,8 @@ import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
+import jenkins.mvn.SettingsProvider;
+
/**
* {@link Run} for {@link MavenModule}.
*
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
index af5fa30ea6..353f66888e 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
@@ -34,6 +34,7 @@ import hudson.Functions;
import hudson.Indenter;
import hudson.Plugin;
import hudson.Util;
+import hudson.PluginManager.PluginUpdateMonitor;
import hudson.maven.local_repo.DefaultLocalRepositoryLocator;
import hudson.maven.local_repo.LocalRepositoryLocator;
import hudson.maven.local_repo.PerJobLocalRepositoryLocator;
@@ -55,13 +56,6 @@ import hudson.model.SCMedItem;
import hudson.model.Saveable;
import hudson.model.TaskListener;
import hudson.model.TopLevelItem;
-import hudson.mvn.DefaultGlobalSettingsProvider;
-import hudson.mvn.DefaultSettingsProvider;
-import hudson.mvn.FilePathSettingsProvider;
-import hudson.mvn.GlobalSettingsProvider;
-import hudson.mvn.GlobalSettingsProviderDescriptor;
-import hudson.mvn.SettingsProvider;
-import hudson.mvn.SettingsProviderDescriptor;
import hudson.search.CollectionSearchIndex;
import hudson.search.SearchIndexBuilder;
import hudson.tasks.BuildStep;
@@ -97,6 +91,13 @@ import java.util.Stack;
import javax.servlet.ServletException;
import jenkins.model.Jenkins;
+import jenkins.mvn.DefaultGlobalSettingsProvider;
+import jenkins.mvn.DefaultSettingsProvider;
+import jenkins.mvn.FilePathSettingsProvider;
+import jenkins.mvn.GlobalSettingsProvider;
+import jenkins.mvn.GlobalSettingsProviderDescriptor;
+import jenkins.mvn.SettingsProvider;
+import jenkins.mvn.SettingsProviderDescriptor;
import net.sf.json.JSONObject;
import org.apache.commons.beanutils.PropertyUtils;
@@ -274,12 +275,12 @@ public class MavenModuleSet extends AbstractMavenProject legacySettings = plugin.getWrapper().classLoader.loadClass("org.jenkinsci.plugins.configfiles.maven.MvnSettingsProvider").asSubclass(SettingsProvider.class);
+ Class extends SettingsProvider> legacySettings = plugin.getWrapper().classLoader.loadClass("org.jenkinsci.plugins.configfiles.maven.job.MvnSettingsProvider").asSubclass(SettingsProvider.class);
SettingsProvider newInstance = legacySettings.newInstance();
PropertyUtils.setProperty(newInstance, "settingsConfigId", this.settingConfigId);
this.settings = newInstance;
@@ -313,7 +314,7 @@ public class MavenModuleSet extends AbstractMavenProject legacySettings = plugin.getWrapper().classLoader.loadClass("org.jenkinsci.plugins.configfiles.maven.MvnGlobalSettingsProvider").asSubclass(GlobalSettingsProvider.class);
+ Class extends GlobalSettingsProvider> legacySettings = plugin.getWrapper().classLoader.loadClass("org.jenkinsci.plugins.configfiles.maven.job.MvnGlobalSettingsProvider").asSubclass(GlobalSettingsProvider.class);
GlobalSettingsProvider newInstance = legacySettings.newInstance();
PropertyUtils.setProperty(newInstance, "settingsConfigId", this.globalSettingConfigId);
this.globalSettings = newInstance;
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
index 652565ea38..7029967e2f 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
@@ -51,8 +51,6 @@ import hudson.model.Result;
import hudson.model.Run;
import hudson.model.StringParameterDefinition;
import hudson.model.TaskListener;
-import hudson.mvn.GlobalSettingsProvider;
-import hudson.mvn.SettingsProvider;
import hudson.remoting.VirtualChannel;
import hudson.scm.ChangeLogSet;
import hudson.tasks.BuildStep;
@@ -83,6 +81,8 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import jenkins.model.Jenkins;
+import jenkins.mvn.GlobalSettingsProvider;
+import jenkins.mvn.SettingsProvider;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils;
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
index d001a47356..5fb22978ee 100755
--- a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
@@ -30,8 +30,8 @@ import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.BuildListener;
import jenkins.model.Jenkins;
+import jenkins.mvn.SettingsProvider;
import hudson.model.TaskListener;
-import hudson.mvn.SettingsProvider;
import hudson.tasks.Maven.MavenInstallation;
import hudson.tasks.Maven.ProjectWithMaven;
diff --git a/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java b/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
index c58d823c1f..377ea31a6d 100644
--- a/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
+++ b/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
@@ -35,8 +35,6 @@ import hudson.model.BuildListener;
import hudson.model.Node;
import hudson.model.Result;
import hudson.model.TaskListener;
-import hudson.mvn.GlobalSettingsProvider;
-import hudson.mvn.SettingsProvider;
import hudson.remoting.Callable;
import hudson.tasks.BuildStepDescriptor;
import hudson.tasks.BuildStepMonitor;
@@ -54,6 +52,8 @@ import java.util.Map.Entry;
import java.util.Properties;
import jenkins.model.Jenkins;
+import jenkins.mvn.GlobalSettingsProvider;
+import jenkins.mvn.SettingsProvider;
import net.sf.json.JSONObject;
import org.apache.commons.io.FileUtils;