revert twoPhaseBuilding model building as it breaks maven inheritance resolution...

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1293768 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java
index 772984fd9b4bde9a20fd8138b47c327c8f87f5ee..14f9defe2c3902ffdd7ed7ea27f6b831000ef08b 100644 (file)
--- a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java
+++ b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java
@@ -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();
+    }
 }

diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
index 503a52b765bc84a7e7dfcd3bef32aa7f831dc351..ed7d93086e6eaaaf041f68ff18c9024f442156e7 100644 (file)
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
@@ -223,7 +223,7 @@ public class Maven2RepositoryStorage
                 new DefaultModelBuildingRequest()
                     .setProcessPlugins( false )
                     .setPomFile( file )
-                    .setTwoPhaseBuilding( true )
+                    .setTwoPhaseBuilding( false )
                     .setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
 
             // MRM-1411