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/14 21:04:18 UTC
[50/50] [abbrv] git commit: Merge branch 'eclipse-aether' of
github.com:tesla/tesla-build into eclipse-aether
Updated Branches:
refs/heads/eclipse-aether [created] ebf2e4dde
Merge branch 'eclipse-aether' of github.com:tesla/tesla-build into eclipse-aether
Conflicts:
.gitignore
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ebf2e4dd
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ebf2e4dd
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ebf2e4dd
Branch: refs/heads/eclipse-aether
Commit: ebf2e4ddeaee2c7634a66b7c08bf4bf197768896
Parents: 2c2bf6e de40fe1
Author: Jason van Zyl <ja...@tesla.io>
Authored: Thu Mar 14 13:03:31 2013 -0700
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Thu Mar 14 13:03:31 2013 -0700
----------------------------------------------------------------------
.gitignore | 1 -
apache-maven/pom.xml | 2 +-
init-git-svn.sh | 4 -
maven-aether-provider/pom.xml | 23 +-
.../internal/ArtifactDescriptorUtils.java | 18 +-
.../internal/DefaultArtifactDescriptorReader.java | 159 +++++--
.../repository/internal/DefaultModelCache.java | 4 +-
.../repository/internal/DefaultModelResolver.java | 20 +-
.../repository/internal/DefaultServiceLocator.java | 52 --
.../internal/DefaultVersionRangeResolver.java | 156 ++++---
.../internal/DefaultVersionResolver.java | 366 ++++++++-------
.../repository/internal/LocalSnapshotMetadata.java | 70 +++-
.../internal/LocalSnapshotMetadataGenerator.java | 12 +-
.../repository/internal/MavenAetherModule.java | 55 +++
.../maven/repository/internal/MavenMetadata.java | 31 +-
.../internal/MavenRepositorySystemSession.java | 119 -----
.../internal/MavenRepositorySystemUtils.java | 136 ++++++
.../repository/internal/MavenServiceLocator.java | 54 ---
.../repository/internal/MavenSnapshotMetadata.java | 2 +-
.../repository/internal/RelocatedArtifact.java | 14 +-
.../internal/RemoteSnapshotMetadata.java | 2 +-
.../internal/RemoteSnapshotMetadataGenerator.java | 12 +-
.../internal/SnapshotMetadataGeneratorFactory.java | 12 +-
.../repository/internal/VersionsMetadata.java | 4 +-
.../internal/VersionsMetadataGenerator.java | 12 +-
.../internal/VersionsMetadataGeneratorFactory.java | 12 +-
.../internal/AbstractRepositoryTestCase.java | 76 ---
.../internal/DefaultServiceLocatorTest.java | 45 --
.../internal/DefaultVersionResolverTest.java | 96 ----
.../internal/MavenRepositorySystemUtilsTest.java | 45 ++
.../repository/internal/RepositorySystemTest.java | 220 ---------
.../internal/util/ConsoleRepositoryListener.java | 132 ------
.../internal/util/ConsoleTransferListener.java | 186 --------
maven-compat/pom.xml | 2 +-
.../artifact/deployer/DefaultArtifactDeployer.java | 30 +-
.../installer/DefaultArtifactInstaller.java | 18 +-
.../DefaultArtifactRepositoryFactory.java | 2 +-
.../repository/metadata/MetadataBridge.java | 20 +-
.../artifact/resolver/DefaultArtifactResolver.java | 14 +-
.../org/apache/maven/project/ProjectUtils.java | 2 +-
.../repository/legacy/LegacyRepositorySystem.java | 38 +-
.../AbstractArtifactComponentTestCase.java | 63 ++-
.../project/AbstractMavenProjectTestCase.java | 15 +-
.../maven/project/ClasspathArtifactResolver.java | 14 +-
.../project/LegacyLocalRepositoryManager.java | 147 ++++++-
.../apache/maven/project/ProjectClasspathTest.java | 4 +-
.../repository/LegacyRepositorySystemTest.java | 18 +-
.../legacy/LegacyRepositorySystemTest.java | 8 +
.../artifact/resolver/ArtifactResolverTest.xml | 2 +-
maven-core/pom.xml | 6 +-
.../main/java/org/apache/maven/DefaultMaven.java | 107 +++--
.../apache/maven/LoggingRepositoryListener.java | 6 +-
.../main/java/org/apache/maven/ReactorReader.java | 12 +-
.../java/org/apache/maven/RepositoryUtils.java | 54 ++-
.../repository/LegacyLocalRepositoryManager.java | 38 +-
.../classrealm/ArtifactClassRealmConstituent.java | 2 +-
.../apache/maven/classrealm/ClassRealmManager.java | 2 +-
.../maven/classrealm/DefaultClassRealmManager.java | 28 +-
.../java/org/apache/maven/eventspy/EventSpy.java | 2 +-
.../eventspy/internal/EventSpyDispatcher.java | 2 +-
.../internal/EventSpyRepositoryListener.java | 6 +-
.../execution/DefaultMavenExecutionRequest.java | 8 +-
.../maven/execution/MavenExecutionRequest.java | 6 +-
.../org/apache/maven/execution/MavenSession.java | 2 +-
.../internal/LifecycleDependencyResolver.java | 14 +-
.../apache/maven/plugin/BuildPluginManager.java | 4 +-
.../java/org/apache/maven/plugin/CacheUtils.java | 10 +-
.../maven/plugin/DefaultBuildPluginManager.java | 4 +-
.../maven/plugin/DefaultExtensionRealmCache.java | 2 +-
.../maven/plugin/DefaultPluginArtifactsCache.java | 12 +-
.../maven/plugin/DefaultPluginDescriptorCache.java | 8 +-
.../maven/plugin/DefaultPluginRealmCache.java | 10 +-
.../apache/maven/plugin/ExtensionRealmCache.java | 2 +-
.../org/apache/maven/plugin/LegacySupport.java | 2 +-
.../apache/maven/plugin/MavenPluginManager.java | 6 +-
.../apache/maven/plugin/PluginArtifactsCache.java | 8 +-
.../apache/maven/plugin/PluginDescriptorCache.java | 4 +-
.../org/apache/maven/plugin/PluginRealmCache.java | 6 +-
.../plugin/internal/DefaultLegacySupport.java | 3 +-
.../plugin/internal/DefaultMavenPluginManager.java | 16 +-
.../DefaultPluginDependenciesResolver.java | 91 ++---
.../maven/plugin/internal/PlexusUtilsInjector.java | 18 +-
.../internal/PluginDependenciesResolver.java | 10 +-
.../maven/plugin/internal/WagonExcluder.java | 8 +-
.../plugin/prefix/DefaultPluginPrefixRequest.java | 4 +-
.../prefix/NoPluginFoundForPrefixException.java | 4 +-
.../maven/plugin/prefix/PluginPrefixRequest.java | 4 +-
.../maven/plugin/prefix/PluginPrefixResult.java | 2 +-
.../internal/DefaultPluginPrefixResolver.java | 42 +-
.../prefix/internal/DefaultPluginPrefixResult.java | 2 +-
.../version/DefaultPluginVersionRequest.java | 4 +-
.../maven/plugin/version/PluginVersionRequest.java | 4 +-
.../version/PluginVersionResolutionException.java | 4 +-
.../maven/plugin/version/PluginVersionResult.java | 2 +-
.../internal/DefaultPluginVersionResolver.java | 44 +-
.../internal/DefaultPluginVersionResult.java | 2 +-
.../DefaultDependencyResolutionRequest.java | 4 +-
.../project/DefaultDependencyResolutionResult.java | 4 +-
.../maven/project/DefaultProjectBuilder.java | 25 +-
.../project/DefaultProjectBuildingHelper.java | 12 +-
.../project/DefaultProjectBuildingRequest.java | 2 +-
.../DefaultProjectDependenciesResolver.java | 71 ++--
.../maven/project/DefaultProjectRealmCache.java | 2 +-
.../maven/project/DependencyResolutionRequest.java | 4 +-
.../maven/project/DependencyResolutionResult.java | 4 +-
.../org/apache/maven/project/MavenProject.java | 4 +-
.../maven/project/ProjectBuildingRequest.java | 2 +-
.../apache/maven/project/ProjectModelResolver.java | 18 +-
.../apache/maven/project/ProjectRealmCache.java | 2 +-
.../project/artifact/MavenMetadataSource.java | 10 +-
.../apache/maven/repository/RepositorySystem.java | 2 +-
.../rtinfo/internal/DefaultRuntimeInformation.java | 12 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 17 +-
.../internal/stub/BuildPluginManagerStub.java | 4 +-
.../internal/stub/PluginPrefixResolverStub.java | 2 +-
.../internal/stub/PluginVersionResolverStub.java | 2 +-
.../stub/ProjectDependenciesResolverStub.java | 6 +-
.../project/AbstractMavenProjectTestCase.java | 15 +-
.../project/LegacyLocalRepositoryManager.java | 147 ++++++-
.../apache/maven/project/PomConstructionTest.java | 28 +-
.../maven/repository/TestRepositoryConnector.java | 18 +-
.../repository/TestRepositoryConnectorFactory.java | 12 +-
.../maven/repository/TestRepositorySystem.java | 2 +-
.../settings/PomConstructionWithSettingsTest.java | 22 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 2 +-
.../transfer/AbstractMavenTransferListener.java | 8 +-
.../cli/transfer/ConsoleMavenTransferListener.java | 6 +-
.../cli/transfer/QuietMavenTransferListener.java | 2 +-
.../cli/transfer/Slf4jMavenTransferListener.java | 8 +-
maven-embedder/src/site/apt/logging.apt | 20 +
maven-plugin-api/pom.xml | 10 +
maven-plugin-api/src/site/apt/index.apt | 15 +
pom.xml | 25 +-
src/site/site.xml | 2 +-
134 files changed, 1794 insertions(+), 1943 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ebf2e4dd/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index bba4583,5221f06..f8ca4f4
--- a/.gitignore
+++ b/.gitignore
@@@ -7,9 -7,11 +7,8 @@@ bin
# Intellij
*.ipr
*.iml
-<<<<<<< HEAD
.idea
-=======
->>>>>>> 4fdcdbd26244ff81e242054fd38cf415d92499be
-
+out/
-
.DS_Store
/bootstrap
/dependencies.xml
http://git-wip-us.apache.org/repos/asf/maven/blob/ebf2e4dd/apache-maven/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ebf2e4dd/maven-aether-provider/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ebf2e4dd/maven-compat/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ebf2e4dd/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ebf2e4dd/maven-core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ebf2e4dd/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ebf2e4dd/maven-plugin-api/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ebf2e4dd/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 2049e9f,22a0162..ed5ea97
--- a/pom.xml
+++ b/pom.xml
@@@ -56,10 -53,10 +56,10 @@@
<wagonVersion>2.4</wagonVersion>
<securityDispatcherVersion>1.3</securityDispatcherVersion>
<cipherVersion>1.7</cipherVersion>
- <modelloVersion>1.6</modelloVersion>
+ <modelloVersion>1.7</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
- <aetherVersion>1.13.1</aetherVersion>
<slf4jVersion>1.7.2</slf4jVersion>
- <aetherVersion>0.9.0-SNAPSHOT</aetherVersion>
++ <aetherVersion>0.9.0.M2</aetherVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
<distributionId>apache-maven</distributionId>