Author: jvanzyl
Date: Fri Feb 20 02:30:56 2009
New Revision: 746116
URL: http://svn.apache.org/viewvc?rev=746116&view=rev
Log: (empty)
Modified:
maven/components/branches/MNG-3932/ (props changed)
maven/components/branches/MNG-3932/apache-maven/ (props changed)
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/
(props changed)
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
(props changed)
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/inheritance/
(props changed)
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/path/
(props changed)
maven/components/branches/MNG-3932/maven-compat/src/main/mdo/ (props
changed)
maven/components/branches/MNG-3932/maven-compat/src/test/ (props changed)
maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/project/path/
(props changed)
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/
(props changed)
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
(props changed)
maven/components/branches/MNG-3932/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java
(props changed)
maven/components/branches/MNG-3932/maven-project-builder/src/main/resources/
(props changed)
maven/components/branches/MNG-3932/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java
(props changed)
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java
(props changed)
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
(props changed)
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
(props changed)
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
(props changed)
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/DefaultPomArtifactResolver.java
(props changed)
maven/components/branches/MNG-3932/maven-project/src/main/mdo/ (props
changed)
Propchange: maven/components/branches/MNG-3932/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932:739772-740199
+/maven/components/branches/MNG-3932:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC:680477
/maven/components/branches/maven-2.0.x:679206,708871,720042,726541,727548,727998,728940,729060,729738,729785,730631
/maven/components/branches/maven-2.1.x:739385
Propchange: maven/components/branches/MNG-3932/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/apache-maven:739772-740199
+/maven/components/branches/MNG-3932/apache-maven:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-distribution:680477
/maven/components/branches/maven-2.0.x/maven-distribution:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
/maven/components/branches/sisbell-plugin-manager/apache-maven:738973-739966
Propchange:
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact:739772-740199
+/maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact:680477
/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact:679206
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact:679206
Propchange:
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java:739772-740199
+/maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java:680477
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java:679206,720042
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java:738973-739966
Propchange:
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/inheritance/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,3 +1,4 @@
+/maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/inheritance:746067-746100
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/inheritance:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/inheritance:738757-738972
/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance:740316-741812,742231-742684,742726-745532,745632-746028
Propchange:
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/path/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/path:739772-740199
+/maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/path:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/path:680477
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/path:679206,720042
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/path:738973-739966
Propchange: maven/components/branches/MNG-3932/maven-compat/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/maven-compat/src/main/mdo:739772-740199
+/maven/components/branches/MNG-3932/maven-compat/src/main/mdo:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/mdo:680477
/maven/components/branches/maven-2.0.x/maven-artifact/src/main/mdo:679206
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/mdo:679206
Propchange: maven/components/branches/MNG-3932/maven-compat/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/maven-compat/src/test:739772-740199
+/maven/components/branches/MNG-3932/maven-compat/src/test:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test:680477
/maven/components/branches/maven-2.0.x/maven-artifact/src/test:679206
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test:679206
Propchange:
maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/project/path/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/project/path:739772-740199
+/maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/project/path:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/path:680477
/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/path:679206,720042
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/project/path:738973-739966
Propchange:
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners:739772-740199
+/maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/builder/listeners:680477
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/builder/listeners:679206
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners:738973-739966
Propchange:
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:739772-740199
+/maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:680477
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:738973-739966
Propchange:
maven/components/branches/MNG-3932/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:739772-740199
+/maven/components/branches/MNG-3932/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java:680477
/maven/components/branches/maven-2.0.x/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:738973-739966
Propchange:
maven/components/branches/MNG-3932/maven-project-builder/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/maven-project-builder/src/main/resources:739772-740199
+/maven/components/branches/MNG-3932/maven-project-builder/src/main/resources:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/resources:680477
/maven/components/branches/maven-2.0.x/maven-project/src/main/resources:679206,720042
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/resources:738973-739966
Propchange:
maven/components/branches/MNG-3932/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java:739772-740199
+/maven/components/branches/MNG-3932/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/test/java/EnforcerPomTest.java:680477
/maven/components/branches/maven-2.0.x/maven-project-builder/src/test/java/EnforcerPomTest.java:679206,720042
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java:738973-739966
Propchange:
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java:739772-740199
+/maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-profile/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java:680477
/maven/components/branches/maven-2.0.x/maven-profile/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java:738973-739966
Propchange:
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java:739772-740199
+/maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java:680477
/maven/components/branches/maven-2.0.x/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java:738973-739966
Propchange:
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java:739772-740199
+/maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-profile/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java:680477
/maven/components/branches/maven-2.0.x/maven-profile/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java:738973-739966
Propchange:
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java:739772-740199
+/maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java:680477
/maven/components/branches/maven-2.0.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java:738973-739966
Propchange:
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/DefaultPomArtifactResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,3 +1,4 @@
+/maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/DefaultPomArtifactResolver.java:746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/builder/PomArtifactResolver.java:680477
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/builder/PomArtifactResolver.java:679206,720042
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/builder/DefaultPomArtifactResolver.java:738973-739966
Propchange: maven/components/branches/MNG-3932/maven-project/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 02:30:56 2009
@@ -1,4 +1,4 @@
-/maven/components/branches/MNG-3932/maven-project/src/main/mdo:739772-740199
+/maven/components/branches/MNG-3932/maven-project/src/main/mdo:739772-740199,746067-746100
/maven/components/branches/maven-2.0.10-RC/maven-profile/src/main/mdo:680477
/maven/components/branches/maven-2.0.x/maven-profile/src/main/mdo:679206
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/mdo:738973-739966
