You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/01/04 22:15:06 UTC
svn commit: r1227327 [2/2] - in /maven/maven-3/trunk: ./ apache-maven/
maven-artifact/src/main/java/org/apache/maven/artifact/repository/
maven-artifact/src/main/java/org/apache/maven/repository/
maven-compat/src/main/java/org/apache/maven/artifact/ ma...
Propchange: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:738757-738972
/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:738757-738972
/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:738757-738972
/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:738757-738972
/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:738757-738972
/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:738757-738972
/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:738757-738972
/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java:738757-738972
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/MissingModuleException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/reactor/MissingModuleException.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/reactor/MissingModuleException.java:738757-738972
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/MissingModuleException.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/MissingModuleException.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/MissingModuleException.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/sisbell-plugin-manager/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:738757-738972
/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:751453-767358,767708-768832
/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java:688587-696625,696644-699681
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:738757-738972
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:688587-696625,696644-699681,751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:738757-738972
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:688587-696625,696644-699681,751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorParsingException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java:738757-738972
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorParsingException.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorParsingException.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -6,4 +6,4 @@
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:738757-738972
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java:751453-767358,767708-768832
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:688587-696625,696644-699681
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -6,4 +6,4 @@
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:738757-738972
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java:751453-767358,767708-768832
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:688587-696625,696644-699681
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -6,4 +6,4 @@
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:738757-738972
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java:751453-767358,767708-768832
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:688587-696625,696644-699681
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project:738757-738972
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/project:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/project:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java:738757-738972
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/DelegatingLocalArtifactRepository.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/DelegatingLocalArtifactRepository.java:738757-738972
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DelegatingLocalArtifactRepository.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/LocalArtifactRepository.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/LocalArtifactRepository.java:738757-738972
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/LocalArtifactRepository.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -6,4 +6,4 @@
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/MavenTools.java:738757-738972
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/MavenTools.java:688587-696625,696644-699681
/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/main/mdo/toolchains.mdo
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -1,2 +1,2 @@
/maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo:768778,768796
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/mdo/toolchains.mdo:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/mdo/toolchains.mdo:1222270,1227325
Modified: maven/maven-3/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=1227327&r1=1227326&r2=1227327&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/maven-3/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml Wed Jan 4 21:15:03 2012
@@ -129,10 +129,10 @@ under the License.
</phases>
<default-phases>
<site>
- org.apache.maven.plugins:maven-site-plugin:2.0.1:site
+ org.apache.maven.plugins:maven-site-plugin:3.0:site
</site>
<site-deploy>
- org.apache.maven.plugins:maven-site-plugin:2.0.1:deploy
+ org.apache.maven.plugins:maven-site-plugin:3.0:deploy
</site-deploy>
</default-phases>
<!-- END SNIPPET: site -->
Propchange: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTest.java:738757-738972
/maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTest.java:688587-696625,696644-699681
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:738757-738972
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:738757-738972
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:738757-738972
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:738757-738972
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/artifact/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/artifact:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/artifact:738757-738972
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/artifact:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/artifact:1222270,1227325
Propchange: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/canonical/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/canonical:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/canonical:738757-738972
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical:751453-767358,767708-768832
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/canonical:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/canonical:1222270,1227325
Propchange: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenLoggerManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -6,4 +6,4 @@
/maven/components/sisbell-plugin-manager/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java:738757-738972
/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java:751453-767358,767708-768832
/maven/maven-2/branches/maven-2.2.x/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java:795521
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-embedder/src/main/java/org/apache/maven/cli/MavenLoggerManager.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-embedder/src/main/java/org/apache/maven/cli/MavenLoggerManager.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-model-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -7,4 +7,4 @@
/maven/components/trunk/maven-model-builder:767708-768832
/maven/components/trunk/maven-project-builder:688587-696625,696644-699681
/maven/maven-3/branches/MNG-1803/maven-model-builder:935092-949699
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-model-builder:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-model-builder:1222270,1227325
Propchange: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -6,4 +6,4 @@
/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/path:751453-767358,767708-768832
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path:688587-696625,696644-699681
/maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/path:935092-949699
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-model-builder/src/main/java/org/apache/maven/model/path:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-model-builder/src/main/java/org/apache/maven/model/path:1222270,1227325
Propchange: maven/maven-3/trunk/maven-model-builder/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/sisbell-plugin-manager/maven-project/src/main/mdo:738757-738972
/maven/components/trunk/maven-model-builder/src/main/mdo:767708-768832
/maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/mdo:935092-949699
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-model-builder/src/main/mdo:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-model-builder/src/main/mdo:1222270,1227325
Propchange: maven/maven-3/trunk/maven-model-builder/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -5,4 +5,4 @@
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/resources:738757-738972
/maven/components/trunk/maven-model-builder/src/main/resources:767708-768832
/maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/resources:935092-949699
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-model-builder/src/main/resources:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-model-builder/src/main/resources:1222270,1227325
Propchange: maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -6,4 +6,4 @@
/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/validation:738757-738972
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation:751453-767358,767708-768832
/maven/maven-3/branches/MNG-1803/maven-model-builder/src/test/java/org/apache/maven/model/validation:935092-949699
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-model-builder/src/test/java/org/apache/maven/model/validation:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-model-builder/src/test/java/org/apache/maven/model/validation:1222270,1227325
Propchange: maven/maven-3/trunk/maven-plugin-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -7,4 +7,4 @@
/maven/components/trunk/maven-plugin-api:751453-767358,767708-768832
/maven/maven-2/branches/maven-2.2.x/maven-plugin-api:795521
/maven/maven-2/branches/maven-2.2.x/maven-plugin-descriptor:1096335
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-plugin-api:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-plugin-api:1222270,1227325
Propchange: maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -6,4 +6,4 @@
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:738757-738972
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:688587-696625,696644-699681
/maven/maven-2/branches/maven-2.2.x/maven-plugin-descriptor/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:1096335
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:1222270,1227325
Propchange: maven/maven-3/trunk/maven-repository-metadata/src/site/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -6,6 +6,6 @@
/maven/components/branches/maven-2.1.x/maven-repository-metadata/src/site:751686,767628,767631,768817,768995,769010-769011
/maven/components/trunk/maven-repository-metadata/src/site:572229,720001,721902,726845,729292,792073
/maven/maven-2/branches/maven-2.2.x-MNG-4347/maven-repository-metadata/src/site:813112
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-repository-metadata/src/site:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-repository-metadata/src/site:1222270,1227325
/maven/maven-3/trunk/maven-repository-metadata/src/site:894114,894176
/maven/sandbox/branches/maven/MNG-3379/maven-repository-metadata/src/site:678167
Propchange: maven/maven-3/trunk/maven-settings/src/site/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 21:15:03 2012
@@ -7,5 +7,5 @@
/maven/components/trunk/maven-core/src/site:804537
/maven/components/trunk/maven-settings/src/site:572229,720001,721902,726845,729292,792073
/maven/maven-2/branches/maven-2.2.x-MNG-4347/maven-settings/src/site:813112
-/maven/maven-3/branches/maven-3.0.4-RCx/maven-settings/src/site:1222270
+/maven/maven-3/branches/maven-3.0.4-RCx/maven-settings/src/site:1222270,1227325
/maven/sandbox/branches/maven/MNG-3379/maven-settings/src/site:678167