Author: jvanzyl
Date: Fri Feb 20 03:15:42 2009
New Revision: 746121
URL: http://svn.apache.org/viewvc?rev=746121&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-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessor.java
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessorException.java
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 03:15:42 2009
@@ -4,4 +4,4 @@
/maven/components/branches/maven-2.1.x:739385
/maven/components/branches/sisbell-plugin-manager:738973-739966
/maven/components/sisbell-plugin-manager:738757-738972
-/maven/components/trunk:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
Propchange: maven/components/branches/MNG-3932/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 03:15:42 2009
@@ -3,5 +3,5 @@
/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
/maven/components/sisbell-plugin-manager/apache-maven:738757-738972
-/maven/components/trunk/apache-maven:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/apache-maven:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
/maven/components/trunk/maven-distribution:688587-696625,696644-699681
Propchange:
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 03:15:42 2009
@@ -4,4 +4,4 @@
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact:738757-738972
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
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 03:15:42 2009
@@ -3,4 +3,4 @@
/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
/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java:738757-738972
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
Propchange:
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/inheritance/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 03:15:42 2009
@@ -1,4 +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
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance:740316-741812,742231-742684,742726-745532,745632-746028,746072
Propchange:
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/path/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 03:15:42 2009
@@ -3,5 +3,5 @@
/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
/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/path:738757-738972
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/path:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/path:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-3932/maven-compat/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 03:15:42 2009
@@ -4,4 +4,4 @@
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/mdo:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/mdo:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/main/mdo:738757-738972
-/maven/components/trunk/maven-compat/src/main/mdo:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/maven-compat/src/main/mdo:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
Propchange: maven/components/branches/MNG-3932/maven-compat/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 03:15:42 2009
@@ -4,4 +4,4 @@
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test:738757-738972
-/maven/components/trunk/maven-compat/src/test:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/maven-compat/src/test:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
Propchange:
maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/project/path/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 03:15:42 2009
@@ -3,5 +3,5 @@
/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
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/project/path:738757-738972
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/project/path:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/project/path:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path:688587-696625,696644-699681
Propchange:
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 03:15:42 2009
@@ -3,5 +3,5 @@
/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
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners:688587-696625,696644-699681
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 03:15:42 2009
@@ -3,5 +3,5 @@
/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
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:688587-696625,696644-699681
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 03:15:42 2009
@@ -3,4 +3,4 @@
/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
/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:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
Modified:
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java?rev=746121&r1=746120&r2=746121&view=diff
==============================================================================
---
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
(original)
+++
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
Fri Feb 20 03:15:42 2009
@@ -91,7 +91,9 @@
byte[] superBytes = mdReader.readMetadata( bmd );
if ( superBytes == null || superBytes.length < 1 )
+ {
throw new DependencyProcessorException( "cannot read metadata
for " + bmd.getGAV() );
+ }
MavenDomainModel domainModel = new MavenDomainModel( superBytes );
domainModels.add( domainModel );
@@ -104,15 +106,17 @@
}
List<DomainModel> parentModels = getParentsOfDomainModel(
domainModel, mdReader );
-
- if( parentModels == null )
+
+ if ( parentModels == null )
+ {
throw new DependencyProcessorException( "cannot read parent
for " + bmd.getGAV() );
-
+ }
+
domainModels.addAll( parentModels );
}
catch ( IOException e )
{
- throw new MetadataReaderException( "Failed to create domain model.
Message = " + e.getMessage() );
+ throw new MetadataReaderException( "Failed to create domain model.
Message = " + e.getMessage(), e );
}
PomTransformer transformer = new PomTransformer( new
MavenDomainModelFactory() );
@@ -128,7 +132,7 @@
}
catch ( IOException e )
{
- throw new MetadataReaderException( "Unable to transform model" );
+ throw new MetadataReaderException( "Unable to transform model", e
);
}
}
@@ -141,10 +145,11 @@
byte[] b = mdReader.readMetadata( domainModel.getParentMetadata()
);
if ( b == null || b.length < 1 )
+ {
throw new DependencyProcessorException( "cannot read metadata
for " + domainModel.getParentMetadata() );
+ }
- MavenDomainModel parentDomainModel =
- new MavenDomainModel( b );
+ MavenDomainModel parentDomainModel = new MavenDomainModel( b );
domainModels.add( parentDomainModel );
domainModels.addAll( getParentsOfDomainModel( parentDomainModel,
mdReader ) );
}
Modified:
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java?rev=746121&r1=746120&r2=746121&view=diff
==============================================================================
---
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
(original)
+++
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
Fri Feb 20 03:15:42 2009
@@ -63,7 +63,7 @@
/**
* Constructor
- *
+ *
* @throws IOException if there is a problem constructing the model
*/
public MavenDomainModel( byte[] bytes )
@@ -74,7 +74,7 @@
/**
* Constructor
- *
+ *
* @throws IOException if there is a problem constructing the model
*/
public MavenDomainModel( InputStream inputStream )
@@ -85,7 +85,7 @@
/**
* Constructor
- *
+ *
* @throws IOException if there is a problem constructing the model
*/
public MavenDomainModel( List<ModelProperty> modelProperties )
@@ -247,7 +247,7 @@
}
ModelDataSource dataSource = new DefaultModelDataSource(
container.getProperties(), Arrays.asList( new ArtifactModelContainerFactory(),
- new
ExclusionModelContainerFactory() ));
+ new
ExclusionModelContainerFactory() ) );
List<ArtifactBasicMetadata> exclusions = new
ArrayList<ArtifactBasicMetadata>();
for ( ModelContainer exclusion : dataSource.queryFor(
ProjectUri.Dependencies.Dependency.Exclusions.Exclusion.xUri ) )
Modified:
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessor.java?rev=746121&r1=746120&r2=746121&view=diff
==============================================================================
---
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessor.java
(original)
+++
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessor.java
Fri Feb 20 03:15:42 2009
@@ -10,6 +10,7 @@
public interface PomProcessor
{
- List<ModelProperty> getRawPom(ArtifactBasicMetadata bmd, MetadataReader
mdReader, Map env, Map sysProps)
+ List<ModelProperty> getRawPom(ArtifactBasicMetadata bmd, MetadataReader
mdReader, Map<String, String> env,
+ Map<String, String> sysProps)
throws MetadataReaderException, PomProcessorException;
}
Modified:
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessorException.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessorException.java?rev=746121&r1=746120&r2=746121&view=diff
==============================================================================
---
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessorException.java
(original)
+++
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessorException.java
Fri Feb 20 03:15:42 2009
@@ -1,6 +1,7 @@
package org.apache.maven.mercury;
-public class PomProcessorException extends Exception
+public class PomProcessorException
+ extends Exception
{
static final long serialVersionUID = 980457843528974352L;
Propchange:
maven/components/branches/MNG-3932/maven-project-builder/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 03:15:42 2009
@@ -3,4 +3,4 @@
/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
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/resources:738757-738972
-/maven/components/trunk/maven-project-builder/src/main/resources:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/maven-project-builder/src/main/resources:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
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 03:15:42 2009
@@ -4,4 +4,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java:738757-738972
/maven/components/trunk/maven-project-builder/src/test/java/EnforcerPomTest.java:688587-696625,696644-699681
-/maven/components/trunk/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
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 03:15:42 2009
@@ -3,4 +3,4 @@
/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
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java:738757-738972
-/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
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 03:15:42 2009
@@ -3,4 +3,4 @@
/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
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java:738757-738972
-/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
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 03:15:42 2009
@@ -3,4 +3,4 @@
/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
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java:738757-738972
-/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
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 03:15:42 2009
@@ -3,4 +3,4 @@
/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
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java:738757-738972
-/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
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 03:15:42 2009
@@ -3,4 +3,5 @@
/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
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/builder/DefaultPomArtifactResolver.java:738757-738972
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultPomArtifactResolver.java:746072
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomArtifactResolver.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-3932/maven-project/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 20 03:15:42 2009
@@ -3,4 +3,4 @@
/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
/maven/components/sisbell-plugin-manager/maven-project/src/main/mdo:738757-738972
-/maven/components/trunk/maven-project/src/main/mdo:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028
+/maven/components/trunk/maven-project/src/main/mdo:739772-740199,740316-741812,742231-742684,742726-745532,745632-746028,746072
