update fron sonatype aether to eclipse aether 1.1.0

scm-webapp/src/main/java/sonia/scm/plugin/AbstractDependencyFilter.java

@@ -36,18 +36,13 @@ package sonia.scm.plugin;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.google.common.base.Throwables;
-
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.graph.DependencyFilter;
+import org.eclipse.aether.graph.DependencyNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.graph.DependencyFilter;
-import org.sonatype.aether.graph.DependencyNode;
-
-//~--- JDK imports ------------------------------------------------------------
-
 import java.io.IOException;
-
 import java.util.List;
 import java.util.Set;
 

scm-webapp/src/main/java/sonia/scm/plugin/Aether.java

@@ -35,41 +35,34 @@ package sonia.scm.plugin;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
-
+import com.google.common.base.Throwables;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.collection.CollectRequest;
+import org.eclipse.aether.collection.DependencyCollectionException;
+import org.eclipse.aether.collection.DependencyGraphTransformer;
+import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.graph.DependencyFilter;
+import org.eclipse.aether.graph.DependencyNode;
+import org.eclipse.aether.repository.*;
+import org.eclipse.aether.resolution.DependencyRequest;
+import org.eclipse.aether.resolution.DependencyResolutionException;
+import org.eclipse.aether.spi.locator.ServiceLocator;
+import org.eclipse.aether.util.artifact.JavaScopes;
+import org.eclipse.aether.util.filter.AndDependencyFilter;
+import org.eclipse.aether.util.filter.DependencyFilterUtils;
+import org.eclipse.aether.util.graph.transformer.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import org.sonatype.aether.RepositorySystem;
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.collection.CollectRequest;
-import org.sonatype.aether.collection.DependencyCollectionException;
-import org.sonatype.aether.collection.DependencyGraphTransformer;
-import org.sonatype.aether.graph.Dependency;
-import org.sonatype.aether.graph.DependencyFilter;
-import org.sonatype.aether.graph.DependencyNode;
-import org.sonatype.aether.repository.LocalRepository;
-import org.sonatype.aether.repository.LocalRepositoryManager;
-import org.sonatype.aether.repository.Proxy;
-import org.sonatype.aether.repository.RemoteRepository;
-import org.sonatype.aether.repository.RepositoryPolicy;
-import org.sonatype.aether.resolution.DependencyRequest;
-import org.sonatype.aether.resolution.DependencyResolutionException;
-import org.sonatype.aether.util.artifact.DefaultArtifact;
-import org.sonatype.aether.util.artifact.JavaScopes;
-import org.sonatype.aether.util.filter.AndDependencyFilter;
-import org.sonatype.aether.util.filter.DependencyFilterUtils;
-import org.sonatype.aether.util.graph.transformer
-  .ChainedDependencyGraphTransformer;
-import org.sonatype.aether.util.graph.transformer.ConflictMarker;
-import org.sonatype.aether.util.graph.transformer.JavaDependencyContextRefiner;
-import org.sonatype.aether.util.graph.transformer.JavaEffectiveScopeCalculator;
-import org.sonatype.aether.util.graph.transformer
-  .NearestVersionConflictResolver;
-
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.net.Proxies;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 /**
  *
  * @author Sebastian Sdorra
@@ -77,6 +70,8 @@ import sonia.scm.net.Proxies;
 public final class Aether
 {
 
+  private static final ServiceLocator serviceLocator = new AetherServiceLocator();
+
   /** Field description */
   private static final DependencyFilter FILTER =
     new AndDependencyFilter(new CoreDependencyFilter(),
@@ -134,11 +129,9 @@ public final class Aether
   public static RemoteRepository createRemoteRepository(
     ScmConfiguration configuration, PluginRepository pluginRepository)
   {
-    RemoteRepository remoteRepository =
-      new RemoteRepository(pluginRepository.getId(), "default",
-        pluginRepository.getUrl());
+    RemoteRepository.Builder builder = new RemoteRepository.Builder(pluginRepository.getId(), "default", pluginRepository.getUrl());
 
-    if (Proxies.isEnabled(configuration, remoteRepository.getHost()))
+    if (Proxies.isEnabled(configuration, hostFromUrl(pluginRepository.getUrl())))
     {
       Proxy proxy = DefaultProxySelector.createProxy(configuration);
 
@@ -148,10 +141,18 @@ public final class Aether
           pluginRepository.getUrl());
       }
 
-      remoteRepository.setProxy(proxy);
+      builder.setProxy(proxy);
     }
 
-    return remoteRepository;
+    return builder.build();
+  }
+
+  private static String hostFromUrl(String url) {
+    try {
+      return new URL(url).getHost();
+    } catch (MalformedURLException e) {
+      throw Throwables.propagate(e);
+    }
   }
 
   /**
@@ -162,7 +163,7 @@ public final class Aether
    */
   public static RepositorySystem createRepositorySystem()
   {
-    return new AetherServiceLocator().getService(RepositorySystem.class);
+    return serviceLocator.getService(RepositorySystem.class);
   }
 
   /**
@@ -181,8 +182,7 @@ public final class Aether
     ScmConfiguration configuration,
     AdvancedPluginConfiguration advancedPluginConfiguration)
   {
-    MavenRepositorySystemSession session = new MavenRepositorySystemSession();
-
+    DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();
     session.setChecksumPolicy(RepositoryPolicy.CHECKSUM_POLICY_WARN);
 
     if (configuration.isEnableProxy())
@@ -191,23 +191,26 @@ public final class Aether
       session.setProxySelector(new DefaultProxySelector(configuration));
     }
 
-    LocalRepositoryManager localRepositoryManager =
-      system.newLocalRepositoryManager(localRepository);
+    LocalRepositoryManager localRepositoryManager = system.newLocalRepositoryManager(session, localRepository);
 
     session.setLocalRepositoryManager(localRepositoryManager);
     session.setAuthenticationSelector(
       new AetherAuthenticationSelector(advancedPluginConfiguration)
     );
 
-    // create graph transformer to resolve dependency conflicts
-    //J-
-    DependencyGraphTransformer dgt = new ChainedDependencyGraphTransformer(
-      new ConflictMarker(), 
-      new JavaEffectiveScopeCalculator(),
-      new NearestVersionConflictResolver(),
-      new JavaDependencyContextRefiner() 
+    // create graph transformer and conflictResolver to resolve dependency conflicts
+    ConflictResolver conflictResolver = new ConflictResolver(
+      new NearestVersionSelector(),
+      new JavaScopeSelector(),
+      new SimpleOptionalitySelector(),
+      new JavaScopeDeriver()
+    );
+
+    DependencyGraphTransformer dgt = new ChainedDependencyGraphTransformer(
+      new ConflictMarker(),
+      conflictResolver,
+      new JavaDependencyContextRefiner()
     );
-    //J+
 
     session.setDependencyGraphTransformer(dgt);
 
@@ -228,7 +231,7 @@ public final class Aether
    * @throws DependencyResolutionException
    */
   public static DependencyNode resolveDependencies(RepositorySystem system,
-    RepositorySystemSession session, CollectRequest request)
+                                                   RepositorySystemSession session, CollectRequest request)
     throws DependencyCollectionException, DependencyResolutionException
   {
     DependencyNode node = system.collectDependencies(session,

scm-webapp/src/main/java/sonia/scm/plugin/AetherAuthenticationSelector.java

@@ -36,20 +36,18 @@ package sonia.scm.plugin;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
-
+import org.eclipse.aether.repository.Authentication;
+import org.eclipse.aether.repository.AuthenticationSelector;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.util.repository.AuthenticationBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import org.sonatype.aether.repository.Authentication;
-import org.sonatype.aether.repository.AuthenticationSelector;
-import org.sonatype.aether.repository.RemoteRepository;
-
 import sonia.scm.plugin.AdvancedPluginConfiguration.Server;
 
-//~--- JDK imports ------------------------------------------------------------
-
 import java.util.Map;
 
+//~--- JDK imports ------------------------------------------------------------
+
 /**
  *
  * @author Sebastian Sdorra
@@ -115,8 +113,10 @@ public class AetherAuthenticationSelector implements AuthenticationSelector
     {
       logger.info("use user {} for repository wiht id {}",
         server.getUsername(), repository.getId());
-      authentication = new Authentication(server.getUsername(),
-        server.getPassword());
+      authentication = new AuthenticationBuilder()
+        .addUsername(server.getUsername())
+        .addPassword(server.getPassword())
+        .build();
     }
 
     return authentication;

scm-webapp/src/main/java/sonia/scm/plugin/AetherDependencyResolver.java

@@ -36,27 +36,24 @@ package sonia.scm.plugin;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.google.common.collect.Lists;
-
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.collection.CollectRequest;
+import org.eclipse.aether.collection.DependencyCollectionException;
+import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.graph.DependencyNode;
+import org.eclipse.aether.repository.LocalRepository;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.resolution.DependencyResolutionException;
+import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import org.sonatype.aether.RepositorySystem;
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.collection.CollectRequest;
-import org.sonatype.aether.collection.DependencyCollectionException;
-import org.sonatype.aether.graph.Dependency;
-import org.sonatype.aether.graph.DependencyNode;
-import org.sonatype.aether.repository.LocalRepository;
-import org.sonatype.aether.repository.RemoteRepository;
-import org.sonatype.aether.resolution.DependencyResolutionException;
-import org.sonatype.aether.util.graph.PreorderNodeListGenerator;
-
 import sonia.scm.config.ScmConfiguration;
 
-//~--- JDK imports ------------------------------------------------------------
-
 import java.util.List;
 
+//~--- JDK imports ------------------------------------------------------------
+
 /**
  *
  * @author Sebastian Sdorra
@@ -83,9 +80,9 @@ public class AetherDependencyResolver
    * @param remoteRepositories
    */
   public AetherDependencyResolver(ScmConfiguration configuration,
-    AdvancedPluginConfiguration advancedPluginConfiguration,
-    RepositorySystem system, LocalRepository localRepository,
-    List<RemoteRepository> remoteRepositories)
+                                  AdvancedPluginConfiguration advancedPluginConfiguration,
+                                  RepositorySystem system, LocalRepository localRepository,
+                                  List<RemoteRepository> remoteRepositories)
   {
     this.configuration = configuration;
     this.advancedPluginConfiguration = advancedPluginConfiguration;

scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java

@@ -40,10 +40,10 @@ import com.google.common.collect.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.sonatype.aether.RepositorySystem;
-import org.sonatype.aether.graph.Dependency;
-import org.sonatype.aether.repository.LocalRepository;
-import org.sonatype.aether.repository.RemoteRepository;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.repository.LocalRepository;
+import org.eclipse.aether.repository.RemoteRepository;
 
 import sonia.scm.ConfigurationException;
 import sonia.scm.SCMContextProvider;
@@ -190,7 +190,6 @@ public class AetherPluginHandler
    *
    *
    * @param dependency
-   * @param dependencies
    * @param localDependencies
    */
   private void collectDependencies(Dependency dependency,
@@ -200,7 +199,7 @@ public class AetherPluginHandler
     {
       //J-
       AetherDependencyResolver resolver = new AetherDependencyResolver(
-        configuration, advancedPluginConfiguration, repositorySystem, 
+        configuration, advancedPluginConfiguration, repositorySystem,
         localRepository, remoteRepositories
       );
       //J+

scm-webapp/src/main/java/sonia/scm/plugin/AetherServiceLocator.java

@@ -37,32 +37,30 @@ package sonia.scm.plugin;
 import org.apache.maven.repository.internal.DefaultArtifactDescriptorReader;
 import org.apache.maven.repository.internal.DefaultVersionRangeResolver;
 import org.apache.maven.repository.internal.DefaultVersionResolver;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
+import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
+import org.eclipse.aether.impl.ArtifactDescriptorReader;
+import org.eclipse.aether.impl.DefaultServiceLocator;
+import org.eclipse.aether.impl.VersionRangeResolver;
+import org.eclipse.aether.impl.VersionResolver;
+import org.eclipse.aether.internal.impl.slf4j.Slf4jLoggerFactory;
+import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
+import org.eclipse.aether.spi.connector.transport.TransporterFactory;
+import org.eclipse.aether.spi.locator.ServiceLocator;
+import org.eclipse.aether.spi.log.LoggerFactory;
+import org.eclipse.aether.transport.file.FileTransporterFactory;
+import org.eclipse.aether.transport.http.HttpTransporterFactory;
 
-import org.slf4j.LoggerFactory;
-
-import org.sonatype.aether.connector.async.AsyncRepositoryConnectorFactory;
-import org.sonatype.aether.connector.file.FileRepositoryConnectorFactory;
-import org.sonatype.aether.impl.ArtifactDescriptorReader;
-import org.sonatype.aether.impl.VersionRangeResolver;
-import org.sonatype.aether.impl.VersionResolver;
-import org.sonatype.aether.impl.internal.DefaultServiceLocator;
-import org.sonatype.aether.impl.internal.Slf4jLogger;
-import org.sonatype.aether.spi.connector.RepositoryConnectorFactory;
-import org.sonatype.aether.spi.log.Logger;
+import java.util.List;
 
 /**
  *
  * @author Sebastian Sdorra
  */
-public class AetherServiceLocator extends DefaultServiceLocator
+public class AetherServiceLocator implements ServiceLocator
 {
 
-  /** Field description */
-  private static final String LOGGER_NAME = "org.sonatype.aether";
-
-  /** Field description */
-  private static final Slf4jLogger logger =
-    new Slf4jLogger(LoggerFactory.getLogger(LOGGER_NAME));
+  private DefaultServiceLocator delegate;
 
   //~--- constructors ---------------------------------------------------------
 
@@ -70,16 +68,25 @@ public class AetherServiceLocator extends DefaultServiceLocator
    * Constructs ...
    *
    */
-  public AetherServiceLocator()
+  AetherServiceLocator()
   {
-    setServices(Logger.class, logger);
-    addService(VersionResolver.class, DefaultVersionResolver.class);
-    addService(VersionRangeResolver.class, DefaultVersionRangeResolver.class);
-    addService(ArtifactDescriptorReader.class,
-      DefaultArtifactDescriptorReader.class);
-    addService(RepositoryConnectorFactory.class,
-      AsyncRepositoryConnectorFactory.class);
-    addService(RepositoryConnectorFactory.class,
-      FileRepositoryConnectorFactory.class);
+    delegate = MavenRepositorySystemUtils.newServiceLocator();
+    delegate.setService(LoggerFactory.class, Slf4jLoggerFactory.class);
+    delegate.addService(VersionResolver.class, DefaultVersionResolver.class);
+    delegate.addService(VersionRangeResolver.class, DefaultVersionRangeResolver.class);
+    delegate.addService(ArtifactDescriptorReader.class, DefaultArtifactDescriptorReader.class);
+    delegate.addService(TransporterFactory.class, HttpTransporterFactory.class);
+    delegate.addService(TransporterFactory.class, FileTransporterFactory.class);
+    delegate.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
+  }
+
+  @Override
+  public <T> T getService(Class<T> type) {
+    return delegate.getService(type);
+  }
+
+  @Override
+  public <T> List<T> getServices(Class<T> type) {
+    return delegate.getServices(type);
   }
 }

scm-webapp/src/main/java/sonia/scm/plugin/DefaultProxySelector.java

@@ -34,13 +34,13 @@ package sonia.scm.plugin;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import org.eclipse.aether.repository.Authentication;
+import org.eclipse.aether.repository.Proxy;
+import org.eclipse.aether.repository.ProxySelector;
+import org.eclipse.aether.repository.RemoteRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.sonatype.aether.repository.Authentication;
-import org.sonatype.aether.repository.Proxy;
-import org.sonatype.aether.repository.ProxySelector;
-import org.sonatype.aether.repository.RemoteRepository;
 
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.util.Util;
@@ -89,8 +89,11 @@ public class DefaultProxySelector implements ProxySelector
 
     if (Util.isNotEmpty(username) || Util.isNotEmpty(password))
     {
-      authentication = new Authentication(Util.nonNull(username),
-              Util.nonNull(password));
+      /*
+      TODO
+      authentication = new Authentication(Util.nonNull(username), Util.nonNull(password));
+       */
+
     }
 
     return new Proxy(Proxy.TYPE_HTTP, configuration.getProxyServer(),

scm-webapp/src/main/java/sonia/scm/plugin/StringDependencyGraphDumper.java

@@ -34,8 +34,8 @@ package sonia.scm.plugin;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import org.sonatype.aether.graph.DependencyNode;
-import org.sonatype.aether.graph.DependencyVisitor;
+import org.eclipse.aether.graph.DependencyNode;
+import org.eclipse.aether.graph.DependencyVisitor;
 
 /**
  *