Author: sisbell Date: Wed Aug 6 21:03:16 2008 New Revision: 683501 URL: http://svn.apache.org/viewvc?rev=683501&view=rev Log: Disabled datasource integrity check since things like dependencyManagement merging may bring in new elements.
Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java?rev=683501&r1=683500&r2=683501&view=diff ============================================================================== --- maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java (original) +++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java Wed Aug 6 21:03:16 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,7 +114,7 @@ System.out.println( sb ); throw new DataSourceException( "ModelContainer 'a' contains elements not within datasource" ); } - + */ if ( a.equals( b ) || b.getProperties().size() == 0 ) { return a;