You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/02/26 09:07:43 UTC
svn commit: r1293768 - in /archiva/trunk/archiva-modules:
metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/
plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/
Author: olamy
Date: Sun Feb 26 08:07:43 2012
New Revision: 1293768
URL: http://svn.apache.org/viewvc?rev=1293768&view=rev
Log:
revert twoPhaseBuilding model building as it breaks maven inheritance resolution (for dependencies version)
Modified:
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
Modified: archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java?rev=1293768&r1=1293767&r2=1293768&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java (original)
+++ archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java Sun Feb 26 08:07:43 2012
@@ -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();
+ }
}
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java?rev=1293768&r1=1293767&r2=1293768&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java Sun Feb 26 08:07:43 2012
@@ -223,7 +223,7 @@ public class Maven2RepositoryStorage
new DefaultModelBuildingRequest()
.setProcessPlugins( false )
.setPomFile( file )
- .setTwoPhaseBuilding( true )
+ .setTwoPhaseBuilding( false )
.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
// MRM-1411