You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/02/01 15:59:40 UTC

svn commit: r739771 [10/10] - in /maven/components/branches/MNG-3932: ./ apache-maven/ apache-maven/src/ apache-maven/src/.cd/ apache-maven/src/bin/ apache-maven/src/conf/ apache-maven/src/main/ apache-maven/src/main/assembly/ apache-maven/src/site/ ap...

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-coalesce-text/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-coalesce-text/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-coalesce-text/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-coalesce-text/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,567 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng3839</groupId>
+  <artifactId>coreit</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: MNG-3839</name> 
+  <description>
+    Test that POM parsing properly coalesces text data.
+  </description>
+
+  <properties>
+    <!--
+    This checks the coalescing of CHARACTERS and CDATA events. Note that inner whitespace must be retained.
+    -->
+    <prop0>A <![CDATA[ Test ]]> Project<![CDATA[ ]]>Property</prop0>
+
+    <!--
+    This checks the coalescing of CHARACTERS events that are interleaved with comments. Note that inner whitespace
+    formed by whitespace-only events must be retained.
+    -->
+    <prop1><!-- X -->That's<!-- X --> <!-- X -->a<!-- X --> <!-- X -->test!<!-- X --></prop1>
+
+    <!--
+    This checks the coalescing of CHARACTERS events which would otherwise be reported in chunks of the internal parser
+    buffer size (usually 4 or 8 KB). The text block is designed such that its length is exactly 32 KB after leading
+    and traling whitespace has been removed and all line terminators have been removed.
+    -->
+    <prop2>
+00 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+01 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+02 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+03 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+04 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+05 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+06 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+07 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+08 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+09 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+10 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+11 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+12 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+13 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+14 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+15 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+16 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+17 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+18 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+19 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+20 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+21 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+22 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+23 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+24 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+25 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+26 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+27 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+28 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+29 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+30 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+31 KB     1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+0         1         2         3         4         5         6  X
+    </prop2>
+  </properties>
+</project>

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-markup-interpolation/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-markup-interpolation/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-markup-interpolation/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-markup-interpolation/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-markup-interpolation/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-markup-interpolation/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-markup-interpolation/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-markup-interpolation/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng3924</groupId>
+  <artifactId>test</artifactId>
+  <version>0.1-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: MNG-3924</name> 
+  <description>
+    Test that interpolation of properties that resolve to XML markup doesn't crash the project builder.
+  </description>
+
+  <properties>
+    <!-- That's the property containing escaped XML markup -->
+    <xmlMarkup>&lt;?xml version='1.0'?&gt;Tom&amp;Jerry</xmlMarkup>
+    <!-- That's a property where the above property will be resolved -->
+    <xmlTest>${xmlMarkup}</xmlTest>
+  </properties>
+</project>

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources/project-dynamism/plugin-level-dep.pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources/project-dynamism/pom-interp.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb  1 14:59:32 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources/project-dynamism/pom-relative.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb  1 14:59:32 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources/project-dynamism/pom.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb  1 14:59:32 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: maven/components/branches/MNG-3932/maven-reporting-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-reporting-api/pom.xml?rev=739771&r1=739770&r2=739771&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/maven-reporting-api/pom.xml (original)
+++ maven/components/branches/MNG-3932/maven-reporting-api/pom.xml Sun Feb  1 14:59:32 2009
@@ -19,8 +19,7 @@
 under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>

Propchange: maven/components/branches/MNG-3932/maven-reporting-api/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/components/branches/MNG-3932/maven-toolchain/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-toolchain/pom.xml?rev=739771&r1=739770&r2=739771&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/maven-toolchain/pom.xml (original)
+++ maven/components/branches/MNG-3932/maven-toolchain/pom.xml Sun Feb  1 14:59:32 2009
@@ -13,8 +13,7 @@
     License for the specific language governing permissions and
     limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>

Modified: maven/components/branches/MNG-3932/maven-toolchain/src/main/mdo/toolchains.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-toolchain/src/main/mdo/toolchains.xml?rev=739771&r1=739770&r2=739771&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/maven-toolchain/src/main/mdo/toolchains.xml (original)
+++ maven/components/branches/MNG-3932/maven-toolchain/src/main/mdo/toolchains.xml Sun Feb  1 14:59:32 2009
@@ -8,22 +8,23 @@
   to you under the Apache License, Version 2.0 (the
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
- 
+
    http://www.apache.org/licenses/LICENSE-2.0
- 
+
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
   under the License.
- 
+
 -->
-<model>
+<model xsd.namespace="http://maven.apache.org/TOOLCHAINS/1.0.0"
+       xsd.target-namespace="http://maven.apache.org/TOOLCHAINS/1.0.0">
     <id>maven-toolchains</id>
     <name>MavenToolchains</name>
     <description><![CDATA[
-    
+
     ]]></description>
     <defaults>
         <default>

Propchange: maven/components/branches/MNG-3932/maven-toolchain/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/components/branches/MNG-3932/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/pom.xml?rev=739771&r1=739770&r2=739771&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/pom.xml (original)
+++ maven/components/branches/MNG-3932/pom.xml Sun Feb  1 14:59:32 2009
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.maven</groupId>
@@ -43,20 +43,20 @@
   <url>http://maven.apache.org/</url>
   <inceptionYear>2001</inceptionYear>
   <properties>
-    <aspectjVersion>1.5.3</aspectjVersion>
     <classWorldsVersion>1.3</classWorldsVersion>
     <commonsCliVersion>1.0</commonsCliVersion>
     <doxiaVersion>1.0-alpha-9</doxiaVersion>
     <easyMockVersion>1.2_Java1.3</easyMockVersion>
     <junitVersion>3.8.1</junitVersion>
-    <plexusVersion>1.0-beta-3.0.1</plexusVersion>
+    <plexusVersion>1.0-beta-3.0.5</plexusVersion>
     <plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
     <plexusInterpolationVersion>1.1</plexusInterpolationVersion>
     <plexusPluginManagerVersion>1.0-SNAPSHOT</plexusPluginManagerVersion>
-    <plexusUtilsVersion>1.5.5</plexusUtilsVersion>
+    <plexusUtilsVersion>1.5.6</plexusUtilsVersion>
     <wagonVersion>1.0-beta-4</wagonVersion>
-    <modelBuilderVersion>1.0</modelBuilderVersion>
+    <modelBuilderVersion>1.3</modelBuilderVersion>
     <mercuryVersion>1.0.0-alpha-2</mercuryVersion>
+    <mercuryMp3Version>1.0-alpha-1</mercuryMp3Version>
     <woodstoxVersion>3.2.6</woodstoxVersion>
     <modelloVersion>1.0-alpha-22</modelloVersion>
   </properties>  
@@ -174,15 +174,6 @@
           </configuration>
         </plugin>
         <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>aspectj-maven-plugin</artifactId>
-          <version>1.0-beta-2</version>
-          <configuration>
-            <source>1.5</source>
-            <target>1.5</target>
-          </configuration>
-        </plugin>
-        <plugin>
           <artifactId>maven-release-plugin</artifactId>
           <configuration>
             <tagBase>https://svn.apache.org/repos/asf/maven/components/tags</tagBase>
@@ -217,27 +208,6 @@
           <version>1.0.0</version>
         </plugin>
         <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>clirr-maven-plugin</artifactId>
-          <version>2.2.1</version>
-          <configuration>
-            <!-- needed for release: default value "(,${project.version})" for 2.0.10 is 2.0.10-SNAPSHOT -->
-            <comparisonVersion>2.0.9</comparisonVersion>
-            <excludes>
-              <!-- TODO: These represent method ADDITIONS from 2.0.9, and should be removed after
-                   2.0.10 is released. -->
-              <exclude>org/apache/maven/lifecycle/LifecycleExecutor*</exclude>
-              <exclude>org/apache/maven/artifact/metadata/ArtifactMetadataSource*</exclude>
-              <exclude>org/apache/maven/project/MavenProjectBuilder*</exclude>
-              <exclude>org/apache/maven/project/ProjectBuilderConfiguration*</exclude>
-              <exclude>org/apache/maven/project/interpolation/ModelInterpolator*</exclude>
-              <exclude>org/apache/maven/project/inheritance/ModelInheritanceAssembler*</exclude>
-              <exclude>org/apache/maven/execution/MavenExecutionRequest*</exclude>
-              <exclude>org/apache/maven/plugin/DefaultPluginManager*</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>2.4.2</version>
@@ -252,7 +222,7 @@
   </build>
   <modules>
     <module>maven-core</module>
-    <module>maven-distribution</module>
+    <module>apache-maven</module>
     <module>maven-lifecycle</module>
     <module>maven-model</module>
     <module>maven-plugin-api</module>
@@ -430,22 +400,61 @@
           </exclusion>
         </exclusions>
       </dependency>
+
       <!--  Mercury -->
       <dependency>
         <groupId>org.apache.maven.mercury</groupId>
         <artifactId>mercury-artifact</artifactId>
         <version>${mercuryVersion}</version>
       </dependency>
-        <dependency>
+      <dependency>
         <groupId>org.apache.maven.mercury</groupId>
         <artifactId>mercury-external</artifactId>
         <version>${mercuryVersion}</version>
       </dependency>
-      <!-- Needed for backward compat aspect. -->
+    <dependency>
+      <groupId>org.sonatype.mercury</groupId>
+      <artifactId>mercury-mp3-cli</artifactId>
+        <version>${mercuryMp3Version}</version>
+    </dependency>
+      
+      <!--  Mercury test dependencies -->
+      <dependency>
+        <groupId>org.apache.maven.mercury</groupId>
+        <artifactId>mercury-repo-local-m2</artifactId>
+        <version>${mercuryVersion}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
-        <groupId>aspectj</groupId>
-        <artifactId>aspectjrt</artifactId>
-        <version>${aspectjVersion}</version>
+        <groupId>org.apache.maven.mercury</groupId>
+        <artifactId>mercury-repo-remote-m2</artifactId>
+        <version>${mercuryVersion}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.mercury</groupId>
+        <artifactId>mercury-md-sat</artifactId>
+        <version>${mercuryVersion}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.mercury</groupId>
+        <artifactId>mercury-util</artifactId>
+        <version>${mercuryVersion}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.mercury</groupId>
+        <artifactId>mercury-transport-http</artifactId>
+        <version>${mercuryVersion}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.mercury</groupId>
+        <artifactId>mercury-transport-http</artifactId>
+        <version>${mercuryVersion}</version>
+        <type>test-jar</type>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.sonatype.plexus</groupId>

Added: maven/components/branches/MNG-3932/rules.txt
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/rules.txt?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/rules.txt (added)
+++ maven/components/branches/MNG-3932/rules.txt Sun Feb  1 14:59:32 2009
@@ -0,0 +1,2 @@
+Mirrors defined in settings:
+Mirror lookup should always use first declaration, regardless whether exact id match or wildcard match

Modified: maven/components/branches/MNG-3932/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/src/site/site.xml?rev=739771&r1=739770&r2=739771&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/src/site/site.xml (original)
+++ maven/components/branches/MNG-3932/src/site/site.xml Sun Feb  1 14:59:32 2009
@@ -1,4 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
 <project>
+  <!-- TODO remove when using Maven Parent 11+ -->
+  <skin>
+    <groupId>org.apache.maven.skins</groupId>
+    <artifactId>maven-stylus-skin</artifactId>
+    <version>1.1</version>
+  </skin>
   <body>
     <menu ref="modules"/>
     <menu ref="reports"/>

Propchange: maven/components/branches/MNG-3932/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision