Playing with Maven 3.1.0 upgrade.

maven-plugin/pom.xml

@@ -42,9 +42,9 @@ THE SOFTWARE.
 
   <properties>
     <mavenInterceptorsVersion>1.3</mavenInterceptorsVersion>
-    <mavenVersion>3.0.5</mavenVersion>
+    <mavenVersion>3.1.0</mavenVersion>
     <maven.version>${mavenVersion}</maven.version>
-    <aetherVersion>1.13.1</aetherVersion>
+    <aetherVersion>0.9.0.M2</aetherVersion>
     <sisuInjectVersion>2.3.0</sisuInjectVersion>
     <wagonVersion>2.4</wagonVersion>
   </properties>
@@ -147,27 +147,27 @@ THE SOFTWARE.
     
     
     <dependency>
-      <groupId>org.sonatype.aether</groupId>
+      <groupId>org.eclipse.aether</groupId>
       <artifactId>aether-api</artifactId>
       <version>${aetherVersion}</version>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.aether</groupId>
+      <groupId>org.eclipse.aether</groupId>
       <artifactId>aether-impl</artifactId>
       <version>${aetherVersion}</version>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.aether</groupId>
+      <groupId>org.eclipse.aether</groupId>
       <artifactId>aether-spi</artifactId>
       <version>${aetherVersion}</version>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.aether</groupId>
+      <groupId>org.eclipse.aether</groupId>
       <artifactId>aether-util</artifactId>
       <version>${aetherVersion}</version>
     </dependency>                                   
     <dependency>
-      <groupId>org.sonatype.aether</groupId>
+      <groupId>org.eclipse.aether</groupId>
       <artifactId>aether-connector-wagon</artifactId>
       <version>${aetherVersion}</version>
       <exclusions>
@@ -281,7 +281,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.lib</groupId>
       <artifactId>lib-jenkins-maven-embedder</artifactId>
-      <version>3.9</version>
+      <version>3.10-SNAPSHOT</version>
       <exclusions>
         <exclusion><!-- we'll add our own patched version. see https://issues.jenkins-ci.org/browse/JENKINS-1680 -->
           <groupId>jtidy</groupId>

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

@@ -38,6 +38,7 @@ import org.codehaus.plexus.logging.console.ConsoleLogger;
  * 
  * @author Kohsuke Kawaguchi
  */
+// TODO this is gone in 3.1.0, replaced by SLF4J
 public final class EmbedderLoggerImpl extends MavenLoggerManager {
     private final PrintStream logger;
 

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

@@ -200,6 +200,7 @@ public class Maven3Builder extends AbstractMavenBuilder implements DelegatingCal
             
             // TODO: we should think about reusing the code in org.apache.maven.cli.DefaultMavenExecutionRequestBuilder#logging?
             // E.g. there's also the option to redirect logging to a file which is handled there, but not here.
+            // TODO replace with SLF4J
             PrintStreamLogger logger = new PrintStreamLogger( maven3Builder.listener.getLogger() );
             if (maven3Builder.isDebug()) {
                 logger.setThreshold(PrintStreamLogger.LEVEL_DEBUG);

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

@@ -34,8 +34,8 @@ import java.util.Properties;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.maven.model.building.ModelBuildingRequest;
-import org.sonatype.aether.repository.WorkspaceReader;
-import org.sonatype.aether.transfer.TransferListener;
+import org.eclipse.aether.repository.WorkspaceReader;
+import org.eclipse.aether.transfer.TransferListener;
 
 /**
  * @author Olivier Lamy

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

@@ -100,9 +100,9 @@ import org.codehaus.plexus.util.PathTool;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.export.Exported;
-import org.sonatype.aether.transfer.TransferCancelledException;
-import org.sonatype.aether.transfer.TransferEvent;
-import org.sonatype.aether.transfer.TransferListener;
+import org.eclipse.aether.transfer.TransferCancelledException;
+import org.eclipse.aether.transfer.TransferEvent;
+import org.eclipse.aether.transfer.TransferListener;
 
 /**
  * {@link Build} for {@link MavenModuleSet}.

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

@@ -64,7 +64,7 @@ import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
 import org.apache.maven.artifact.repository.Authentication;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.cli.BatchModeMavenTransferListener;
+import org.apache.maven.cli.transfer.BatchModeMavenTransferListener;
 import org.apache.maven.repository.Proxy;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.kohsuke.stapler.DataBoundConstructor;