Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 61200D95E for ; Sat, 1 Dec 2012 14:50:20 +0000 (UTC) Received: (qmail 9271 invoked by uid 500); 1 Dec 2012 14:50:11 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 8583 invoked by uid 500); 1 Dec 2012 14:50:11 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 5487 invoked by uid 99); 1 Dec 2012 14:50:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2012 14:50:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AF85481688F; Sat, 1 Dec 2012 14:50:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: aheritier@apache.org To: commits@maven.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [33/50] git commit: [MNG-5380] check that whitespace can be preserved in Maven plugin configuration when building MavenProject (still need to check if content is not trimmed when injected into plugin) Message-Id: <20121201145003.AF85481688F@tyr.zones.apache.org> Date: Sat, 1 Dec 2012 14:50:03 +0000 (UTC) [MNG-5380] check that whitespace can be preserved in Maven plugin configuration when building MavenProject (still need to check if content is not trimmed when injected into plugin) git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412310 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a286f120 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a286f120 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a286f120 Branch: refs/heads/feature/colorized-console/log4j2 Commit: a286f120d6f584ca1970cf6e94c361d6bb313c3f Parents: d831e1e Author: Herve Boutemy Authored: Wed Nov 21 21:36:19 2012 +0000 Committer: Arnaud HeĢritier Committed: Sat Dec 1 13:51:02 2012 +0100 ---------------------------------------------------------------------- .../apache/maven/project/PomConstructionTest.java | 3 ++- .../maven/project/harness/Xpp3DomNodePointer.java | 4 ++-- .../reporting-plugin-config/sub/pom.xml | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/a286f120/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java index 26990d3..8012124 100644 --- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -1083,9 +1083,10 @@ public class PomConstructionTest { PomTestWrapper pom = buildPom( "reporting-plugin-config/sub" ); - assertEquals( 2, ( (List) pom.getValue( "reporting/plugins[1]/configuration/stringParams" ) ).size() ); + assertEquals( 3, ( (List) pom.getValue( "reporting/plugins[1]/configuration/stringParams" ) ).size() ); assertEquals( "parentParam", pom.getValue( "reporting/plugins[1]/configuration/stringParams[1]/stringParam[1]" ) ); assertEquals( "childParam", pom.getValue( "reporting/plugins[1]/configuration/stringParams[1]/stringParam[2]" ) ); + assertEquals( " preserve space ", pom.getValue( "reporting/plugins[1]/configuration/stringParams[1]/stringParam[3]" ) ); assertEquals( "true", pom.getValue( "reporting/plugins[1]/configuration/booleanParam" ) ); } http://git-wip-us.apache.org/repos/asf/maven/blob/a286f120/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java index a628edc..59ce300 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java @@ -78,14 +78,14 @@ class Xpp3DomNodePointer @Override public Object getValue() { - return getValue(node); + return getValue( node ); } private static Object getValue( Xpp3Dom node ) { if ( node.getValue() != null ) { - return node.getValue().trim(); + return node.getValue(); } else { http://git-wip-us.apache.org/repos/asf/maven/blob/a286f120/maven-core/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml b/maven-core/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml index e6018dd..b076827 100644 --- a/maven-core/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml @@ -36,8 +36,9 @@ maven-it-plugin-configuration 2.1-SNAPSHOT - - childParam + + childParam + preserve space