From a4544331a8ac8d376540913401b52d2ce61149aa Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 26 Feb 2012 08:07:43 +0000 Subject: [PATCH] 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 --- .../archiva/metadata/model/Dependency.java | 17 +++++++++++++++++ .../storage/maven2/Maven2RepositoryStorage.java | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) 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 772984fd9..14f9defe2 100644 --- 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 503a52b76..ed7d93086 100644 --- 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 -- 2.39.5