You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/08/13 06:58:06 UTC
svn commit: r685441 - in /maven/shared/trunk:
maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
maven-verifier/pom.xml
Author: sisbell
Date: Tue Aug 12 21:58:06 2008
New Revision: 685441
URL: http://svn.apache.org/viewvc?rev=685441&view=rev
Log:
Merge of branch: sisbell-maven-shared-model-profile
Modified:
maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
maven/shared/trunk/maven-verifier/pom.xml
Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java?rev=685441&r1=685440&r2=685441&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java (original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java Tue Aug 12 21:58:06 2008
@@ -82,7 +82,7 @@
{
throw new IllegalArgumentException( "b: null or b.properties: empty" );
}
-
+ /*
if ( !modelProperties.containsAll( a.getProperties() ) )
{
List<ModelProperty> unknownProperties = new ArrayList<ModelProperty>();
@@ -114,13 +114,17 @@
System.out.println( sb );
throw new DataSourceException( "ModelContainer 'a' contains elements not within datasource" );
}
-
+ */
if ( a.equals( b ) || b.getProperties().size() == 0 )
{
return a;
}
int startIndex = modelProperties.indexOf( b.getProperties().get( 0 ) );
+ if(startIndex == -1)
+ {
+ startIndex = modelProperties.indexOf( a.getProperties().get( 0 ) );
+ }
delete( a );
delete( b );
@@ -130,6 +134,7 @@
{
startIndex = 0;
}
+
modelProperties.addAll( startIndex, joinedProperties );
List<ModelProperty> deletedProperties = new ArrayList<ModelProperty>();
Modified: maven/shared/trunk/maven-verifier/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/pom.xml?rev=685441&r1=685440&r2=685441&view=diff
==============================================================================
--- maven/shared/trunk/maven-verifier/pom.xml (original)
+++ maven/shared/trunk/maven-verifier/pom.xml Tue Aug 12 21:58:06 2008
@@ -24,7 +24,7 @@
<artifactId>maven-shared-components</artifactId>
<version>9</version>
</parent>
- <version>1.1-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
<artifactId>maven-verifier</artifactId>
<name>Maven Verifier Component</name>
<dependencies>