rename package

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();
 

core/src/main/java/hudson/mvn/DefaultGlobalSettingsProvider.java → core/src/main/java/jenkins/mvn/DefaultGlobalSettingsProvider.java

-package hudson.mvn;
+package jenkins.mvn;
 
 import hudson.Extension;
 import hudson.FilePath;

core/src/main/java/hudson/mvn/DefaultSettingsProvider.java → core/src/main/java/jenkins/mvn/DefaultSettingsProvider.java

-package hudson.mvn;
+package jenkins.mvn;
 
 import hudson.Extension;
 import hudson.FilePath;

core/src/main/java/hudson/mvn/FilePathGlobalSettingsProvider.java → core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java

-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;

core/src/main/java/hudson/mvn/FilePathSettingsProvider.java → core/src/main/java/jenkins/mvn/FilePathSettingsProvider.java

-package hudson.mvn;
+package jenkins.mvn;
 
 import hudson.Extension;
 import hudson.FilePath;

core/src/main/java/hudson/mvn/GlobalSettingsProvider.java → core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java

-package hudson.mvn;
+package jenkins.mvn;
 
 import hudson.ExtensionPoint;
 import hudson.FilePath;

core/src/main/java/hudson/mvn/GlobalSettingsProviderDescriptor.java → core/src/main/java/jenkins/mvn/GlobalSettingsProviderDescriptor.java

-package hudson.mvn;
+package jenkins.mvn;
 
 import hudson.model.Descriptor;
-import jenkins.model.Jenkins;
 
 import java.util.List;
 
+import jenkins.model.Jenkins;
+
 /**
  * @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
  * @author Dominik Bartholdi (imod)

core/src/main/java/hudson/mvn/SettingsProvider.java → core/src/main/java/jenkins/mvn/SettingsProvider.java

-package hudson.mvn;
+package jenkins.mvn;
 
 import hudson.ExtensionPoint;
 import hudson.FilePath;

core/src/main/java/hudson/mvn/SettingsProviderDescriptor.java → core/src/main/java/jenkins/mvn/SettingsProviderDescriptor.java

-package hudson.mvn;
+package jenkins.mvn;
 
 import hudson.model.Descriptor;
-import jenkins.model.Jenkins;
 
 import java.util.List;
 
+import jenkins.model.Jenkins;
+
 /**
  * @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
  */

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}.
  * 

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<MavenModuleSet,MavenMod
     protected transient String globalSettingConfigPath;
 
     /**
-     * @since 1.481
+     * @since 1.488
      */
     private SettingsProvider settings = new DefaultSettingsProvider();
     
     /**
-     * @since 1.481
+     * @since 1.488
      */
     private GlobalSettingsProvider globalSettings = new DefaultGlobalSettingsProvider();
 
@@ -299,7 +300,7 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
             this.alternateSettings = null;
         } else if (plugin != null && StringUtils.isNotBlank(this.settingConfigId)) {
             try {
-                Class<? extends SettingsProvider> 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<MavenModuleSet,MavenMod
         
         if (plugin != null && StringUtils.isNotBlank(this.globalSettingConfigId)) {
             try {
-                Class<? extends GlobalSettingsProvider> 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;

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;

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;
 

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;