You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2013/03/18 22:47:27 UTC
[45/50] git commit: Merge branch 'trunk' into eclipse-aether
Merge branch 'trunk' into eclipse-aether
Conflicts:
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java
maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java
maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
pom.xml
src/site/site.xml
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/137cbd8a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/137cbd8a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/137cbd8a
Branch: refs/heads/master
Commit: 137cbd8a9772343f5fa5e48ca0a3cce4fe8e4331
Parents: 3868007 8181e7c
Author: Jason van Zyl <ja...@tesla.io>
Authored: Thu Feb 14 22:08:26 2013 -0500
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Thu Feb 14 22:08:26 2013 -0500
----------------------------------------------------------------------
.gitattributes | 10 +-
.gitignore | 2 +
apache-maven/NOTICE.txt | 2 +-
apache-maven/README.txt | 14 +-
build.xml | 6 +-
.../internal/DefaultVersionRangeResolver.java | 2 +-
.../internal/DefaultVersionResolver.java | 2 +-
.../repository/internal/LocalSnapshotMetadata.java | 2 +-
.../maven/repository/internal/MavenMetadata.java | 6 +-
.../repository/internal/MavenSnapshotMetadata.java | 100 +++++
.../internal/RemoteSnapshotMetadata.java | 72 +----
.../repository/internal/VersionsMetadata.java | 13 +-
.../07.20.3-SNAPSHOT/maven-metadata.xml | 96 +++---
.../java/org/apache/maven/artifact/Artifact.java | 4 +
.../repository/ArtifactRepositoryPolicy.java | 1 -
.../artifact/versioning/ComparableVersion.java | 18 +-
.../versioning/DefaultArtifactVersion.java | 2 +-
.../apache/maven/artifact/ArtifactScopeEnum.java | 2 +-
.../metadata/DefaultRepositoryMetadataManager.java | 30 +-
.../repository/metadata/MetadataBridge.java | 1 -
.../artifact/resolver/DefaultArtifactResolver.java | 108 ++++--
.../maven/profiles/DefaultProfileManager.java | 5 -
.../activation/SystemPropertyProfileActivator.java | 2 +-
.../AbstractStringBasedModelInterpolator.java | 6 +-
.../project/validation/DefaultModelValidator.java | 4 -
.../apache/maven/repository/MetadataGraphNode.java | 4 +-
.../DefaultArtifactRepositoryFactory.java | 2 +-
.../resolver/DefaultLegacyArtifactCollector.java | 4 +-
.../resolver/transform/ArtifactTransformation.java | 11 +-
.../transform/ArtifactTransformationManager.java | 1 -
.../repository/metadata/ArtifactMetadata.java | 16 +-
.../maven/repository/metadata/MetadataGraph.java | 2 +-
.../repository/metadata/MetadataGraphEdge.java | 10 +-
.../repository/metadata/MetadataResolution.java | 2 +-
maven-core/pom.xml | 115 +++---
.../main/java/org/apache/maven/DefaultMaven.java | 25 ++-
.../execution/DefaultMavenExecutionRequest.java | 12 +
.../execution/DefaultMavenExecutionResult.java | 3 +-
.../maven/execution/MavenExecutionRequest.java | 38 ++-
.../maven/lifecycle/internal/BuilderCommon.java | 10 +-
.../lifecycle/internal/CurrentPhaseForThread.java | 7 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 40 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 4 +-
.../lifecycle/internal/ExecutionPlanItem.java | 4 +-
.../internal/LifecycleDependencyResolver.java | 37 ++-
.../lifecycle/internal/LifecycleModuleBuilder.java | 6 +-
.../lifecycle/internal/LifecycleWeaveBuilder.java | 18 +-
.../lifecycle/internal/ThreadLockedArtifact.java | 10 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 6 +-
.../apache/maven/plugin/BuildPluginManager.java | 28 +-
.../maven/plugin/DefaultBuildPluginManager.java | 30 +-
.../plugin/PluginParameterExpressionEvaluator.java | 4 +-
.../plugin/internal/DefaultLegacySupport.java | 24 +-
.../plugin/internal/DefaultMavenPluginManager.java | 7 +-
.../internal/PluginDependenciesResolver.java | 2 +-
.../maven/plugin/prefix/PluginPrefixResult.java | 6 +-
.../project/DefaultModelBuildingListener.java | 18 +-
.../maven/project/DefaultProjectBuilder.java | 28 +-
.../org/apache/maven/project/MavenProject.java | 30 +-
.../maven/project/ProjectBuildingRequest.java | 2 +-
.../apache/maven/repository/RepositorySystem.java | 12 +-
.../main/resources/META-INF/plexus/components.xml | 4 +-
.../resources/META-INF/plexus/default-bindings.xml | 2 +-
maven-core/src/site/apt/artifact-handlers.apt | 82 ++--
maven-core/src/site/apt/index.apt | 8 +-
.../artifact/handler/ArtifactHandlerTest.java | 178 +++++-----
.../exception/DefaultExceptionHandlerTest.java | 120 +++---
.../plugin/internal/DefaultLegacySupportTest.java | 74 ++++
maven-embedder/pom.xml | 10 +
.../main/java/org/apache/maven/cli/CLIManager.java | 4 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 14 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 80 +++--
.../maven/cli/event/ExecutionEventLogger.java | 9 +-
.../maven/cli/logging/BaseSlf4jConfiguration.java | 44 ++
.../maven/cli/logging/PrintStreamLogger.java | 187 ---------
.../maven/cli/logging/Slf4jConfiguration.java | 43 ++
.../cli/logging/Slf4jConfigurationFactory.java | 81 ++++
.../org/apache/maven/cli/logging/Slf4jLogger.java | 4 +-
.../maven/cli/logging/Slf4jStdoutLogger.java | 303 +++++++++++++++
.../cli/logging/impl/Log4j2Configuration.java | 58 +++
.../cli/logging/impl/LogbackConfiguration.java | 60 +++
.../cli/logging/impl/Slf4jSimpleConfiguration.java | 62 +++
.../cli/transfer/Slf4jMavenTransferListener.java | 9 +-
.../src/main/java/org/slf4j/MavenSlf4jFriend.java | 35 ++
.../org/slf4j/impl/MavenSlf4jSimpleFriend.java | 32 ++
.../META-INF/maven/slf4j-configuration.properties | 5 +
maven-embedder/src/site/apt/logging.apt | 5 +-
.../maven/model/building/DefaultModelBuilder.java | 128 ++++---
.../maven/model/building/DefaultModelProblem.java | 3 +-
.../building/DefaultModelProblemCollector.java | 7 +-
.../apache/maven/model/building/ModelProblem.java | 3 +-
.../model/building/ModelProblemCollector.java | 3 -
.../building/ModelProblemCollectorRequest.java | 44 ++-
.../inheritance/DefaultInheritanceAssembler.java | 19 +-
.../AbstractStringBasedModelInterpolator.java | 4 +-
.../interpolation/ProblemDetectingValueSource.java | 3 +-
.../StringSearchModelInterpolator.java | 10 +-
.../DefaultDependencyManagementInjector.java | 2 +-
.../DefaultPluginManagementInjector.java | 2 +-
.../apache/maven/model/merge/MavenModelMerger.java | 31 +-
.../normalization/DefaultModelNormalizer.java | 2 +-
.../model/plugin/DefaultReportingConverter.java | 6 +-
.../profile/DefaultProfileActivationContext.java | 61 +++-
.../model/profile/DefaultProfileInjector.java | 2 +-
.../model/profile/DefaultProfileSelector.java | 8 +-
.../model/profile/ProfileActivationContext.java | 7 +
.../profile/activation/FileProfileActivator.java | 2 +
.../activation/JdkVersionProfileActivator.java | 2 +-
.../model/validation/DefaultModelValidator.java | 10 +-
.../resources/org/apache/maven/model/pom-4.0.0.xml | 6 +-
maven-model-builder/src/site/apt/index.apt | 28 +-
.../org/apache/maven/model/merge/ModelMerger.java | 71 ++--
.../maven/plugin/descriptor/MojoDescriptor.java | 16 +-
pom.xml | 78 ++--
src/site/site.xml | 4 -
115 files changed, 2037 insertions(+), 1126 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index e52bf75,432006e..5221f06
--- a/.gitignore
+++ b/.gitignore
@@@ -7,9 -7,8 +7,11 @@@ bin
# Intellij
*.ipr
*.iml
+<<<<<<< HEAD
.idea
+=======
+>>>>>>> 4fdcdbd26244ff81e242054fd38cf415d92499be
.DS_Store
+ /bootstrap
+ /dependencies.xml
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
----------------------------------------------------------------------
diff --cc maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
index 3e04755,87c69fb..a7ff573
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@@ -316,7 -270,7 +316,7 @@@ public class DefaultVersionRangeResolve
event.setException( exception );
event.setRepository( repository );
- repositoryEventDispatcher.dispatch( event );
+ repositoryEventDispatcher.dispatch( event.build() );
}
--}
++}
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
----------------------------------------------------------------------
diff --cc maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
index 5af7121,cf34483..9fcfc99
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@@ -631,4 -597,4 +631,4 @@@ public class DefaultVersionResolve
}
}
--}
++}
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
----------------------------------------------------------------------
diff --cc maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
index 944f2ed,4cea6c1..a22d07d
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
@@@ -135,29 -106,4 +135,29 @@@ final class LocalSnapshotMetadat
artifacts.clear();
}
-}
+ private String getKey( String classifier, String extension )
+ {
+ return classifier + ':' + extension;
+ }
+
+ public String getGroupId()
+ {
+ return metadata.getGroupId();
+ }
+
+ public String getArtifactId()
+ {
+ return metadata.getArtifactId();
+ }
+
+ public String getVersion()
+ {
+ return metadata.getVersion();
+ }
+
+ public Nature getNature()
+ {
+ return Nature.SNAPSHOT;
+ }
+
- }
++}
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java
----------------------------------------------------------------------
diff --cc maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java
index 0000000,0f88cdc..1e6f909
mode 000000,100644..100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java
@@@ -1,0 -1,100 +1,100 @@@
+ package org.apache.maven.repository.internal;
+
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ import java.io.File;
+ import java.util.ArrayList;
+ import java.util.Collection;
+
+ import org.apache.maven.artifact.repository.metadata.Metadata;
-import org.sonatype.aether.artifact.Artifact;
++import org.eclipse.aether.artifact.Artifact;
+
+ /**
+ * @author Hervé Boutemy
+ */
+ abstract class MavenSnapshotMetadata
+ extends MavenMetadata
+ {
+ static final String SNAPSHOT = "SNAPSHOT";
+
+ protected final Collection<Artifact> artifacts = new ArrayList<Artifact>();
+
+ protected final boolean legacyFormat;
+
+ protected MavenSnapshotMetadata( Metadata metadata, File file, boolean legacyFormat )
+ {
+ super( metadata, file );
+ this.legacyFormat = legacyFormat;
+ }
+
+ protected static Metadata createRepositoryMetadata( Artifact artifact, boolean legacyFormat )
+ {
+ Metadata metadata = new Metadata();
+ if ( !legacyFormat )
+ {
+ metadata.setModelVersion( "1.1.0" );
+ }
+ metadata.setGroupId( artifact.getGroupId() );
+ metadata.setArtifactId( artifact.getArtifactId() );
+ metadata.setVersion( artifact.getBaseVersion() );
+
+ return metadata;
+ }
+
+ public void bind( Artifact artifact )
+ {
+ artifacts.add( artifact );
+ }
+
+ public Object getKey()
+ {
+ return getGroupId() + ':' + getArtifactId() + ':' + getVersion();
+ }
+
+ public static Object getKey( Artifact artifact )
+ {
+ return artifact.getGroupId() + ':' + artifact.getArtifactId() + ':' + artifact.getBaseVersion();
+ }
+
+ protected String getKey( String classifier, String extension )
+ {
+ return classifier + ':' + extension;
+ }
+
+ public String getGroupId()
+ {
+ return metadata.getGroupId();
+ }
+
+ public String getArtifactId()
+ {
+ return metadata.getArtifactId();
+ }
+
+ public String getVersion()
+ {
+ return metadata.getVersion();
+ }
+
+ public Nature getNature()
+ {
+ return Nature.SNAPSHOT;
+ }
+ }
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
----------------------------------------------------------------------
diff --cc maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
index 7d9935c,8024d31..4ee80ec
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
@@@ -26,12 -24,9 +26,11 @@@ import java.util.Map
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
- import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
import org.codehaus.plexus.util.FileUtils;
-import org.sonatype.aether.RepositoryException;
-import org.sonatype.aether.metadata.MergeableMetadata;
+import org.eclipse.aether.RepositoryException;
+import org.eclipse.aether.metadata.AbstractMetadata;
+import org.eclipse.aether.metadata.MergeableMetadata;
+import org.eclipse.aether.metadata.Metadata;
/**
* <strong>Warning:</strong> This is an internal utility class that is only public for technical reasons, it is not part
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
----------------------------------------------------------------------
diff --cc maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index 0f8f6f6,98dc5c1..0835153
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@@ -79,38 -80,20 +79,40 @@@ import org.codehaus.plexus.util.IOUtil
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.sonatype.aether.ConfigurationProperties;
-import org.sonatype.aether.RepositorySystem;
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.repository.Authentication;
-import org.sonatype.aether.repository.LocalRepository;
-import org.sonatype.aether.repository.NoLocalRepositoryManagerException;
-import org.sonatype.aether.repository.RepositoryPolicy;
-import org.sonatype.aether.repository.WorkspaceReader;
-import org.sonatype.aether.spi.localrepo.LocalRepositoryManagerFactory;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
-import org.sonatype.aether.util.repository.ChainedWorkspaceReader;
-import org.sonatype.aether.util.repository.DefaultAuthenticationSelector;
-import org.sonatype.aether.util.repository.DefaultMirrorSelector;
-import org.sonatype.aether.util.repository.DefaultProxySelector;
+import org.eclipse.aether.ConfigurationProperties;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.collection.DependencyGraphTransformer;
+import org.eclipse.aether.collection.DependencyManager;
+import org.eclipse.aether.collection.DependencySelector;
+import org.eclipse.aether.collection.DependencyTraverser;
+import org.eclipse.aether.repository.LocalRepository;
++import org.eclipse.aether.repository.NoLocalRepositoryManagerException;
+import org.eclipse.aether.repository.RepositoryPolicy;
+import org.eclipse.aether.repository.WorkspaceReader;
+import org.eclipse.aether.resolution.ResolutionErrorPolicy;
++import org.eclipse.aether.spi.localrepo.LocalRepositoryManagerFactory;
+import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
+import org.eclipse.aether.util.graph.selector.AndDependencySelector;
+import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
+import org.eclipse.aether.util.graph.selector.OptionalDependencySelector;
+import org.eclipse.aether.util.graph.selector.ScopeDependencySelector;
+import org.eclipse.aether.util.graph.transformer.ChainedDependencyGraphTransformer;
+import org.eclipse.aether.util.graph.transformer.ConflictResolver;
+import org.eclipse.aether.util.graph.transformer.JavaScopeDeriver;
+import org.eclipse.aether.util.graph.transformer.JavaScopeSelector;
+import org.eclipse.aether.util.graph.transformer.JavaDependencyContextRefiner;
+import org.eclipse.aether.util.graph.transformer.NearestVersionSelector;
+import org.eclipse.aether.util.graph.transformer.SimpleOptionalitySelector;
+import org.eclipse.aether.util.graph.traverser.FatArtifactTraverser;
+import org.eclipse.aether.util.repository.AuthenticationBuilder;
+import org.eclipse.aether.util.repository.ChainedWorkspaceReader;
+import org.eclipse.aether.util.repository.DefaultAuthenticationSelector;
+import org.eclipse.aether.util.repository.DefaultMirrorSelector;
+import org.eclipse.aether.util.repository.DefaultProxySelector;
+import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy;
+import org.eclipse.aether.util.repository.SimpleResolutionErrorPolicy;
/**
* @author Jason van Zyl
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
----------------------------------------------------------------------
diff --cc maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
index 32e43bf,075283d..a76461d
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
@@@ -31,14 -44,12 +44,12 @@@ import org.apache.maven.project.artifac
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
-import org.sonatype.aether.graph.Dependency;
-import org.sonatype.aether.graph.DependencyFilter;
-import org.sonatype.aether.graph.DependencyNode;
-import org.sonatype.aether.util.filter.AndDependencyFilter;
-import org.sonatype.aether.util.filter.ScopeDependencyFilter;
+import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.graph.DependencyFilter;
+import org.eclipse.aether.graph.DependencyNode;
+import org.eclipse.aether.util.filter.AndDependencyFilter;
+import org.eclipse.aether.util.filter.ScopeDependencyFilter;
- import java.util.*;
-
/**
* Resolves dependencies for the artifacts in context of the lifecycle build
*
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-core/src/main/java/org/apache/maven/plugin/BuildPluginManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java
----------------------------------------------------------------------
diff --cc maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java
index ab5c3df,0e67f37..6fe1f72
--- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java
@@@ -21,6 -19,8 +19,8 @@@ package org.apache.maven.plugin.prefix
* under the License.
*/
-import org.sonatype.aether.repository.ArtifactRepository;
++import org.eclipse.aether.repository.ArtifactRepository;
+
/**
* Describes the result of a plugin prefix resolution request.
*
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
----------------------------------------------------------------------
diff --cc maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
index a2b21a3,f09c768..6560fe5
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
@@@ -23,11 -23,12 +23,12 @@@ import java.text.DecimalFormat
import java.text.DecimalFormatSymbols;
import java.util.Locale;
+import org.eclipse.aether.transfer.AbstractTransferListener;
+import org.eclipse.aether.transfer.TransferCancelledException;
+import org.eclipse.aether.transfer.TransferEvent;
+import org.eclipse.aether.transfer.TransferResource;
import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
-import org.sonatype.aether.transfer.AbstractTransferListener;
-import org.sonatype.aether.transfer.TransferCancelledException;
-import org.sonatype.aether.transfer.TransferEvent;
-import org.sonatype.aether.transfer.TransferResource;
public class Slf4jMavenTransferListener
extends AbstractTransferListener
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index c631354,2ffd0e8..22a0162
--- a/pom.xml
+++ b/pom.xml
@@@ -62,8 -62,7 +62,9 @@@
<distributionId>apache-maven</distributionId>
<distributionShortName>Maven</distributionShortName>
<distributionName>Apache Maven</distributionName>
+ <siteDeployUrl>scp://people.apache.org/www/maven.apache.org/ref/${project.version}/</siteDeployUrl>
+ <siteUrl>http://maven.apache.org/ref/${project.version}/</siteUrl>
+ <maven.site.path>ref/3-LATEST</maven.site.path>
</properties>
<modules>
http://git-wip-us.apache.org/repos/asf/maven/blob/137cbd8a/src/site/site.xml
----------------------------------------------------------------------
diff --cc src/site/site.xml
index cdaacd9,6954e93..291d8ce
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@@ -35,11 -35,7 +35,7 @@@ under the License
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <<<<<<< HEAD
- <version>1.2.1</version>
+ <version>1.3.0</version>
- =======
- <version>1.0</version>
- >>>>>>> 4fdcdbd26244ff81e242054fd38cf415d92499be
</skin>
<body>