[maven-plugin] Cleanup of deprecated calls, updating POM to point to current...

[maven-plugin] Cleanup of deprecated calls, updating POM to point to current versions of maven-hpi-plugin and maven-stapler-plugin.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@22024 71c3de6d-444a-0410-be80-ed276b4c234a

maven-plugin/pom.xml

@@ -133,13 +133,16 @@ THE SOFTWARE.
             <plugin>
                 <groupId>org.jvnet.hudson.tools</groupId>
                 <artifactId>maven-hpi-plugin</artifactId>
-                <version>1.31</version>
+                <version>1.43</version>
                 <extensions>true</extensions>
+                <configuration>
+                  <showDeprecation>true</showDeprecation>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.kohsuke.stapler</groupId>
                 <artifactId>maven-stapler-plugin</artifactId>
-                <version>1.11</version>
+                <version>1.12</version>
                 <extensions>true</extensions>
             </plugin>
             <plugin>

maven-plugin/src/main/java/hudson/maven/AbstractMavenBuild.java

@@ -125,12 +125,11 @@ public abstract class AbstractMavenBuild<P extends AbstractMavenProject<P,B>,B e
             
             if(trigger) {
                 listener.getLogger().println(Messages.MavenBuild_Triggering(down.getName()));
-                down.scheduleBuild(new UpstreamCause(this));
+                down.scheduleBuild(new UpstreamCause((Run<?,?>)this));
             }
         }
     }
     
-
     private boolean inDownstreamProjects(AbstractProject downstreamProject) {
         DependencyGraph graph = Hudson.getInstance().getDependencyGraph();
         Set<AbstractProject> tups = graph.getTransitiveUpstream(downstreamProject);

maven-plugin/src/main/java/hudson/maven/MavenModule.java

@@ -348,6 +348,8 @@ public final class MavenModule extends AbstractMavenProject<MavenModule,MavenBui
      * <p>
      * That is, {@Link MavenModuleSet} builds are incompatible with any {@link MavenModule}
      * builds, whereas {@link MavenModule} builds are compatible with each other.
+     *
+     * @deprecated as of 1.319 in {@link AbstractProject}.
      */
     @Override
     public Resource getWorkspaceResource() {

maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java

@@ -687,12 +687,12 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
             m.delete();
         rsp.sendRedirect2(".");
     }
-
+    
     /**
      * Check the location of the POM, alternate settings file, etc - any file.
      */
     public FormValidation doCheckFileInWorkspace(@QueryParameter String value) throws IOException, ServletException {
-        FilePath ws = getModuleRoot();
+        FilePath ws = getLastBuild().getModuleRoot();
         if(ws==null) return FormValidation.ok();
         return ws.validateRelativePath(value,true,true);
     }

maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java

@@ -43,6 +43,7 @@ import hudson.model.Hudson;
 import hudson.model.ParametersAction;
 import hudson.model.Result;
 import hudson.model.Computer;
+import hudson.model.Run;
 import hudson.model.TaskListener;
 import hudson.model.Cause.UpstreamCause;
 import hudson.remoting.Channel;
@@ -391,7 +392,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
                 if(!project.isAggregatorStyleBuild()) {
                     // start module builds
                     logger.println("Triggering "+project.getRootModule().getModuleName());
-                    project.getRootModule().scheduleBuild(new UpstreamCause(MavenModuleSetBuild.this));
+                    project.getRootModule().scheduleBuild(new UpstreamCause((Run<?,?>)MavenModuleSetBuild.this));
                 } else {
                     // do builds here
                     try {
@@ -465,7 +466,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
                         }
 
                         if (project.getAlternateSettings() != null) {
-                            margs.add("-s").add(project.getWorkspace().child(project.getAlternateSettings()));
+                            margs.add("-s").add(getWorkspace().child(project.getAlternateSettings()));
                         }
 
                         margs.addTokenized(envVars.expand(project.getGoals()));
@@ -804,7 +805,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
             this.properties = project.getMavenProperties();
 	    this.nonRecursive = project.isNonRecursive();
 	    if (project.usesPrivateRepository()) {
-                this.privateRepository = project.getWorkspace().child(".repository").getRemote();
+                this.privateRepository = project.getLastBuild().getWorkspace().child(".repository").getRemote();
             }
             else {
                 this.privateRepository = null;

maven-plugin/src/main/java/hudson/maven/MavenRedeployer.java

@@ -28,7 +28,7 @@ import hudson.model.AbstractBuild;
 import hudson.model.BuildListener;
 import hudson.model.Result;
 import hudson.tasks.BuildStepDescriptor;
-import hudson.tasks.Publisher;
+import hudson.tasks.Notifier;
 import hudson.tasks.BuildStepMonitor;
 import hudson.Launcher;
 import hudson.maven.reporters.MavenArtifactRecord;
@@ -46,7 +46,7 @@ import java.io.IOException;
  *
  * @author Kohsuke Kawaguchi
  */
-public class MavenRedeployer extends Publisher {
+public class MavenRedeployer extends Notifier {
     public boolean perform(AbstractBuild<?,?> build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
         MavenArtifactRecord mar = build.getAction(MavenArtifactRecord.class);
         if(mar==null) {
@@ -67,14 +67,14 @@ public class MavenRedeployer extends Publisher {
         return BuildStepMonitor.NONE;
     }
 
-    public BuildStepDescriptor<Publisher> getDescriptor() {
+    public BuildStepDescriptor getDescriptor() {
         return DESCRIPTOR;
     }
 
     public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl();
 
-    public static final class DescriptorImpl extends BuildStepDescriptor<Publisher> {
-        public boolean isApplicable(Class<? extends AbstractProject> jobType) {
+    public static final class DescriptorImpl extends BuildStepDescriptor {
+        public boolean isApplicable(Class jobType) {
             return AbstractMavenProject.class.isAssignableFrom(jobType);
         }
 
@@ -82,4 +82,4 @@ public class MavenRedeployer extends Publisher {
             return Messages.MavenRedeployer_DisplayName();
         }
     }
-}
+}
\ No newline at end of file