Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert twoPhaseBuilding model building as it breaks maven inheritance resolution (for dependencies version) 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1293768 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-02-26 08:07:43 +00:00
parent 496920391c
commit a4544331a8
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java
View File

@ -149,4 +149,21 @@ public class Dependency
{
return groupId;
}
@Override
public String toString()
{
final StringBuilder sb = new StringBuilder();
sb.append( "Dependency" );
sb.append( "{classifier='" ).append( classifier ).append( '\'' );
sb.append( ", optional=" ).append( optional );
sb.append( ", scope='" ).append( scope ).append( '\'' );
sb.append( ", systemPath='" ).append( systemPath ).append( '\'' );
sb.append( ", type='" ).append( type ).append( '\'' );
sb.append( ", artifactId='" ).append( artifactId ).append( '\'' );
sb.append( ", groupId='" ).append( groupId ).append( '\'' );
sb.append( ", version='" ).append( version ).append( '\'' );
sb.append( '}' );
return sb.toString();
}
}

2
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
View File

@ -223,7 +223,7 @@ public class Maven2RepositoryStorage
new DefaultModelBuildingRequest()
.setProcessPlugins( false )
.setPomFile( file )
.setTwoPhaseBuilding( true )
.setTwoPhaseBuilding( false )
.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
// MRM-1411