[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jpackage-announce
Subject:    [JPackage-announce] [RPM (1.7)] maven2-2.0.4-9jpp
From:       Deepak Bhole <jpackage () zarb ! org>
Date:       2006-10-30 16:07:08
Message-ID: 20061030160708.67C56625F13 () ryu ! zarb ! org
[Download RAW message or body]

Name        : maven2                       Relocations: (not relocatable)
Version     : 2.0.4                             Vendor: JPackage Project
Release     : 9jpp                          Build Date: Fri 27 Oct 2006 10:53:28 PM \
CEST Install Date: (not installed)               Build Host: \
to-jpackage2.toronto.redhat.com Group       : Development/Build Tools       Source \
RPM: (none) Size        : 3903516      License: Apache Software License
Signature   : (none)
Packager    : Deepak Bhole <dbhole@jpackage.org>
URL         : http://maven.apache.org/
Summary     : Java project management and project comprehension tool.
Description :
Maven is a software project management and comprehension tool. Based on the
concept of a project object model (POM), Maven can manage a project's build,
reporting and documentation from a central piece of information.

---------------
Deepak Bhole <dbhole@redhat.com> 2.0.4-9jpp
- Added a new mapping system
- Added a jpp howto
- Added support for plugin mixing
- Wired in /usr/share/maven2/repository as one of the default repos
---------------
W: maven2 summary-ended-with-dot Java project management and project comprehension \
                tool.
W: maven2 strange-permission maven2-script 0775
W: maven2 strange-permission maven2-jpp-script 0775
W: maven2 patch-not-applied Patch7: %{name}-jpp-mapping.patch
W: maven2 uncompressed-zip /maven2-empty-dep.jar
E: maven2 no-jar-manifest /maven2-empty-dep.jar

---------------
Index: maven2-JPackageRepositoryLayout.java
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven2/Attic/maven2-JPackageRepositoryLayout.java,v
 retrieving revision 1.1.2.1
diff -u -r1.1.2.1 maven2-JPackageRepositoryLayout.java
--- maven2-JPackageRepositoryLayout.java	22 Jun 2006 14:28:03 -0000	1.1.2.1
+++ maven2-JPackageRepositoryLayout.java	30 Oct 2006 16:07:03 -0000
@@ -16,10 +16,22 @@
  * limitations under the License.
  */
 
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.JDOMException;
+import org.jdom.input.SAXBuilder;
+import org.xml.sax.InputSource;
 
 /**
  * Repository layout for jpackage based repositories. 
@@ -30,6 +42,8 @@
 public class JPackageRepositoryLayout
 	implements ArtifactRepositoryLayout
 {
+	private static Hashtable jppArtifactMap;
+
 	private static final char GROUP_SEPARATOR = '.';
 	private static final char PATH_SEPARATOR = '/';
 
@@ -39,19 +53,24 @@
 		ArtifactHandler artifactHandler = artifact.getArtifactHandler();
 		StringBuffer path = new StringBuffer();
 
+		String artifactId = artifact.getArtifactId();
 		String groupId = artifact.getGroupId();
+		String version = artifact.getVersion();
 
-		// FIXME: This is temporary (maven plugin groups are not altered for now -- they \
are hardcoded in plexus component descriptors so we do not want to go about changing \
                them all at this point.)
-		if (groupId.equals("org.apache.maven.plugins")) {
-			groupId = "org/apache/maven/plugins";
+		if (!groupId.startsWith("JPP")) {
+			MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
+			Hashtable newInfo = map.getMappedInfo(groupId, artifactId, version);
+			
+			groupId = (String) newInfo.get("group");
+			artifactId = (String) newInfo.get("artifact");
 		}
 
 		if (artifactHandler.getPackaging().equals("pom")) {
-			path = getPOMPath(groupId, artifact.getArtifactId());
+			path = getPOMPath(groupId, artifactId);
 		} else {
 
 			path.append( groupId ).append( '/' );
-			path.append( artifact.getArtifactId() ).append( ".jar" );
+			path.append( artifactId ).append( ".jar" );
 
 		}
 
@@ -69,7 +88,8 @@
 		// even though it may not exist there. This may cause an error, 
 		// but that is fine because if the pom is not there, there is 
 		// a serious problem anyways..
-		f = new java.io.File(System.getProperty("maven2.jpp.default.repo", \
"/usr/share/java/maven2/poms") + "/" + fName); +		f = new \
java.io.File(System.getProperty("maven2.jpp.default.repo", \
"/usr/share/maven2/repository") + "/" + path.toString()); \
+		//System.err.println("Checking path " + f.getAbsolutePath() + " for the pom");  if \
(!f.exists()) {  path = new StringBuffer();
 			path.append(System.getProperty("maven2.jpp.default.pom.path", \
"JPP/maven2/default_poms")).append("/").append(fName); @@ -96,7 +116,6 @@
 		path.append(System.getProperty("maven2.jpp.pom.path", \
"maven2/poms")).append("/").append(filename);  }
 
-		System.err.println("JPackageRepositoryLayout::pathOf() = " + path.toString());
 		return path.toString();
 	}
 
@@ -104,5 +123,4 @@
 	{
 		return pathOfRepositoryMetadata( metadata, metadata.getRemoteFilename() );
 	}
-
 }
Index: maven2-jpp-mapping.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven2/Attic/maven2-jpp-mapping.patch,v
 retrieving revision 1.1.2.3
diff -u -r1.1.2.3 maven2-jpp-mapping.patch
--- maven2-jpp-mapping.patch	22 Sep 2006 16:38:17 -0000	1.1.2.3
+++ maven2-jpp-mapping.patch	30 Oct 2006 16:07:03 -0000
@@ -1,5 +1,5 @@
---- ./maven2/maven-artifact-manager/pom.xml.withoutxslt	2006-09-21 \
                18:43:04.000000000 -0400
-+++ ./maven2/maven-artifact-manager/pom.xml	2006-09-21 18:43:07.000000000 -0400
+--- ./maven2/maven-artifact-manager/pom.xml.withoutxslt	2006-10-05 \
14:33:26.000000000 -0400 ++++ ./maven2/maven-artifact-manager/pom.xml	2006-10-05 \
14:33:29.000000000 -0400  @@ -1,41 +1,47 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -18,12 +18,8 @@
 -      <artifactId>maven-repository-metadata</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>artifact-manager</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
        <version>2.0.4</version>
 -    </dependency>
 -    <dependency>
@@ -49,47 +45,51 @@
 -      <artifactId>wagon-provider-api</artifactId>
 -    </dependency>
 -  </dependencies>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact-manager</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Artifact Manager</name>  \
+   <modelVersion>4.0.0</modelVersion>  +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>repository-metadata</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-repository-metadata</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>file</artifactId>
 +         <version>1.0-alpha-6</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.wagon</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">wagon-file</artifactId>  +      \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-container-default</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>provider-api</artifactId>
 +         <version>1.0-alpha-6</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.wagon</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">wagon-provider-api</artifactId> \
+      </dependency>  +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-artifact-manager/src/test/resources/pom.xml.withoutxslt	2006-09-21 \
                18:43:07.000000000 -0400
-+++ ./maven2/maven-artifact-manager/src/test/resources/pom.xml	2006-09-21 \
18:43:11.000000000 -0400 +--- \
./maven2/maven-artifact-manager/src/test/resources/pom.xml.withoutxslt	2006-10-05 \
14:33:29.000000000 -0400 ++++ \
./maven2/maven-artifact-manager/src/test/resources/pom.xml	2006-10-05 \
14:33:31.000000000 -0400  @@ -1,117 +1,118 @@
 -<model 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"> @@ -210,18 +210,18 @@
 -</model>
 +<?xml version="1.0" encoding="utf-8"?>
 +<model>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>mavencore</artifactId>
 +   <version>2.0.4</version>
++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core</artifactId>  +   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven</name>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2001</inceptionYear>  +   \
<modelVersion>4.0.0</modelVersion>  +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-model</artifactId>  +     \
<type xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</type>  +         <scope \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency> @@ -233,16 +233,16 @@
 +         <scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>commons-cli</artifactId>
 +         <version>1.0</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">commons-cli</groupId> ++        \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">commons-cli</artifactId>  +     \
<type xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</type>  +         <scope \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>i18n</artifactId>
 +         <version>1.0-beta-5</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-i18n</artifactId>  +     \
<type xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</type>  +         <scope \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency> @@ -317,9 +317,9 @@
 +         <scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>qdox</artifactId>
 +         <version>1.5</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">qdox</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">qdox</artifactId>  +         \
<type xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</type>  +         <scope \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency> @@ -327,9 +327,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-script/maven-script-beanshell/pom.xml.withoutxslt	2006-09-21 \
                18:43:11.000000000 -0400
-+++ ./maven2/maven-script/maven-script-beanshell/pom.xml	2006-09-21 \
                18:43:15.000000000 -0400
-@@ -1,23 +1,26 @@
+--- ./maven2/maven-script/maven-script-beanshell/pom.xml.withoutxslt	2006-10-05 \
14:33:31.000000000 -0400 ++++ \
./maven2/maven-script/maven-script-beanshell/pom.xml	2006-10-05 14:33:34.000000000 \
-0400 +@@ -1,23 +1,25 @@
 -<?xml version="1.0" encoding="UTF-8"?><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-script</artifactId>
@@ -346,12 +346,8 @@
 -      <artifactId>maven-plugin-api</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>script-beanshell</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>script</artifactId>
        <version>2.0.4</version>
 -    </dependency>
 -    <dependency>
@@ -360,27 +356,30 @@
 -      <version>1.0-alpha-7</version>
 -    </dependency>
 -  </dependencies>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-script</artifactId> ++    \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-script-beanshell</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Beanshell Mojo \
Support</name>  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>bsh-factory</artifactId>
 +         <version>1.0-alpha-7</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-bsh-factory</artifactId> \
+      </dependency>  +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-script/maven-script-ant/pom.xml.withoutxslt	2006-09-21 \
                18:43:15.000000000 -0400
-+++ ./maven2/maven-script/maven-script-ant/pom.xml	2006-09-21 18:43:18.000000000 \
                -0400
-@@ -1,27 +1,31 @@
+--- ./maven2/maven-script/maven-script-ant/pom.xml.withoutxslt	2006-10-05 \
14:33:34.000000000 -0400 ++++ \
./maven2/maven-script/maven-script-ant/pom.xml	2006-10-05 14:33:36.000000000 -0400 \
                +@@ -1,27 +1,30 @@
 -<?xml version="1.0" encoding="UTF-8"?><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-script</artifactId>
@@ -397,12 +396,8 @@
 -      <artifactId>maven-plugin-api</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>script-ant</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>script</artifactId>
        <version>2.0.4</version>
 -    </dependency>
 -    <dependency>
@@ -415,32 +410,35 @@
 -      <artifactId>plexus-container-default</artifactId>
 -    </dependency>
 -  </dependencies>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-script</artifactId> ++    \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-script-ant</artifactId>  \
+   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Ant Mojo Support</name>  \
+   <modelVersion>4.0.0</modelVersion>  +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>ant-factory</artifactId>
 +         <version>1.0-alpha-1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-ant-factory</artifactId> \
+      </dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-container-default</artifactId>
  +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-script/pom.xml.withoutxslt	2006-09-21 18:43:19.000000000 -0400
-+++ ./maven2/maven-script/pom.xml	2006-09-21 18:43:22.000000000 -0400
-@@ -1,17 +1,20 @@
+--- ./maven2/maven-script/pom.xml.withoutxslt	2006-10-05 14:33:36.000000000 -0400
++++ ./maven2/maven-script/pom.xml	2006-10-05 14:33:39.000000000 -0400
+@@ -1,17 +1,19 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -459,28 +457,27 @@
 -  </modules>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>script</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-script</artifactId>  +   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Script Support \
Root</name>  +   <modules xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>maven-script-ant</module>  +      <module>maven-script-beanshell</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-core-it-verifier/pom.xml.withoutxslt	2006-09-21 \
                18:43:22.000000000 -0400
-+++ ./maven2/maven-core-it-verifier/pom.xml	2006-09-21 18:43:25.000000000 -0400
-@@ -1,8 +1,10 @@
+--- ./maven2/maven-core-it-verifier/pom.xml.withoutxslt	2006-10-05 \
14:33:39.000000000 -0400 ++++ ./maven2/maven-core-it-verifier/pom.xml	2006-10-05 \
14:33:42.000000000 -0400 +@@ -1,8 +1,9 @@
 -<model 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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -491,18 +488,17 @@
 -</model>
 +<?xml version="1.0" encoding="utf-8"?>
 +<model>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-verifier</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0</version> ++   <groupId \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-verifier</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-archiver/pom.xml.withoutxslt	2006-09-21 18:43:25.000000000 -0400
-+++ ./maven2/maven-archiver/pom.xml	2006-09-21 18:43:29.000000000 -0400
-@@ -1,28 +1,31 @@
+--- ./maven2/maven-archiver/pom.xml.withoutxslt	2006-10-05 14:33:42.000000000 -0400
++++ ./maven2/maven-archiver/pom.xml	2006-10-05 14:33:45.000000000 -0400
+@@ -1,28 +1,30 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -519,12 +515,8 @@
 -      <artifactId>maven-project</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>archiver</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
        <version>2.0.4</version>
 -    </dependency>
 -    <dependency>
@@ -538,32 +530,35 @@
 -      <version>2.0.4</version>
 -    </dependency>
 -  </dependencies>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-archiver</artifactId>  +  \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Archiver</name>  +   \
<modelVersion>4.0.0</modelVersion>  +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-project</artifactId>  +   \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>1.0-alpha-5</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-archiver</artifactId>  + \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact</artifactId>  +  \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-meeper/pom.xml.withoutxslt	2006-09-21 18:43:29.000000000 -0400
-+++ ./maven2/maven-meeper/pom.xml	2006-09-21 18:43:33.000000000 -0400
-@@ -1,14 +1,17 @@
+--- ./maven2/maven-meeper/pom.xml.withoutxslt	2006-10-05 14:33:45.000000000 -0400
++++ ./maven2/maven-meeper/pom.xml	2006-10-05 14:33:49.000000000 -0400
+@@ -1,14 +1,15 @@
 -<model 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>
@@ -580,24 +575,22 @@
 -</model>
 +<?xml version="1.0" encoding="utf-8"?>
 +<model>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>meeper</artifactId>
 +   <version>0.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-meeper</artifactId>  +   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Meper</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-plugin-api/pom.xml.withoutxslt	2006-09-21 18:43:33.000000000 \
                -0400
-+++ ./maven2/maven-plugin-api/pom.xml	2006-09-21 18:43:36.000000000 -0400
+--- ./maven2/maven-plugin-api/pom.xml.withoutxslt	2006-10-05 14:33:49.000000000 \
-0400 ++++ ./maven2/maven-plugin-api/pom.xml	2006-10-05 14:33:51.000000000 -0400
 @@ -1,20 +1,22 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -620,30 +613,30 @@
 -  </dependencies>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-api</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Plugin API</name>  +   \
<modelVersion>4.0.0</modelVersion>  +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-plugin-parameter-documenter/pom.xml.withoutxslt	2006-09-21 \
                18:43:36.000000000 -0400
-+++ ./maven2/maven-plugin-parameter-documenter/pom.xml	2006-09-21 18:43:40.000000000 \
                -0400
-@@ -1,59 +1,64 @@
+--- ./maven2/maven-plugin-parameter-documenter/pom.xml.withoutxslt	2006-10-05 \
14:33:51.000000000 -0400 ++++ \
./maven2/maven-plugin-parameter-documenter/pom.xml	2006-10-05 14:33:55.000000000 \
-0400 +@@ -1,59 +1,63 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -704,22 +697,21 @@
 -  </dependencies>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-parameter-documenter</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-parameter-documenter</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Plugin Parameter \
Documenter API</name>  +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
 +            <version>1.0-alpha-8</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.modello</groupId> \
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">modello-maven-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <id>site-xsd</id>
@@ -754,22 +746,22 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-container-default</artifactId>
  +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0082/pom.xml.withoutxslt	2006-09-21 18:43:40.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0082/pom.xml	2006-09-21 18:43:44.000000000 -0400
-@@ -1,13 +1,15 @@
+--- ./maven2/maven-core-it/it0082/pom.xml.withoutxslt	2006-10-05 14:33:55.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0082/pom.xml	2006-10-05 14:33:59.000000000 -0400
+@@ -1,13 +1,14 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -784,23 +776,22 @@
 -    <module>test-plugin</module>
 -  </modules>
 -</project>
-+   <artifactId>test-components</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
++   <groupId>test</groupId>
++   <artifactId>test-components</artifactId>
 +   <name>Test Components</name>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>test-component-c</module>
 +      <module>test-plugin</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0082/test-component-c/pom.xml.withoutxslt	2006-09-21 \
                18:43:44.000000000 -0400
-+++ ./maven2/maven-core-it/it0082/test-component-c/pom.xml	2006-09-21 \
                18:43:47.000000000 -0400
-@@ -1,41 +1,42 @@
+--- ./maven2/maven-core-it/it0082/test-component-c/pom.xml.withoutxslt	2006-10-05 \
14:33:59.000000000 -0400 ++++ \
./maven2/maven-core-it/it0082/test-component-c/pom.xml	2006-10-05 14:34:02.000000000 \
-0400 +@@ -1,41 +1,41 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -843,14 +834,14 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</project>
-+   <artifactId>test-component-c</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-component-c</artifactId>
 +   <name>Test Component C</name>
 +   <packaging>war</packaging>
 +   <pluginRepositories>
@@ -860,14 +851,13 @@
 +         <url>http://snapshots.maven.codehaus.org/maven2</url>
 +      </pluginRepository>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <configuration>
 +               <goalItem>my-test</goalItem>
 +            </configuration>
@@ -884,8 +874,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0082/test-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:43:47.000000000 -0400
-+++ ./maven2/maven-core-it/it0082/test-plugin/pom.xml	2006-09-21 18:43:51.000000000 \
-0400 +--- ./maven2/maven-core-it/it0082/test-plugin/pom.xml.withoutxslt	2006-10-05 \
14:34:02.000000000 -0400 ++++ \
./maven2/maven-core-it/it0082/test-plugin/pom.xml	2006-10-05 14:34:05.000000000 -0400 \
@@ -1,21 +1,22 @@  +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -909,29 +899,29 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <artifactId>maven-core-it-plugin</artifactId>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <version>2.0.4-JPP</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>org.apache.maven.plugins</groupId>
++   <artifactId>maven-core-it-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Test Plugin</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0024/pom.xml.withoutxslt	2006-09-21 18:43:51.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0024/pom.xml	2006-09-21 18:43:55.000000000 -0400
+--- ./maven2/maven-core-it/it0024/pom.xml.withoutxslt	2006-10-05 14:34:05.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0024/pom.xml	2006-10-05 14:34:07.000000000 -0400
 @@ -1,40 +1,40 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -974,17 +964,17 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0024</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0024</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.1-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-compiler-plugin</artifactId>
-+            <version>2.1-SNAPSHOT</version>
 +            <executions>
 +               <execution>
 +                  <id>test</id>
@@ -1003,9 +993,9 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -1013,9 +1003,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1002/pom.xml.withoutxslt	2006-09-21 18:43:55.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1002/pom.xml	2006-09-21 18:43:58.000000000 -0400
-@@ -1,7 +1,10 @@
+--- ./maven2/maven-core-it/it1002/pom.xml.withoutxslt	2006-10-05 14:34:07.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1002/pom.xml	2006-10-05 14:34:10.000000000 -0400
+@@ -1,7 +1,9 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -1024,18 +1014,17 @@
 -  <packaging>jar</packaging>
 -  <version>1.0</version>
 -</model>
-+   <artifactId>maven-core-it1002</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it1002</artifactId>
 +   <packaging>jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0020/pom.xml.withoutxslt	2006-09-21 18:43:58.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0020/pom.xml	2006-09-21 18:44:02.000000000 -0400
-@@ -1,43 +1,47 @@
+--- ./maven2/maven-core-it/it0020/pom.xml.withoutxslt	2006-10-05 14:34:10.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0020/pom.xml	2006-10-05 14:34:13.000000000 -0400
+@@ -1,43 +1,46 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -1080,9 +1069,9 @@
 -    </repository>
 -  </distributionManagement>
 -</project>
-+   <artifactId>maven-it0020-plugin</artifactId>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <version>2.0.4-JPP</version>
++   <groupId>org.apache.maven.plugins</groupId>
++   <artifactId>maven-it0020-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <distributionManagement>
 +      <repository>
@@ -1095,14 +1084,13 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-plugin-plugin</artifactId>
 +            <version>2.1.1-SNAPSHOT</version>
++            <artifactId>maven-plugin-plugin</artifactId>
 +            <dependencies>
 +               <dependency>
-+                  <groupId>JPP/maven2</groupId>
-+                  <artifactId>plugin-tools-beanshell</artifactId>
 +                  <version>2.0.4</version>
++                  <groupId>org.apache.maven</groupId>
++                  <artifactId>maven-plugin-tools-beanshell</artifactId>
 +               </dependency>
 +            </dependencies>
 +         </plugin>
@@ -1118,16 +1106,16 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>script-beanshell</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-script-beanshell</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0074/pom.xml.withoutxslt	2006-09-21 18:44:02.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0074/pom.xml	2006-09-21 18:44:05.000000000 -0400
+--- ./maven2/maven-core-it/it0074/pom.xml.withoutxslt	2006-10-05 14:34:13.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0074/pom.xml	2006-10-05 14:34:16.000000000 -0400
 @@ -1,46 +1,41 @@
 -<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"> @@ -1177,9 +1165,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it0074</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it</groupId>  \
+   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0</version> ++   <groupId \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it</groupId> \
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it0074</artifactId>  \
+   <pluginRepositories xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      <pluginRepository>
 +         <id>snapshots</id>
@@ -1193,9 +1181,9 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-compiler-plugin</artifactId>
 +            <version>2.1-SNAPSHOT</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-compiler-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <id>precompile</id>
@@ -1217,9 +1205,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0075/pom.xml.withoutxslt	2006-09-21 18:44:09.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0075/pom.xml	2006-09-21 18:44:12.000000000 -0400
-@@ -1,26 +1,26 @@
+--- ./maven2/maven-core-it/it0075/pom.xml.withoutxslt	2006-10-05 14:34:18.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0075/pom.xml	2006-10-05 14:34:20.000000000 -0400
+@@ -1,26 +1,25 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -1247,14 +1235,13 @@
 -    </profile>
 -  </profiles>
 -</project>
-+   <artifactId>maven-core-it0075-root</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0075-root</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>sub1</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <profiles>
 +      <profile>
@@ -1272,9 +1259,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0075/sub1/pom.xml.withoutxslt	2006-09-21 \
                18:44:05.000000000 -0400
-+++ ./maven2/maven-core-it/it0075/sub1/pom.xml	2006-09-21 18:44:09.000000000 -0400
-@@ -1,11 +1,12 @@
+--- ./maven2/maven-core-it/it0075/sub1/pom.xml.withoutxslt	2006-10-05 \
14:34:16.000000000 -0400 ++++ ./maven2/maven-core-it/it0075/sub1/pom.xml	2006-10-05 \
14:34:18.000000000 -0400 +@@ -1,11 +1,11 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -1287,20 +1274,19 @@
 -  <artifactId>maven-core-it0075-sub1</artifactId>
 -
 -</project>
-+   <artifactId>maven-core-it0075-sub1</artifactId>
 +   <parent>
 +      <groupId>org.apache.maven.it</groupId>
 +      <artifactId>maven-core-it0075-root</artifactId>
 +      <version>1.0</version>
 +   </parent>
-+   <dependencies/>
++   <artifactId>maven-core-it0075-sub1</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0075/sub2/pom.xml.withoutxslt	2006-09-21 \
                18:44:12.000000000 -0400
-+++ ./maven2/maven-core-it/it0075/sub2/pom.xml	2006-09-21 18:44:16.000000000 -0400
-@@ -1,11 +1,12 @@
+--- ./maven2/maven-core-it/it0075/sub2/pom.xml.withoutxslt	2006-10-05 \
14:34:20.000000000 -0400 ++++ ./maven2/maven-core-it/it0075/sub2/pom.xml	2006-10-05 \
14:34:23.000000000 -0400 +@@ -1,11 +1,11 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -1313,19 +1299,18 @@
 -  <artifactId>maven-core-it0075-sub2</artifactId>
 -
 -</project>
-+   <artifactId>maven-core-it0075-sub2</artifactId>
 +   <parent>
 +      <groupId>org.apache.maven.it</groupId>
 +      <artifactId>maven-core-it0075-root</artifactId>
 +      <version>1.0</version>
 +   </parent>
-+   <dependencies/>
++   <artifactId>maven-core-it0075-sub2</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0007/pom.xml.withoutxslt	2006-09-21 18:44:19.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0007/pom.xml	2006-09-21 18:44:23.000000000 -0400
+--- ./maven2/maven-core-it/it0007/pom.xml.withoutxslt	2006-10-05 14:34:25.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0007/pom.xml	2006-10-05 14:34:28.000000000 -0400
 @@ -1,20 +1,22 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -1348,20 +1333,20 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0007</artifactId>
 +   <version>1.0</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>maven-plugin-parent</artifactId>
 +      <version>2.0</version>
++      <artifactId>maven-plugin-parent</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-core-it0007</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -1369,8 +1354,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0007/maven-it-support-parent-1.0.pom.withoutxslt	2006-09-21 \
                18:44:16.000000000 -0400
-+++ ./maven2/maven-core-it/it0007/maven-it-support-parent-1.0.pom	2006-09-21 \
18:44:19.000000000 -0400 +--- \
./maven2/maven-core-it/it0007/maven-it-support-parent-1.0.pom.withoutxslt	2006-10-05 \
14:34:23.000000000 -0400 ++++ \
./maven2/maven-core-it/it0007/maven-it-support-parent-1.0.pom	2006-10-05 \
14:34:25.000000000 -0400  @@ -1,13 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -1386,9 +1371,9 @@
 -    </dependency>
 -  </dependencies>  
 -</project>
-+   <artifactId>maven-core-it-support-parent</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it-support-parent</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
@@ -1400,8 +1385,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0064/pom.xml.withoutxslt	2006-09-21 18:44:23.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0064/pom.xml	2006-09-21 18:44:26.000000000 -0400
+--- ./maven2/maven-core-it/it0064/pom.xml.withoutxslt	2006-10-05 14:34:28.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0064/pom.xml	2006-10-05 14:34:30.000000000 -0400
 @@ -1,36 +1,38 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -1440,9 +1425,9 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</model>
-+   <artifactId>maven-core-it0064</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0064</artifactId>
 +   <packaging>jar</packaging>
 +   <pluginRepositories>
 +      <pluginRepository>
@@ -1455,9 +1440,9 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <configuration>
 +               <foo>fooValue</foo>
 +               <bar>barValue</bar>
@@ -1467,9 +1452,9 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -1477,9 +1462,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1011/pom.xml.withoutxslt	2006-09-21 18:44:26.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1011/pom.xml	2006-09-21 18:44:28.000000000 -0400
-@@ -1,18 +1,21 @@
+--- ./maven2/maven-core-it/it1011/pom.xml.withoutxslt	2006-10-05 14:34:30.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1011/pom.xml	2006-10-05 14:34:34.000000000 -0400
+@@ -1,18 +1,20 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -1499,9 +1484,9 @@
 -    <module>subproject2</module>
 -  </modules>
 -</model>
-+   <artifactId>maven-core-it0046</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0046</artifactId>
 +   <packaging>pom</packaging>
 +   <pluginRepositories>
 +      <pluginRepository>
@@ -1514,14 +1499,13 @@
 +      <module>subproject</module>
 +      <module>subproject2</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1011/subproject2/pom.xml.withoutxslt	2006-09-21 \
                18:44:28.000000000 -0400
-+++ ./maven2/maven-core-it/it1011/subproject2/pom.xml	2006-09-21 18:44:31.000000000 \
                -0400
-@@ -1,10 +1,13 @@
+--- ./maven2/maven-core-it/it1011/subproject2/pom.xml.withoutxslt	2006-10-05 \
14:34:34.000000000 -0400 ++++ \
./maven2/maven-core-it/it1011/subproject2/pom.xml	2006-10-05 14:34:36.000000000 -0400 \
+@@ -1,10 +1,12 @@  +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -1533,21 +1517,20 @@
 -  <artifactId>maven-core-it0046-subproject2</artifactId>
 -  <packaging>jar</packaging>
 -</model>
-+   <artifactId>maven-core-it0046-subproject2</artifactId>
 +   <parent>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-core-it0046</artifactId>
 +      <version>1.0</version>
 +   </parent>
++   <artifactId>maven-core-it0046-subproject2</artifactId>
 +   <packaging>jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1011/subproject/pom.xml.withoutxslt	2006-09-21 \
                18:44:31.000000000 -0400
-+++ ./maven2/maven-core-it/it1011/subproject/pom.xml	2006-09-21 18:44:34.000000000 \
                -0400
-@@ -1,24 +1,25 @@
+--- ./maven2/maven-core-it/it1011/subproject/pom.xml.withoutxslt	2006-10-05 \
14:34:36.000000000 -0400 ++++ \
./maven2/maven-core-it/it1011/subproject/pom.xml	2006-10-05 14:34:39.000000000 -0400 \
+@@ -1,24 +1,24 @@  +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -1573,21 +1556,20 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0046-subproject</artifactId>
 +   <parent>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-core-it0046</artifactId>
 +      <version>1.0</version>
 +   </parent>
++   <artifactId>maven-core-it0046-subproject</artifactId>
 +   <packaging>jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <configuration>
 +               <fail>true</fail>
 +            </configuration>
@@ -1597,9 +1579,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0102/pom.xml.withoutxslt	2006-09-21 18:44:34.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0102/pom.xml	2006-09-21 18:44:38.000000000 -0400
-@@ -1,67 +1,73 @@
+--- ./maven2/maven-core-it/it0102/pom.xml.withoutxslt	2006-10-05 14:34:39.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0102/pom.xml	2006-10-05 14:34:41.000000000 -0400
+@@ -1,67 +1,70 @@
 -<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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -1669,19 +1651,17 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">parent</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0102</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0</version> ++   <groupId \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0102</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">parent</artifactId>  +   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">parent</name>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-help-plugin</artifactId>
 +            <version>2.0.1-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-help-plugin</artifactId>  \
+            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <id>output-pom</id>
@@ -1696,9 +1676,8 @@
 +            </executions>
 +         </plugin>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-antrun-plugin</artifactId>
 +            <version>1.2-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-antrun-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <phase>validate</phase>
@@ -1741,9 +1720,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0044/pom.xml.withoutxslt	2006-09-21 18:44:38.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0044/pom.xml	2006-09-21 18:44:42.000000000 -0400
-@@ -1,31 +1,28 @@
+--- ./maven2/maven-core-it/it0044/pom.xml.withoutxslt	2006-10-05 14:34:41.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0044/pom.xml	2006-10-05 14:34:43.000000000 -0400
+@@ -1,31 +1,27 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -1776,9 +1755,9 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</model>
-+   <artifactId>maven-it0044</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-it0044</artifactId>
 +   <pluginRepositories>
 +      <pluginRepository>
 +         <id>snapshots</id>
@@ -1786,14 +1765,13 @@
 +         <url>http://snapshots.maven.codehaus.org/maven2</url>
 +      </pluginRepository>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <configuration>
 +               <pluginItem>${test}</pluginItem>
 +            </configuration>
@@ -1803,8 +1781,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0008/pom.xml.withoutxslt	2006-09-21 18:44:42.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0008/pom.xml	2006-09-21 18:44:45.000000000 -0400
+--- ./maven2/maven-core-it/it0008/pom.xml.withoutxslt	2006-10-05 14:34:43.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0008/pom.xml	2006-10-05 14:34:46.000000000 -0400
 @@ -1,39 +1,41 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -1846,9 +1824,9 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</model>
-+   <artifactId>maven-core-it0008</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0008</artifactId>
 +   <packaging>jar</packaging>
 +   <pluginRepositories>
 +      <pluginRepository>
@@ -1861,9 +1839,9 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <executions>
 +               <execution>
 +                  <goals>
@@ -1876,9 +1854,9 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -1886,9 +1864,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0005/pom.xml.withoutxslt	2006-09-21 18:44:45.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0005/pom.xml	2006-09-21 18:44:49.000000000 -0400
-@@ -1,7 +1,10 @@
+--- ./maven2/maven-core-it/it0005/pom.xml.withoutxslt	2006-10-05 14:34:46.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0005/pom.xml	2006-10-05 14:34:48.000000000 -0400
+@@ -1,7 +1,9 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -1897,18 +1875,17 @@
 -  <packaging>pom</packaging>
 -  <version>1.0-SNAPSHOT</version>
 -</model>
-+   <artifactId>maven-core-it0005</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0005</artifactId>
 +   <packaging>pom</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1006/pom.xml.withoutxslt	2006-09-21 18:44:49.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1006/pom.xml	2006-09-21 18:44:52.000000000 -0400
-@@ -1,35 +1,36 @@
+--- ./maven2/maven-core-it/it1006/pom.xml.withoutxslt	2006-10-05 14:34:48.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1006/pom.xml	2006-10-05 14:34:51.000000000 -0400
+@@ -1,35 +1,35 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -1945,17 +1922,16 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-it0025</artifactId>
-+   <groupId>org.apache.maven.</groupId>
 +   <version>1.0-SNAPSHOT</version>
-+   <dependencies/>
++   <groupId>org.apache.maven.</groupId>
++   <artifactId>maven-it0025</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <executions>
 +               <execution>
 +                  <configuration>
@@ -1980,8 +1956,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1008/pom.xml.withoutxslt	2006-09-21 18:44:52.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1008/pom.xml	2006-09-21 18:44:56.000000000 -0400
+--- ./maven2/maven-core-it/it1008/pom.xml.withoutxslt	2006-10-05 14:34:51.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1008/pom.xml	2006-10-05 14:34:53.000000000 -0400
 @@ -1,17 +1,19 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -2001,27 +1977,27 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <artifactId>maven-core-it0034</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0034</artifactId>
 +   <packaging>jar</packaging>
 +   <name>Maven Quick Start Archetype</name>
 +   <url>http://maven.apache.org</url>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0058/pom.xml.withoutxslt	2006-09-21 18:44:56.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0058/pom.xml	2006-09-21 18:44:59.000000000 -0400
-@@ -1,11 +1,13 @@
+--- ./maven2/maven-core-it/it0058/pom.xml.withoutxslt	2006-10-05 14:34:53.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0058/pom.xml	2006-10-05 14:34:55.000000000 -0400
+@@ -1,11 +1,12 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -2034,20 +2010,19 @@
 -    <module>subproject</module>
 -  </modules>
 -</model>
-+   <artifactId>maven-core-it0058</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0058</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>subproject</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0058/subproject/pom.xml.withoutxslt	2006-09-21 \
                18:44:59.000000000 -0400
-+++ ./maven2/maven-core-it/it0058/subproject/pom.xml	2006-09-21 18:45:03.000000000 \
-0400 +--- ./maven2/maven-core-it/it0058/subproject/pom.xml.withoutxslt	2006-10-05 \
14:34:55.000000000 -0400 ++++ \
./maven2/maven-core-it/it0058/subproject/pom.xml	2006-10-05 14:34:58.000000000 -0400  \
@@ -1,18 +1,20 @@  +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -2068,18 +2043,18 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0058-subproject</artifactId>
 +   <parent>
 +      <groupId>org.apache.maven.it</groupId>
 +      <artifactId>maven-core-it0058</artifactId>
 +      <version>1.0</version>
 +   </parent>
++   <artifactId>maven-core-it0058-subproject</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -2087,9 +2062,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1016/pom.xml.withoutxslt	2006-09-21 18:45:03.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1016/pom.xml	2006-09-21 18:45:06.000000000 -0400
-@@ -1,6 +1,9 @@
+--- ./maven2/maven-core-it/it1016/pom.xml.withoutxslt	2006-10-05 14:34:58.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1016/pom.xml	2006-10-05 14:35:00.000000000 -0400
+@@ -1,6 +1,8 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -2097,16 +2072,15 @@
 -  <artifactId>maven-core-it1016</artifactId>
 -  <version>1.0-SNAPSHOT</version>
 -</project>
-+   <artifactId>maven-core-it1016</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
-+   <dependencies/>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it1016</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0091/pom.xml.withoutxslt	2006-09-21 18:45:06.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0091/pom.xml	2006-09-21 18:45:10.000000000 -0400
+--- ./maven2/maven-core-it/it0091/pom.xml.withoutxslt	2006-10-05 14:35:00.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0091/pom.xml	2006-10-05 14:35:03.000000000 -0400
 @@ -1,27 +1,29 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -2136,9 +2110,9 @@
 -    </resources>
 -  </build>
 -</project>
-+   <artifactId>maven-core-it0090</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0090</artifactId>
 +   <properties>
 +      <filter.resources>true</filter.resources>
 +      <name>jason</name>
@@ -2154,9 +2128,9 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -2164,8 +2138,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0057/pom.xml.withoutxslt	2006-09-21 18:45:10.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0057/pom.xml	2006-09-21 18:45:14.000000000 -0400
+--- ./maven2/maven-core-it/it0057/pom.xml.withoutxslt	2006-10-05 14:35:03.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0057/pom.xml	2006-10-05 14:35:05.000000000 -0400
 @@ -1,15 +1,17 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -2183,25 +2157,25 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0057</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0057</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>provided</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0097/pom.xml.withoutxslt	2006-09-21 18:45:17.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0097/pom.xml	2006-09-21 18:45:21.000000000 -0400
-@@ -1,13 +1,15 @@
+--- ./maven2/maven-core-it/it0097/pom.xml.withoutxslt	2006-10-05 14:35:10.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0097/pom.xml	2006-10-05 14:35:13.000000000 -0400
+@@ -1,13 +1,14 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -2216,22 +2190,21 @@
 -    <module>project/relative-project-level2/relative-project-level3/</module>
 -  </modules>
 -</project>
-+   <artifactId>maven-it0097-launcher</artifactId>
-+   <groupId>org.apache.maven.it0097</groupId>
 +   <version>1</version>
++   <groupId>org.apache.maven.it0097</groupId>
++   <artifactId>maven-it0097-launcher</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>plugin</module>
 +      <module>project/project-level2/project-level3</module>
 +      <module>project/relative-project-level2/relative-project-level3/</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0097/plugin/pom.xml.withoutxslt	2006-09-21 \
                18:45:14.000000000 -0400
-+++ ./maven2/maven-core-it/it0097/plugin/pom.xml	2006-09-21 18:45:17.000000000 -0400
+--- ./maven2/maven-core-it/it0097/plugin/pom.xml.withoutxslt	2006-10-05 \
14:35:05.000000000 -0400 ++++ ./maven2/maven-core-it/it0097/plugin/pom.xml	2006-10-05 \
14:35:10.000000000 -0400  @@ -1,15 +1,16 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -2249,24 +2222,24 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <artifactId>maven-it0097-plugin</artifactId>
-+   <groupId>org.apache.maven.it0097</groupId>
 +   <version>1</version>
++   <groupId>org.apache.maven.it0097</groupId>
++   <artifactId>maven-it0097-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0097/project/pom.xml.withoutxslt	2006-09-21 \
                18:45:21.000000000 -0400
-+++ ./maven2/maven-core-it/it0097/project/pom.xml	2006-09-21 18:45:24.000000000 \
                -0400
-@@ -1,29 +1,31 @@
+--- ./maven2/maven-core-it/it0097/project/pom.xml.withoutxslt	2006-10-05 \
14:35:13.000000000 -0400 ++++ \
./maven2/maven-core-it/it0097/project/pom.xml	2006-10-05 14:35:15.000000000 -0400 +@@ \
                -1,29 +1,30 @@
 -<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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -2298,14 +2271,13 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-project-level1</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0097</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1</version> ++   <groupId \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0097</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-project-level1</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <modules \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>project-level2</module>  +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
@@ -2328,9 +2300,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0097/project/relative-project-level2/relative-project-level3/pom.xml.withoutxslt	2006-09-21 \
                18:45:24.000000000 -0400
-+++ ./maven2/maven-core-it/it0097/project/relative-project-level2/relative-project-level3/pom.xml	2006-09-21 \
                18:45:28.000000000 -0400
-@@ -1,16 +1,16 @@
+--- ./maven2/maven-core-it/it0097/project/relative-project-level2/relative-project-level3/pom.xml.withoutxslt	2006-10-05 \
14:35:15.000000000 -0400 ++++ \
./maven2/maven-core-it/it0097/project/relative-project-level2/relative-project-level3/pom.xml	2006-10-05 \
14:35:18.000000000 -0400 +@@ -1,16 +1,15 @@
 -<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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -2349,24 +2321,23 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-relative-project-level3</artifactId>
  +   <parent>
 +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0097</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-relative-project-level2</artifactId>
  +      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1</version>  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-relative-project-level3</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <modules \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>../../project-sibling-level2</module>  +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0097/project/relative-project-level2/pom.xml.withoutxslt	2006-09-21 \
                18:45:28.000000000 -0400
-+++ ./maven2/maven-core-it/it0097/project/relative-project-level2/pom.xml	2006-09-21 \
                18:45:31.000000000 -0400
-@@ -1,16 +1,16 @@
+--- ./maven2/maven-core-it/it0097/project/relative-project-level2/pom.xml.withoutxslt	2006-10-05 \
14:35:18.000000000 -0400 ++++ \
./maven2/maven-core-it/it0097/project/relative-project-level2/pom.xml	2006-10-05 \
14:35:21.000000000 -0400 +@@ -1,16 +1,15 @@
 -<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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -2385,23 +2356,22 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-relative-project-level2</artifactId>
  +   <parent>
 +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0097</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-project-level1</artifactId>
  +      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1</version>  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-relative-project-level2</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <modules \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>relative-project-level3</module>  +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0097/project/project-level2/project-level3/pom.xml.withoutxslt	2006-09-21 \
                18:45:31.000000000 -0400
-+++ ./maven2/maven-core-it/it0097/project/project-level2/project-level3/pom.xml	2006-09-21 \
18:45:35.000000000 -0400 +--- \
./maven2/maven-core-it/it0097/project/project-level2/project-level3/pom.xml.withoutxslt	2006-10-05 \
14:35:21.000000000 -0400 ++++ \
./maven2/maven-core-it/it0097/project/project-level2/project-level3/pom.xml	2006-10-05 \
14:35:23.000000000 -0400  @@ -1,34 +1,35 @@
 -<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"> @@ -2439,19 +2409,19 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-project-level3</artifactId>
  +   <parent>
 +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0097</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-project-level2</artifactId>
  +      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1</version>  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-project-level3</artifactId>
  +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-jar-plugin</artifactId>
 +            <version>2.1-SNAPSHOT</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-jar-plugin</artifactId>  \
+            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <goals>
@@ -2464,18 +2434,18 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0097/project/project-level2/pom.xml.withoutxslt	2006-09-21 \
                18:45:35.000000000 -0400
-+++ ./maven2/maven-core-it/it0097/project/project-level2/pom.xml	2006-09-21 \
                18:45:38.000000000 -0400
-@@ -1,17 +1,17 @@
+--- ./maven2/maven-core-it/it0097/project/project-level2/pom.xml.withoutxslt	2006-10-05 \
14:35:23.000000000 -0400 ++++ \
./maven2/maven-core-it/it0097/project/project-level2/pom.xml	2006-10-05 \
14:35:26.000000000 -0400 +@@ -1,17 +1,16 @@
 -<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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -2495,24 +2465,23 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-project-level2</artifactId>
  +   <parent>
 +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0097</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-project-level1</artifactId>
  +      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1</version>  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-project-level2</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <modules \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>project-level3</module>  +      <module>../project-sibling-level2</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0097/project/project-sibling-level2/pom.xml.withoutxslt	2006-09-21 \
                18:45:38.000000000 -0400
-+++ ./maven2/maven-core-it/it0097/project/project-sibling-level2/pom.xml	2006-09-21 \
18:45:42.000000000 -0400 +--- \
./maven2/maven-core-it/it0097/project/project-sibling-level2/pom.xml.withoutxslt	2006-10-05 \
14:35:26.000000000 -0400 ++++ \
./maven2/maven-core-it/it0097/project/project-sibling-level2/pom.xml	2006-10-05 \
14:35:28.000000000 -0400  @@ -1,35 +1,36 @@
 -<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"> @@ -2551,20 +2520,20 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-project-sibling-level2</artifactId>
  +   <parent>
 +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0097</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-project-level2</artifactId>
  +      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1</version>  +      \
<relativePath xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">../project-level2</relativePath>
  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0097-project-sibling-level2</artifactId>
  +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-jar-plugin</artifactId>
 +            <version>2.1-SNAPSHOT</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-jar-plugin</artifactId>  \
+            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <goals>
@@ -2577,18 +2546,18 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0076/pom.xml.withoutxslt	2006-09-21 18:45:42.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0076/pom.xml	2006-09-21 18:45:45.000000000 -0400
-@@ -1,29 +1,29 @@
+--- ./maven2/maven-core-it/it0076/pom.xml.withoutxslt	2006-10-05 14:35:29.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0076/pom.xml	2006-10-05 14:35:31.000000000 -0400
+@@ -1,29 +1,28 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -2619,11 +2588,10 @@
 -    </pluginManagement>
 -  </build>
 -</project>
-+   <artifactId>maven-core-it0076</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0076</artifactId>
 +   <packaging>pom</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <pluginManagement>
@@ -2647,8 +2615,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1003/pom.xml.withoutxslt	2006-09-21 18:45:45.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1003/pom.xml	2006-09-21 18:45:49.000000000 -0400
+--- ./maven2/maven-core-it/it1003/pom.xml.withoutxslt	2006-10-05 14:35:31.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1003/pom.xml	2006-10-05 14:35:34.000000000 -0400
 @@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -2667,16 +2635,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it1003</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it1003</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -2684,8 +2652,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0069/pom.xml.withoutxslt	2006-09-21 18:45:49.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0069/pom.xml	2006-09-21 18:45:53.000000000 -0400
+--- ./maven2/maven-core-it/it0069/pom.xml.withoutxslt	2006-10-05 14:35:35.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0069/pom.xml	2006-10-05 14:35:37.000000000 -0400
 @@ -1,14 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -2702,23 +2670,23 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <artifactId>maven-it0069</artifactId>
-+   <groupId>org.apache.maven.it0069</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.it0069</groupId>
++   <artifactId>maven-it0069</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>classworlds</artifactId>
 +         <version>1.4</version>
++         <groupId>classworlds</groupId>
++         <artifactId>classworlds</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0089/pom.xml.withoutxslt	2006-09-21 18:45:56.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0089/pom.xml	2006-09-21 18:46:00.000000000 -0400
-@@ -1,13 +1,14 @@
+--- ./maven2/maven-core-it/it0089/pom.xml.withoutxslt	2006-10-05 14:35:40.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0089/pom.xml	2006-10-05 14:35:43.000000000 -0400
+@@ -1,13 +1,13 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -2733,21 +2701,20 @@
 -    <module>project</module>
 -  </modules>
 -</project>
-+   <artifactId>it0089-root</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>it0089-root</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>plugin</module>
 +      <module>project</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0089/plugin/pom.xml.withoutxslt	2006-09-21 \
                18:45:53.000000000 -0400
-+++ ./maven2/maven-core-it/it0089/plugin/pom.xml	2006-09-21 18:45:56.000000000 -0400
+--- ./maven2/maven-core-it/it0089/plugin/pom.xml.withoutxslt	2006-10-05 \
14:35:37.000000000 -0400 ++++ ./maven2/maven-core-it/it0089/plugin/pom.xml	2006-10-05 \
14:35:40.000000000 -0400  @@ -1,26 +1,26 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -2776,34 +2743,34 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <artifactId>maven-it0089-plugin</artifactId>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <version>2.0.4-JPP</version>
 +   <parent>
 +      <groupId>org.apache.maven.it</groupId>
 +      <version>1.0</version>
 +      <artifactId>it0089-root</artifactId>
 +   </parent>
++   <groupId>org.apache.maven.plugins</groupId>
++   <artifactId>maven-it0089-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>checkstyle</artifactId>
 +         <version>4.1</version>
++         <groupId>checkstyle</groupId>
++         <artifactId>checkstyle</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0089/project/pom.xml.withoutxslt	2006-09-21 \
                18:46:00.000000000 -0400
-+++ ./maven2/maven-core-it/it0089/project/pom.xml	2006-09-21 18:46:03.000000000 \
                -0400
-@@ -1,30 +1,30 @@
+--- ./maven2/maven-core-it/it0089/project/pom.xml.withoutxslt	2006-10-05 \
14:35:43.000000000 -0400 ++++ \
./maven2/maven-core-it/it0089/project/pom.xml	2006-10-05 14:35:45.000000000 -0400 +@@ \
-1,30 +1,28 @@  +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -2835,21 +2802,19 @@
 -    </plugins>
 -  </build>
 -</project>
-+   <artifactId>it0089</artifactId>
 +   <parent>
 +      <groupId>org.apache.maven.it</groupId>
 +      <version>1.0</version>
 +      <artifactId>it0089-root</artifactId>
 +   </parent>
++   <artifactId>it0089</artifactId>
 +   <name>Plugin Transitive Dependency Classloading Test</name>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-it0089-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <artifactId>maven-it0089-plugin</artifactId>
 +            <executions>
 +               <execution>
 +                  <phase>validate</phase>
@@ -2864,9 +2829,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0079/pom.xml.withoutxslt	2006-09-21 18:46:03.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0079/pom.xml	2006-09-21 18:46:07.000000000 -0400
-@@ -1,33 +1,32 @@
+--- ./maven2/maven-core-it/it0079/pom.xml.withoutxslt	2006-10-05 14:35:45.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0079/pom.xml	2006-10-05 14:35:48.000000000 -0400
+@@ -1,33 +1,31 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -
 +<?xml version="1.0" encoding="utf-8"?>
@@ -2900,9 +2865,9 @@
 -        </plugins>
 -    </build>
 -
-+   <artifactId>maven-core-it0079</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>SNAPSHOT</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0079</artifactId>
 +   <distributionManagement>
 +      <snapshotRepository>
 +         <id>test</id>
@@ -2910,14 +2875,13 @@
 +         <url>file:target/test-repo</url>
 +      </snapshotRepository>
 +   </distributionManagement>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.0.1-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-source-plugin</artifactId>
-+            <version>2.0.1-SNAPSHOT</version>
 +            <executions>
 +               <execution>
 +                  <goals>
@@ -2931,8 +2895,8 @@
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0038/pom.xml.withoutxslt	2006-09-21 18:46:07.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0038/pom.xml	2006-09-21 18:46:11.000000000 -0400
+--- ./maven2/maven-core-it/it0038/pom.xml.withoutxslt	2006-10-05 14:35:48.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0038/pom.xml	2006-10-05 14:35:50.000000000 -0400
 @@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -2951,16 +2915,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0037</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0037</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -2968,8 +2932,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0038/project/pom2.xml.withoutxslt	2006-09-21 \
                18:46:11.000000000 -0400
-+++ ./maven2/maven-core-it/it0038/project/pom2.xml	2006-09-21 18:46:14.000000000 \
-0400 +--- ./maven2/maven-core-it/it0038/project/pom2.xml.withoutxslt	2006-10-05 \
14:35:50.000000000 -0400 ++++ \
./maven2/maven-core-it/it0038/project/pom2.xml	2006-10-05 14:35:52.000000000 -0400  \
@@ -1,16 +1,18 @@  +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -2988,16 +2952,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0037</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-build2</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0037</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -3005,9 +2969,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0067/pom.xml.withoutxslt	2006-09-21 18:46:14.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0067/pom.xml	2006-09-21 18:46:18.000000000 -0400
-@@ -1,21 +1,22 @@
+--- ./maven2/maven-core-it/it0067/pom.xml.withoutxslt	2006-10-05 14:35:52.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0067/pom.xml	2006-10-05 14:35:55.000000000 -0400
+@@ -1,21 +1,21 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -3030,20 +2994,19 @@
 -    </profile>
 -  </profiles>
 -</project>
-+   <artifactId>maven-it0067-plugin</artifactId>
-+   <groupId>org.apache.maven.plugins.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.plugins.it</groupId>
++   <artifactId>maven-it0067-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <profiles>
 +      <profile>
 +         <id>test-profile</id>
 +         <dependencies>
 +            <dependency>
-+               <groupId>JPP</groupId>
-+               <artifactId>junit</artifactId>
 +               <version>3.8.1</version>
++               <groupId>junit</groupId>
++               <artifactId>junit</artifactId>
 +            </dependency>
 +         </dependencies>
 +      </profile>
@@ -3051,9 +3014,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0046/pom.xml.withoutxslt	2006-09-21 18:46:18.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0046/pom.xml	2006-09-21 18:46:21.000000000 -0400
-@@ -1,18 +1,21 @@
+--- ./maven2/maven-core-it/it0046/pom.xml.withoutxslt	2006-10-05 14:35:55.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0046/pom.xml	2006-10-05 14:35:57.000000000 -0400
+@@ -1,18 +1,20 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -3073,9 +3036,9 @@
 -    <module>subproject2</module>
 -  </modules>
 -</model>
-+   <artifactId>maven-core-it0046</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0046</artifactId>
 +   <packaging>pom</packaging>
 +   <pluginRepositories>
 +      <pluginRepository>
@@ -3088,14 +3051,13 @@
 +      <module>subproject</module>
 +      <module>subproject2</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0046/subproject2/pom.xml.withoutxslt	2006-09-21 \
                18:46:21.000000000 -0400
-+++ ./maven2/maven-core-it/it0046/subproject2/pom.xml	2006-09-21 18:46:25.000000000 \
                -0400
-@@ -1,10 +1,13 @@
+--- ./maven2/maven-core-it/it0046/subproject2/pom.xml.withoutxslt	2006-10-05 \
14:35:57.000000000 -0400 ++++ \
./maven2/maven-core-it/it0046/subproject2/pom.xml	2006-10-05 14:36:00.000000000 -0400 \
+@@ -1,10 +1,12 @@  +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -3107,21 +3069,20 @@
 -  <artifactId>maven-core-it0046-subproject2</artifactId>
 -  <packaging>jar</packaging>
 -</model>
-+   <artifactId>maven-core-it0046-subproject2</artifactId>
 +   <parent>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-core-it0046</artifactId>
 +      <version>1.0</version>
 +   </parent>
++   <artifactId>maven-core-it0046-subproject2</artifactId>
 +   <packaging>jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0046/subproject/pom.xml.withoutxslt	2006-09-21 \
                18:46:25.000000000 -0400
-+++ ./maven2/maven-core-it/it0046/subproject/pom.xml	2006-09-21 18:46:28.000000000 \
                -0400
-@@ -1,24 +1,25 @@
+--- ./maven2/maven-core-it/it0046/subproject/pom.xml.withoutxslt	2006-10-05 \
14:36:00.000000000 -0400 ++++ \
./maven2/maven-core-it/it0046/subproject/pom.xml	2006-10-05 14:36:02.000000000 -0400 \
+@@ -1,24 +1,24 @@  +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -3147,21 +3108,20 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0046-subproject</artifactId>
 +   <parent>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-core-it0046</artifactId>
 +      <version>1.0</version>
 +   </parent>
++   <artifactId>maven-core-it0046-subproject</artifactId>
 +   <packaging>jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <configuration>
 +               <fail>true</fail>
 +            </configuration>
@@ -3171,9 +3131,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0095/pom.xml.withoutxslt	2006-09-21 18:46:32.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0095/pom.xml	2006-09-21 18:46:35.000000000 -0400
-@@ -1,16 +1,16 @@
+--- ./maven2/maven-core-it/it0095/pom.xml.withoutxslt	2006-10-05 14:36:05.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0095/pom.xml	2006-10-05 14:36:07.000000000 -0400
+@@ -1,16 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -3191,14 +3151,13 @@
 -    <defaultGoal>integration-test</defaultGoal>
 -  </build>
 -</project>
-+   <artifactId>bootstrapper</artifactId>
-+   <groupId>org.apache.maven.it.mng2006</groupId>
 +   <version>1</version>
++   <groupId>org.apache.maven.it.mng2006</groupId>
++   <artifactId>bootstrapper</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>parent</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <defaultGoal>integration-test</defaultGoal>
@@ -3206,9 +3165,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0095/sub1/pom.xml.withoutxslt	2006-09-21 \
                18:46:28.000000000 -0400
-+++ ./maven2/maven-core-it/it0095/sub1/pom.xml	2006-09-21 18:46:32.000000000 -0400
-@@ -1,44 +1,48 @@
+--- ./maven2/maven-core-it/it0095/sub1/pom.xml.withoutxslt	2006-10-05 \
14:36:02.000000000 -0400 ++++ ./maven2/maven-core-it/it0095/sub1/pom.xml	2006-10-05 \
14:36:05.000000000 -0400 +@@ -1,44 +1,45 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -3254,22 +3213,20 @@
 -    </plugins>
 -  </build>
 -</project>
-+   <artifactId>sub1</artifactId>
 +   <parent>
 +      <groupId>org.apache.maven.it.mng2006</groupId>
 +      <artifactId>parent</artifactId>
 +      <version>1</version>
 +      <relativePath>../parent</relativePath>
 +   </parent>
-+   <dependencies/>
++   <artifactId>sub1</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <defaultGoal>integration-test</defaultGoal>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-help-plugin</artifactId>
 +            <version>2.0.1-SNAPSHOT</version>
++            <artifactId>maven-help-plugin</artifactId>
 +            <configuration>
 +               <output>${project.build.directory}/effective-pom.xml</output>
 +            </configuration>
@@ -3284,9 +3241,8 @@
 +            </executions>
 +         </plugin>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-verifier-plugin</artifactId>
 +            <version>1.0-beta-2-SNAPSHOT</version>
++            <artifactId>maven-verifier-plugin</artifactId>
 +            <executions>
 +               <execution>
 +                  <id>verify</id>
@@ -3301,9 +3257,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0095/parent/pom.xml.withoutxslt	2006-09-21 \
                18:46:35.000000000 -0400
-+++ ./maven2/maven-core-it/it0095/parent/pom.xml	2006-09-21 18:46:39.000000000 -0400
-@@ -1,23 +1,22 @@
+--- ./maven2/maven-core-it/it0095/parent/pom.xml.withoutxslt	2006-10-05 \
14:36:07.000000000 -0400 ++++ ./maven2/maven-core-it/it0095/parent/pom.xml	2006-10-05 \
14:36:09.000000000 -0400 +@@ -1,23 +1,21 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -3328,9 +3284,9 @@
 -    <module>../sub1</module>
 -  </modules>
 -</project>
-+   <artifactId>parent</artifactId>
-+   <groupId>org.apache.maven.it.mng2006</groupId>
 +   <version>1</version>
++   <groupId>org.apache.maven.it.mng2006</groupId>
++   <artifactId>parent</artifactId>
 +   <packaging>pom</packaging>
 +   <scm>
 +      <connection>scm:svn:https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/maven-core-it/it0095/parent</connection>
 @@ -3344,13 +3300,12 @@
 +   <modules>
 +      <module>../sub1</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0059/pom.xml.withoutxslt	2006-09-21 18:46:39.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0059/pom.xml	2006-09-21 18:46:42.000000000 -0400
+--- ./maven2/maven-core-it/it0059/pom.xml.withoutxslt	2006-10-05 14:36:09.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0059/pom.xml	2006-10-05 14:36:12.000000000 -0400
 @@ -1,22 +1,22 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -3375,9 +3330,9 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <artifactId>maven-core-it0059</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0059</artifactId>
 +   <repositories>
 +      <repository>
 +         <id>test</id>
@@ -3387,34 +3342,33 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>2.0.2</version>
++         <groupId>test</groupId>
++         <artifactId>test</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0059/test-repo/test/test/3.8.1/test-3.8.1.pom.withoutxslt	2006-09-21 \
                18:46:42.000000000 -0400
-+++ ./maven2/maven-core-it/it0059/test-repo/test/test/3.8.1/test-3.8.1.pom	2006-09-21 \
                18:46:46.000000000 -0400
-@@ -1,5 +1,8 @@
+--- ./maven2/maven-core-it/it0059/test-repo/test/test/3.8.1/test-3.8.1.pom.withoutxslt	2006-10-05 \
14:36:12.000000000 -0400 ++++ \
./maven2/maven-core-it/it0059/test-repo/test/test/3.8.1/test-3.8.1.pom	2006-10-05 \
14:36:14.000000000 -0400 +@@ -1,5 +1,7 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <groupId>junit</groupId>
 -  <artifactId>junit</artifactId>
 -  <version>3.8.1</version>
 -</project>
-+   <groupId>JPP</groupId>
-+   <artifactId>junit</artifactId>
 +   <version>3.8.1</version>
-+   <dependencies/>
++   <groupId>junit</groupId>
++   <artifactId>junit</artifactId>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0004/pom.xml.withoutxslt	2006-09-21 18:46:46.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0004/pom.xml	2006-09-21 18:46:50.000000000 -0400
-@@ -1,7 +1,10 @@
+--- ./maven2/maven-core-it/it0004/pom.xml.withoutxslt	2006-10-05 14:36:14.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0004/pom.xml	2006-10-05 14:36:16.000000000 -0400
+@@ -1,7 +1,9 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -3423,17 +3377,16 @@
 -  <packaging>pom</packaging>
 -  <version>1.0</version>
 -</model>
-+   <artifactId>maven-core-it0004</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0004</artifactId>
 +   <packaging>pom</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it2002/project/pom.xml.withoutxslt	2006-09-21 \
                18:46:50.000000000 -0400
-+++ ./maven2/maven-core-it/it2002/project/pom.xml	2006-09-21 18:46:53.000000000 \
-0400 +--- ./maven2/maven-core-it/it2002/project/pom.xml.withoutxslt	2006-10-05 \
14:36:16.000000000 -0400 ++++ \
./maven2/maven-core-it/it2002/project/pom.xml	2006-10-05 14:36:19.000000000 -0400  @@ \
-1,119 +1,113 @@  +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -3541,9 +3494,9 @@
 -        </property>
 -      </activation>
 -
-+   <artifactId>project</artifactId>
-+   <groupId>org.apache.maven.it2002</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.it2002</groupId>
++   <artifactId>project</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>subproject</module>
@@ -3592,9 +3545,9 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
 +            <version>1.0-alpha-8</version>
++            <groupId>org.codehaus.modello</groupId>
++            <artifactId>modello-maven-plugin</artifactId>
 +         </plugin>
 +      </plugins>
 +      <resources>
@@ -3617,9 +3570,9 @@
 +         </activation>
 +         <dependencies>
 +            <dependency>
-+               <groupId>JPP/maven2</groupId>
-+               <artifactId>artifact</artifactId>
 +               <version>2.0.4</version>
++               <groupId>org.apache.maven</groupId>
++               <artifactId>maven-artifact</artifactId>
 +            </dependency>
 +         </dependencies>
 +         <properties>
@@ -3642,15 +3595,15 @@
 -          <artifactId>maven-artifact</artifactId>
 -        </dependency>
 +         <dependency>
-+            <groupId>JPP/maven2</groupId>
-+            <artifactId>artifact</artifactId>
 +            <version>2.0.4</version>
++            <groupId>org.apache.maven</groupId>
++            <artifactId>maven-artifact</artifactId>
 +            <scope>test</scope>
 +         </dependency>
 +         <dependency>
-+            <groupId>JPP/maven2</groupId>
-+            <artifactId>artifact-manager</artifactId>
 +            <version>2.0.4</version>
++            <groupId>org.apache.maven</groupId>
++            <artifactId>maven-artifact-manager</artifactId>
 +            <scope>test</scope>
 +         </dependency>
        </dependencies>
@@ -3665,8 +3618,8 @@
 +   </dependencyManagement>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it2002/project/subproject2/pom.xml.withoutxslt	2006-09-21 \
                18:46:53.000000000 -0400
-+++ ./maven2/maven-core-it/it2002/project/subproject2/pom.xml	2006-09-21 \
18:46:57.000000000 -0400 +--- \
./maven2/maven-core-it/it2002/project/subproject2/pom.xml.withoutxslt	2006-10-05 \
14:36:19.000000000 -0400 ++++ \
./maven2/maven-core-it/it2002/project/subproject2/pom.xml	2006-10-05 \
14:36:21.000000000 -0400  @@ -1,29 +1,29 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -3681,7 +3634,6 @@
 -
 -  <dependencies>
 -    <dependency>
-+   <artifactId>project-sub2</artifactId>
 +   <parent>
        <groupId>org.apache.maven.it2002</groupId>
 -      <artifactId>project-sub1</artifactId>
@@ -3702,6 +3654,7 @@
 -
 -</project>
 +   </parent>
++   <artifactId>project-sub2</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
@@ -3716,16 +3669,16 @@
 +         </exclusions>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-manager</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact-manager</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it2002/project/subproject/pom.xml.withoutxslt	2006-09-21 \
                18:46:57.000000000 -0400
-+++ ./maven2/maven-core-it/it2002/project/subproject/pom.xml	2006-09-21 \
18:47:01.000000000 -0400 +--- \
./maven2/maven-core-it/it2002/project/subproject/pom.xml.withoutxslt	2006-10-05 \
14:36:21.000000000 -0400 ++++ \
./maven2/maven-core-it/it2002/project/subproject/pom.xml	2006-10-05 \
14:36:24.000000000 -0400  @@ -1,17 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -3745,26 +3698,26 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <artifactId>project-sub1</artifactId>
 +   <parent>
 +      <groupId>org.apache.maven.it2002</groupId>
 +      <artifactId>project</artifactId>
 +      <version>1.0-SNAPSHOT</version>
 +   </parent>
++   <artifactId>project-sub1</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-manager</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact-manager</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0019/pom.xml.withoutxslt	2006-09-21 18:47:01.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0019/pom.xml	2006-09-21 18:47:05.000000000 -0400
-@@ -1,14 +1,18 @@
+--- ./maven2/maven-core-it/it0019/pom.xml.withoutxslt	2006-10-05 14:36:24.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0019/pom.xml	2006-10-05 14:36:26.000000000 -0400
+@@ -1,14 +1,16 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -3780,26 +3733,24 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0019</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
-+   <dependencies/>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0019</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-compiler-plugin</artifactId>
 +            <version>2.1-SNAPSHOT</version>
++            <artifactId>maven-compiler-plugin</artifactId>
 +         </plugin>
 +      </plugins>
 +   </build>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0030/pom.xml.withoutxslt	2006-09-21 18:47:05.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0030/pom.xml	2006-09-21 18:47:08.000000000 -0400
-@@ -1,28 +1,27 @@
+--- ./maven2/maven-core-it/it0030/pom.xml.withoutxslt	2006-10-05 14:36:26.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0030/pom.xml	2006-10-05 14:36:29.000000000 -0400
+@@ -1,28 +1,26 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -3829,22 +3780,21 @@
 -  </dependencyManagement>
 -
 -</project>
-+   <artifactId>maven-core-it0030</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0030</artifactId>
 +   <packaging>pom</packaging>
 +   <description>Test for dependencyManagement injection for parent-poms of \
transitively resolved poms.</description>  +   <modules>
 +      <module>child-hierarchy</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement>
 +      <dependencies>
 +         <dependency>
-+            <groupId>JPP</groupId>
-+            <artifactId>junit</artifactId>
 +            <version>3.8.1</version>
++            <groupId>junit</groupId>
++            <artifactId>junit</artifactId>
 +         </dependency>
 +         <dependency>
 +            <groupId>org.apache.maven.it</groupId>
@@ -3855,8 +3805,8 @@
 +   </dependencyManagement>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0030/child-hierarchy/pom.xml.withoutxslt	2006-09-21 \
                18:47:08.000000000 -0400
-+++ ./maven2/maven-core-it/it0030/child-hierarchy/pom.xml	2006-09-21 \
18:47:12.000000000 -0400 +--- \
./maven2/maven-core-it/it0030/child-hierarchy/pom.xml.withoutxslt	2006-10-05 \
14:36:29.000000000 -0400 ++++ \
./maven2/maven-core-it/it0030/child-hierarchy/pom.xml	2006-10-05 14:36:31.000000000 \
-0400  @@ -1,26 +1,26 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -3885,14 +3835,14 @@
 -    <module>project2</module>
 -  </modules>
 -</model>
-+   <artifactId>maven-core-it0030-child-hierarchy</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
 +   <parent>
 +      <groupId>org.apache.maven.it</groupId>
 +      <artifactId>maven-core-it0030</artifactId>
 +      <version>1.0-SNAPSHOT</version>
 +   </parent>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0030-child-hierarchy</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>project1</module>
@@ -3901,17 +3851,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0030/child-hierarchy/project2/pom.xml.withoutxslt	2006-09-21 \
                18:47:12.000000000 -0400
-+++ ./maven2/maven-core-it/it0030/child-hierarchy/project2/pom.xml	2006-09-21 \
18:47:15.000000000 -0400 +--- \
./maven2/maven-core-it/it0030/child-hierarchy/project2/pom.xml.withoutxslt	2006-10-05 \
14:36:31.000000000 -0400 ++++ \
./maven2/maven-core-it/it0030/child-hierarchy/project2/pom.xml	2006-10-05 \
14:36:33.000000000 -0400  @@ -1,20 +1,19 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -3928,8 +3878,6 @@
 -  
 -  <dependencies>
 -    <dependency>
-+   <artifactId>maven-core-it0030-child-project2</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
 +   <parent>
        <groupId>org.apache.maven.it</groupId>
@@ -3941,6 +3889,8 @@
 +      <artifactId>maven-core-it0030-child-hierarchy</artifactId>
 +      <version>1.0-SNAPSHOT</version>
 +   </parent>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0030-child-project2</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
@@ -3951,9 +3901,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0030/child-hierarchy/project1/pom.xml.withoutxslt	2006-09-21 \
                18:47:15.000000000 -0400
-+++ ./maven2/maven-core-it/it0030/child-hierarchy/project1/pom.xml	2006-09-21 \
                18:47:19.000000000 -0400
-@@ -1,13 +1,14 @@
+--- ./maven2/maven-core-it/it0030/child-hierarchy/project1/pom.xml.withoutxslt	2006-10-05 \
14:36:33.000000000 -0400 ++++ \
./maven2/maven-core-it/it0030/child-hierarchy/project1/pom.xml	2006-10-05 \
14:36:36.000000000 -0400 +@@ -1,13 +1,13 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -3968,21 +3918,20 @@
 -  <version>1.0-SNAPSHOT</version>
 -  
 -</model>
-+   <artifactId>maven-core-it0030-child-project1</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
 +   <parent>
 +      <groupId>org.apache.maven.it</groupId>
 +      <artifactId>maven-core-it0030-child-hierarchy</artifactId>
 +      <version>1.0-SNAPSHOT</version>
 +   </parent>
-+   <dependencies/>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0030-child-project1</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0032/pom.xml.withoutxslt	2006-09-21 18:47:19.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0032/pom.xml	2006-09-21 18:47:23.000000000 -0400
+--- ./maven2/maven-core-it/it0032/pom.xml.withoutxslt	2006-10-05 14:36:36.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0032/pom.xml	2006-10-05 14:36:39.000000000 -0400
 @@ -1,20 +1,21 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -4005,9 +3954,9 @@
 -    <maven>2.0-alpha-3</maven>
 -  </prerequesites>
 -</model>
-+   <artifactId>maven-core-it0032</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0032</artifactId>
 +   <packaging>jar</packaging>
 +   <prerequesites>
 +      <maven>2.0-alpha-3</maven>
@@ -4015,9 +3964,9 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -4025,8 +3974,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0063/pom.xml.withoutxslt	2006-09-21 18:47:23.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0063/pom.xml	2006-09-21 18:47:26.000000000 -0400
+--- ./maven2/maven-core-it/it0063/pom.xml.withoutxslt	2006-10-05 14:36:39.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0063/pom.xml	2006-10-05 14:36:42.000000000 -0400
 @@ -1,36 +1,37 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -4065,9 +4014,9 @@
 -    </profile>
 -  </profiles>
 -</model>
-+   <artifactId>maven-core-it0063</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0063</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <profiles>
@@ -4092,18 +4041,18 @@
 +   </profiles>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0087/pom.xml.withoutxslt	2006-09-21 18:47:26.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0087/pom.xml	2006-09-21 18:47:30.000000000 -0400
-@@ -1,54 +1,49 @@
+--- ./maven2/maven-core-it/it0087/pom.xml.withoutxslt	2006-10-05 14:36:42.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0087/pom.xml	2006-10-05 14:36:44.000000000 -0400
+@@ -1,54 +1,48 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -4115,9 +4064,9 @@
 -  <name>POM Plugin-Dependency Classloading Test</name>
 -  
 -  <description>
-+   <artifactId>it0087</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>it0087</artifactId>
 +   <name>POM Plugin-Dependency Classloading Test</name>
 +   <description>
      Ensure that classes in dependencies specified in the POM's plugin configuration \
can be loaded, both from the context loader @@ -4158,19 +4107,18 @@
 +         <url>http://snapshots.maven.codehaus.org/maven2</url>
 +      </pluginRepository>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <dependencies>
 +               <dependency>
-+                  <groupId>JPP</groupId>
-+                  <artifactId>commons-logging</artifactId>
 +                  <version>1.0.4</version>
++                  <groupId>commons-logging</groupId>
++                  <artifactId>commons-logging</artifactId>
 +               </dependency>
 +            </dependencies>
 +            <executions>
@@ -4202,8 +4150,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0061/pom.xml.withoutxslt	2006-09-21 18:47:30.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0061/pom.xml	2006-09-21 18:47:33.000000000 -0400
+--- ./maven2/maven-core-it/it0061/pom.xml.withoutxslt	2006-10-05 14:36:44.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0061/pom.xml	2006-10-05 14:36:47.000000000 -0400
 @@ -1,25 +1,25 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -4231,9 +4179,9 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0061</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0061</artifactId>
 +   <packaging>jar</packaging>
 +   <distributionManagement>
 +      <repository>
@@ -4245,9 +4193,9 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -4255,8 +4203,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1013/pom.xml.withoutxslt	2006-09-21 18:47:33.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1013/pom.xml	2006-09-21 18:47:37.000000000 -0400
+--- ./maven2/maven-core-it/it1013/pom.xml.withoutxslt	2006-10-05 14:36:47.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1013/pom.xml	2006-10-05 14:36:49.000000000 -0400
 @@ -1,14 +1,16 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -4273,23 +4221,23 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it1001</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it1001</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0047/pom.xml.withoutxslt	2006-09-21 18:47:37.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0047/pom.xml	2006-09-21 18:47:41.000000000 -0400
+--- ./maven2/maven-core-it/it0047/pom.xml.withoutxslt	2006-10-05 14:36:49.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0047/pom.xml	2006-10-05 14:36:52.000000000 -0400
 @@ -1,13 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -4305,23 +4253,23 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0047</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0047</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-container-default</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1009/pom.xml.withoutxslt	2006-09-21 18:47:41.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1009/pom.xml	2006-09-21 18:47:44.000000000 -0400
-@@ -1,16 +1,19 @@
+--- ./maven2/maven-core-it/it1009/pom.xml.withoutxslt	2006-10-05 14:36:52.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1009/pom.xml	2006-10-05 14:36:54.000000000 -0400
+@@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -4339,26 +4287,25 @@
 -    </plugins>
 -  </build>
 -</project>
-+   <artifactId>maven-core-it1009</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it1009</artifactId>
 +   <packaging>coreit-packaging</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +         </plugin>
 +      </plugins>
 +   </build>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0090/pom.xml.withoutxslt	2006-09-21 18:47:44.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0090/pom.xml	2006-09-21 18:47:48.000000000 -0400
+--- ./maven2/maven-core-it/it0090/pom.xml.withoutxslt	2006-10-05 14:36:54.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0090/pom.xml	2006-10-05 14:36:56.000000000 -0400
 @@ -1,48 +1,50 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -4409,9 +4356,9 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</project>
-+   <artifactId>maven-core-it0090</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0090</artifactId>
 +   <pluginRepositories>
 +      <pluginRepository>
 +         <id>snapshots</id>
@@ -4429,9 +4376,9 @@
 +      </resources>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <executions>
 +               <execution>
 +                  <phase>process-resources</phase>
@@ -4448,9 +4395,9 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -4458,8 +4405,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0039/project2/pom.xml.withoutxslt	2006-09-21 \
                18:47:48.000000000 -0400
-+++ ./maven2/maven-core-it/it0039/project2/pom.xml	2006-09-21 18:47:51.000000000 \
-0400 +--- ./maven2/maven-core-it/it0039/project2/pom.xml.withoutxslt	2006-10-05 \
14:36:56.000000000 -0400 ++++ \
./maven2/maven-core-it/it0039/project2/pom.xml	2006-10-05 14:36:59.000000000 -0400  \
@@ -1,16 +1,18 @@  +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -4478,16 +4425,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0039-p2</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0039-p2</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -4495,8 +4442,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0039/project2/release-pom.xml.withoutxslt	2006-09-21 \
                18:47:51.000000000 -0400
-+++ ./maven2/maven-core-it/it0039/project2/release-pom.xml	2006-09-21 \
18:47:55.000000000 -0400 +--- \
./maven2/maven-core-it/it0039/project2/release-pom.xml.withoutxslt	2006-10-05 \
14:36:59.000000000 -0400 ++++ \
./maven2/maven-core-it/it0039/project2/release-pom.xml	2006-10-05 14:37:01.000000000 \
-0400  @@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -4515,16 +4462,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0039-p2</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0039-p2</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -4532,8 +4479,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0039/project/pom.xml.withoutxslt	2006-09-21 \
                18:47:55.000000000 -0400
-+++ ./maven2/maven-core-it/it0039/project/pom.xml	2006-09-21 18:47:58.000000000 \
-0400 +--- ./maven2/maven-core-it/it0039/project/pom.xml.withoutxslt	2006-10-05 \
14:37:01.000000000 -0400 ++++ \
./maven2/maven-core-it/it0039/project/pom.xml	2006-10-05 14:37:04.000000000 -0400  @@ \
-1,16 +1,18 @@  +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -4552,16 +4499,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0039-p1</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0039-p1</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -4569,8 +4516,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0039/project/release-pom.xml.withoutxslt	2006-09-21 \
                18:47:59.000000000 -0400
-+++ ./maven2/maven-core-it/it0039/project/release-pom.xml	2006-09-21 \
18:48:02.000000000 -0400 +--- \
./maven2/maven-core-it/it0039/project/release-pom.xml.withoutxslt	2006-10-05 \
14:37:04.000000000 -0400 ++++ \
./maven2/maven-core-it/it0039/project/release-pom.xml	2006-10-05 14:37:07.000000000 \
-0400  @@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -4589,16 +4536,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0039-p1</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0039-p1</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -4606,8 +4553,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0009/pom.xml.withoutxslt	2006-09-21 18:48:02.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0009/pom.xml	2006-09-21 18:48:06.000000000 -0400
+--- ./maven2/maven-core-it/it0009/pom.xml.withoutxslt	2006-10-05 14:37:07.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0009/pom.xml	2006-10-05 14:37:10.000000000 -0400
 @@ -1,47 +1,49 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -4641,9 +4588,9 @@
 -            <goals>
 -              <goal>touch</goal>
 -            </goals>
-+   <artifactId>maven-core-it0009</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0009</artifactId>
 +   <packaging>jar</packaging>
 +   <pluginRepositories>
 +      <pluginRepository>
@@ -4656,9 +4603,9 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
              <configuration>
 -              <goalItem>goalItem</goalItem>
 +               <pluginItem>pluginItem</pluginItem>
@@ -4693,9 +4640,9 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -4703,8 +4650,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0000/pom.xml.withoutxslt	2006-09-21 18:48:06.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0000/pom.xml	2006-09-21 18:48:09.000000000 -0400
+--- ./maven2/maven-core-it/it0000/pom.xml.withoutxslt	2006-10-05 14:37:10.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0000/pom.xml	2006-10-05 14:37:13.000000000 -0400
 @@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -4723,16 +4670,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0000</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0000</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -4740,26 +4687,25 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1001/pom.xml.withoutxslt	2006-09-21 18:48:09.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1001/pom.xml	2006-09-21 18:48:13.000000000 -0400
-@@ -1,6 +1,9 @@
+--- ./maven2/maven-core-it/it1001/pom.xml.withoutxslt	2006-10-05 14:37:13.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1001/pom.xml	2006-10-05 14:37:15.000000000 -0400
+@@ -1,6 +1,8 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
 -  <artifactId>maven-core-it1001</artifactId>
 -  <packaging>jar</packaging>
 -  <version>1.0</version>
-+   <artifactId>maven-core-it1001</artifactId>
 +   <version>1.0</version>
++   <artifactId>maven-core-it1001</artifactId>
 +   <packaging>jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0017/pom.xml.withoutxslt	2006-09-21 18:48:13.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0017/pom.xml	2006-09-21 18:48:16.000000000 -0400
-@@ -1,19 +1,22 @@
+--- ./maven2/maven-core-it/it0017/pom.xml.withoutxslt	2006-10-05 14:37:15.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0017/pom.xml	2006-10-05 14:37:18.000000000 -0400
+@@ -1,19 +1,21 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -4780,18 +4726,17 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0017</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0017</artifactId>
 +   <packaging>ejb</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.1-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-ejb-plugin</artifactId>
-+            <version>2.1-SNAPSHOT</version>
 +            <configuration>
 +               <generateClient>true</generateClient>
 +            </configuration>
@@ -4801,8 +4746,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0010/pom.xml.withoutxslt	2006-09-21 18:48:16.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0010/pom.xml	2006-09-21 18:48:20.000000000 -0400
+--- ./maven2/maven-core-it/it0010/pom.xml.withoutxslt	2006-10-05 14:37:18.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0010/pom.xml	2006-10-05 14:37:21.000000000 -0400
 @@ -1,23 +1,25 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -4828,23 +4773,23 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0010</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0010</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +         <type>jar</type>
 +         <scope>compile</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -4852,8 +4797,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0011/pom.xml.withoutxslt	2006-09-21 18:48:20.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0011/pom.xml	2006-09-21 18:48:24.000000000 -0400
+--- ./maven2/maven-core-it/it0011/pom.xml.withoutxslt	2006-10-05 14:37:21.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0011/pom.xml	2006-10-05 14:37:24.000000000 -0400
 @@ -1,39 +1,42 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -4878,9 +4823,9 @@
 -  </dependencies>
 -  <dependencyManagement>
 -    <dependencies>
-+   <artifactId>maven-core-it0011</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0011</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
@@ -4890,9 +4835,9 @@
 -        <version>2.0-beta-1</version>
 -        <type>jar</type>
 -        <scope>compile</scope>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +         <type>jar</type>
 +         <scope>compile</scope>
        </dependency>
@@ -4902,9 +4847,9 @@
 -        <version>3.8.1</version>
 -        <type>jar</type>
 -        <scope>test</scope>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>compile</scope>
        </dependency>
@@ -4915,16 +4860,16 @@
 +   <dependencyManagement>
 +      <dependencies>
 +         <dependency>
-+            <groupId>JPP/maven2</groupId>
-+            <artifactId>plugin-api</artifactId>
 +            <version>2.0.4</version>
++            <groupId>org.apache.maven</groupId>
++            <artifactId>maven-plugin-api</artifactId>
 +            <type>jar</type>
 +            <scope>compile</scope>
 +         </dependency>
 +         <dependency>
-+            <groupId>JPP</groupId>
-+            <artifactId>junit</artifactId>
 +            <version>3.8.1</version>
++            <groupId>junit</groupId>
++            <artifactId>junit</artifactId>
 +            <type>jar</type>
 +            <scope>test</scope>
 +         </dependency>
@@ -4932,9 +4877,9 @@
 +   </dependencyManagement>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0050/pom.xml.withoutxslt	2006-09-21 18:48:24.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0050/pom.xml	2006-09-21 18:48:27.000000000 -0400
-@@ -1,32 +1,34 @@
+--- ./maven2/maven-core-it/it0050/pom.xml.withoutxslt	2006-10-05 14:37:24.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0050/pom.xml	2006-10-05 14:37:27.000000000 -0400
+@@ -1,32 +1,33 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -4968,16 +4913,15 @@
 -    </plugins>
 -  </build>
 -</project>
-+   <artifactId>maven-it0050</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-it0050</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-surefire-plugin</artifactId>
 +            <version>2.1.4-SNAPSHOT</version>
++            <artifactId>maven-surefire-plugin</artifactId>
 +            <configuration>
 +               <excludes>
 +                  <exclude \
implementation="java.lang.String">DontRunTest.*</exclude> @@ -4992,17 +4936,17 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <artifactId>junit</artifactId>
++         <groupId>junit</groupId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0041/pom.xml.withoutxslt	2006-09-21 18:48:27.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0041/pom.xml	2006-09-21 18:48:31.000000000 -0400
+--- ./maven2/maven-core-it/it0041/pom.xml.withoutxslt	2006-10-05 14:37:27.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0041/pom.xml	2006-10-05 14:37:29.000000000 -0400
 @@ -1,31 +1,33 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -5036,9 +4980,9 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</project>
-+   <artifactId>maven-core-it0041</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0041</artifactId>
 +   <pluginRepositories>
 +      <pluginRepository>
 +         <id>snapshots</id>
@@ -5050,9 +4994,9 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <extensions>true</extensions>
 +         </plugin>
 +      </plugins>
@@ -5068,9 +5012,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0042/pom.xml.withoutxslt	2006-09-21 18:48:31.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0042/pom.xml	2006-09-21 18:48:35.000000000 -0400
-@@ -1,15 +1,17 @@
+--- ./maven2/maven-core-it/it0042/pom.xml.withoutxslt	2006-10-05 14:37:29.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0042/pom.xml	2006-10-05 14:37:31.000000000 -0400
+@@ -1,15 +1,16 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -5087,9 +5031,9 @@
 -    <module>test-plugin</module>
 -  </modules>
 -</project>
-+   <artifactId>test-components</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
++   <groupId>test</groupId>
++   <artifactId>test-components</artifactId>
 +   <name>Test Components</name>
 +   <packaging>pom</packaging>
 +   <modules>
@@ -5098,13 +5042,12 @@
 +      <module>test-component-a</module>
 +      <module>test-plugin</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0042/test-component-b/pom.xml.withoutxslt	2006-09-21 \
                18:48:35.000000000 -0400
-+++ ./maven2/maven-core-it/it0042/test-component-b/pom.xml	2006-09-21 \
18:48:38.000000000 -0400 +--- \
./maven2/maven-core-it/it0042/test-component-b/pom.xml.withoutxslt	2006-10-05 \
14:37:31.000000000 -0400 ++++ \
./maven2/maven-core-it/it0042/test-component-b/pom.xml	2006-10-05 14:37:35.000000000 \
-0400  @@ -1,22 +1,22 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -5129,14 +5072,14 @@
 -		</dependency>
 -	</dependencies>
 -</project>
-+   <artifactId>test-component-b</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-component-b</artifactId>
 +   <name>Test Component B</name>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
@@ -5150,9 +5093,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0042/test-component-a/pom.xml.withoutxslt	2006-09-21 \
                18:48:38.000000000 -0400
-+++ ./maven2/maven-core-it/it0042/test-component-a/pom.xml	2006-09-21 \
                18:48:42.000000000 -0400
-@@ -1,14 +1,16 @@
+--- ./maven2/maven-core-it/it0042/test-component-a/pom.xml.withoutxslt	2006-10-05 \
14:37:35.000000000 -0400 ++++ \
./maven2/maven-core-it/it0042/test-component-a/pom.xml	2006-10-05 14:37:38.000000000 \
-0400 +@@ -1,14 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -5168,23 +5111,22 @@
 -  <name>Test Component A</name>
 -  <packaging>jar</packaging>
 -</project>
-+   <artifactId>test-component-a</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-component-a</artifactId>
 +   <name>Test Component A</name>
 +   <packaging>jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0042/test-component-c/pom.xml.withoutxslt	2006-09-21 \
                18:48:42.000000000 -0400
-+++ ./maven2/maven-core-it/it0042/test-component-c/pom.xml	2006-09-21 \
18:48:45.000000000 -0400 +--- \
./maven2/maven-core-it/it0042/test-component-c/pom.xml.withoutxslt	2006-10-05 \
14:37:38.000000000 -0400 ++++ \
./maven2/maven-core-it/it0042/test-component-c/pom.xml	2006-10-05 14:37:41.000000000 \
-0400  @@ -1,42 +1,41 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -5229,14 +5171,14 @@
 -    </plugins>
 -  </build>
 -</project>
-+   <artifactId>test-component-c</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-component-c</artifactId>
 +   <name>Test Component C</name>
 +   <packaging>war</packaging>
 +   <modelVersion>4.0.0</modelVersion>
@@ -5269,8 +5211,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0042/test-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:48:45.000000000 -0400
-+++ ./maven2/maven-core-it/it0042/test-plugin/pom.xml	2006-09-21 18:48:49.000000000 \
-0400 +--- ./maven2/maven-core-it/it0042/test-plugin/pom.xml.withoutxslt	2006-10-05 \
14:37:41.000000000 -0400 ++++ \
./maven2/maven-core-it/it0042/test-plugin/pom.xml	2006-10-05 14:37:44.000000000 -0400 \
@@ -1,21 +1,22 @@  +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -5294,30 +5236,30 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <artifactId>test-plugin</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Test Plugin</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0068/pom.xml.withoutxslt	2006-09-21 18:48:49.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0068/pom.xml	2006-09-21 18:48:52.000000000 -0400
-@@ -1,36 +1,39 @@
+--- ./maven2/maven-core-it/it0068/pom.xml.withoutxslt	2006-10-05 14:37:44.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0068/pom.xml	2006-10-05 14:37:46.000000000 -0400
+@@ -1,36 +1,38 @@
 -<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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -5356,9 +5298,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0068</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it</groupId>  \
+   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it</groupId> \
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0068</artifactId>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven it0068</name>  +   \
<pluginRepositories xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      <pluginRepository>
@@ -5367,14 +5309,13 @@
 +         <url>http://snapshots.maven.codehaus.org/maven2</url>
 +      </pluginRepository>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
 +            <version>1.0-alpha-8</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.modello</groupId> \
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">modello-maven-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <goals>
@@ -5394,9 +5335,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0022/pom.xml.withoutxslt	2006-09-21 18:48:52.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0022/pom.xml	2006-09-21 18:48:56.000000000 -0400
-@@ -1,31 +1,28 @@
+--- ./maven2/maven-core-it/it0022/pom.xml.withoutxslt	2006-10-05 14:37:46.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0022/pom.xml	2006-10-05 14:37:49.000000000 -0400
+@@ -1,31 +1,27 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -5429,9 +5370,9 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</model>
-+   <artifactId>maven-it0022</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-it0022</artifactId>
 +   <pluginRepositories>
 +      <pluginRepository>
 +         <id>snapshots</id>
@@ -5439,14 +5380,13 @@
 +         <url>http://snapshots.maven.codehaus.org/maven2</url>
 +      </pluginRepository>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <configuration>
 +               <pluginItem>${test}</pluginItem>
 +            </configuration>
@@ -5456,8 +5396,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0034/pom.xml.withoutxslt	2006-09-21 18:48:56.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0034/pom.xml	2006-09-21 18:49:00.000000000 -0400
+--- ./maven2/maven-core-it/it0034/pom.xml.withoutxslt	2006-10-05 14:37:49.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0034/pom.xml	2006-10-05 14:37:51.000000000 -0400
 @@ -1,20 +1,21 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -5480,15 +5420,15 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0034</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0034</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +      <dependency>
@@ -5500,9 +5440,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0084/pom.xml.withoutxslt	2006-09-21 18:49:00.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0084/pom.xml	2006-09-21 18:49:03.000000000 -0400
-@@ -1,14 +1,16 @@
+--- ./maven2/maven-core-it/it0084/pom.xml.withoutxslt	2006-10-05 14:37:51.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0084/pom.xml	2006-10-05 14:37:54.000000000 -0400
+@@ -1,14 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -5518,9 +5458,9 @@
 -    <module>test-component-a</module>
 -  </modules>
 -</project>
-+   <artifactId>test-components</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
++   <groupId>test</groupId>
++   <artifactId>test-components</artifactId>
 +   <name>Test Components</name>
 +   <packaging>pom</packaging>
 +   <modules>
@@ -5528,13 +5468,12 @@
 +      <module>test-component-b</module>
 +      <module>test-component-a</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0084/test-component-b/pom.xml.withoutxslt	2006-09-21 \
                18:49:03.000000000 -0400
-+++ ./maven2/maven-core-it/it0084/test-component-b/pom.xml	2006-09-21 \
18:49:07.000000000 -0400 +--- \
./maven2/maven-core-it/it0084/test-component-b/pom.xml.withoutxslt	2006-10-05 \
14:37:54.000000000 -0400 ++++ \
./maven2/maven-core-it/it0084/test-component-b/pom.xml	2006-10-05 14:37:56.000000000 \
-0400  @@ -1,22 +1,22 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -5559,14 +5498,14 @@
 -		</dependency>
 -	</dependencies>
 -</project>
-+   <artifactId>test-component-b</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-component-b</artifactId>
 +   <name>Test Component B</name>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
@@ -5580,8 +5519,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0084/test-component-a/pom.xml.withoutxslt	2006-09-21 \
                18:49:07.000000000 -0400
-+++ ./maven2/maven-core-it/it0084/test-component-a/pom.xml	2006-09-21 \
18:49:10.000000000 -0400 +--- \
./maven2/maven-core-it/it0084/test-component-a/pom.xml.withoutxslt	2006-10-05 \
14:37:56.000000000 -0400 ++++ \
./maven2/maven-core-it/it0084/test-component-a/pom.xml	2006-10-05 14:37:59.000000000 \
-0400  @@ -1,21 +1,22 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -5605,14 +5544,14 @@
 -		</dependency>
 -	</dependencies>
 -</project>
-+   <artifactId>test-component-a</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-component-a</artifactId>
 +   <name>Test Component A</name>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
@@ -5626,8 +5565,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0084/test-component-c/pom.xml.withoutxslt	2006-09-21 \
                18:49:10.000000000 -0400
-+++ ./maven2/maven-core-it/it0084/test-component-c/pom.xml	2006-09-21 \
18:49:14.000000000 -0400 +--- \
./maven2/maven-core-it/it0084/test-component-c/pom.xml.withoutxslt	2006-10-05 \
14:37:59.000000000 -0400 ++++ \
./maven2/maven-core-it/it0084/test-component-c/pom.xml	2006-10-05 14:38:01.000000000 \
-0400  @@ -1,33 +1,32 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -5663,14 +5602,14 @@
 -	</dependencies>
 -
 -</project>
-+   <artifactId>test-component-c</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-component-c</artifactId>
 +   <name>Test Component C</name>
 +   <packaging>war</packaging>
 +   <modelVersion>4.0.0</modelVersion>
@@ -5694,9 +5633,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0025/pom.xml.withoutxslt	2006-09-21 18:49:14.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0025/pom.xml	2006-09-21 18:49:18.000000000 -0400
-@@ -1,46 +1,45 @@
+--- ./maven2/maven-core-it/it0025/pom.xml.withoutxslt	2006-10-05 14:38:01.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0025/pom.xml	2006-10-05 14:38:04.000000000 -0400
+@@ -1,46 +1,44 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -5744,9 +5683,9 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</model>
-+   <artifactId>maven-it0025</artifactId>
-+   <groupId>org.apache.maven.</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.</groupId>
++   <artifactId>maven-it0025</artifactId>
 +   <pluginRepositories>
 +      <pluginRepository>
 +         <id>snapshots</id>
@@ -5754,14 +5693,13 @@
 +         <url>http://snapshots.maven.codehaus.org/maven2</url>
 +      </pluginRepository>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <executions>
 +               <execution>
 +                  <id>test1</id>
@@ -5788,9 +5726,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0049/pom.xml.withoutxslt	2006-09-21 18:49:18.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0049/pom.xml	2006-09-21 18:49:21.000000000 -0400
-@@ -1,28 +1,28 @@
+--- ./maven2/maven-core-it/it0049/pom.xml.withoutxslt	2006-10-05 14:38:04.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0049/pom.xml	2006-10-05 14:38:06.000000000 -0400
+@@ -1,28 +1,27 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -5820,9 +5758,9 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</project>
-+   <artifactId>maven-it0049</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-it0049</artifactId>
 +   <pluginRepositories>
 +      <pluginRepository>
 +         <id>snapshots</id>
@@ -5830,14 +5768,13 @@
 +         <url>http://snapshots.maven.codehaus.org/maven2</url>
 +      </pluginRepository>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <configuration>
 +               <pluginFile>touchFile.txt</pluginFile>
 +            </configuration>
@@ -5847,9 +5784,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0073/pom.xml.withoutxslt	2006-09-21 18:49:21.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0073/pom.xml	2006-09-21 18:49:24.000000000 -0400
-@@ -1,30 +1,30 @@
+--- ./maven2/maven-core-it/it0073/pom.xml.withoutxslt	2006-10-05 14:38:07.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0073/pom.xml	2006-10-05 14:38:09.000000000 -0400
+@@ -1,30 +1,29 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -5881,9 +5818,9 @@
 -    </plugins>
 -  </build>
 -</project>
-+   <artifactId>maven-core-it0073</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0073</artifactId>
 +   <pluginRepositories>
 +      <pluginRepository>
 +         <id>snapshots</id>
@@ -5893,14 +5830,13 @@
 +         </releases>
 +      </pluginRepository>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <configuration>
 +               <value>thrown-value</value>
 +            </configuration>
@@ -5910,8 +5846,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0051/pom.xml.withoutxslt	2006-09-21 18:49:25.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0051/pom.xml	2006-09-21 18:49:27.000000000 -0400
+--- ./maven2/maven-core-it/it0051/pom.xml.withoutxslt	2006-10-05 14:38:09.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0051/pom.xml	2006-10-05 14:38:11.000000000 -0400
 @@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -5930,16 +5866,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0051</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0051</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -5947,9 +5883,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0006/pom.xml.withoutxslt	2006-09-21 18:49:27.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0006/pom.xml	2006-09-21 18:49:29.000000000 -0400
-@@ -1,21 +1,26 @@
+--- ./maven2/maven-core-it/it0006/pom.xml.withoutxslt	2006-10-05 14:38:11.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0006/pom.xml	2006-10-05 14:38:14.000000000 -0400
+@@ -1,21 +1,24 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -5972,18 +5908,16 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-verifier-plugin-test</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-alpha-2-SNAPSHOT</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-verifier-plugin-test</artifactId>
 +   <name>Maven Verifier Plugin Test</name>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-verifier-plugin</artifactId>
 +            <version>1.0-beta-2-SNAPSHOT</version>
++            <artifactId>maven-verifier-plugin</artifactId>
 +            <executions>
 +               <execution>
 +                  <goals>
@@ -5997,8 +5931,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it2001/b/pom.xml.withoutxslt	2006-09-21 \
                18:49:29.000000000 -0400
-+++ ./maven2/maven-core-it/it2001/b/pom.xml	2006-09-21 18:49:32.000000000 -0400
+--- ./maven2/maven-core-it/it2001/b/pom.xml.withoutxslt	2006-10-05 \
14:38:14.000000000 -0400 ++++ ./maven2/maven-core-it/it2001/b/pom.xml	2006-10-05 \
14:38:16.000000000 -0400  @@ -1,15 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -6016,9 +5950,9 @@
 -  </dependencies>
 -
 -</project>
-+   <artifactId>it2001-b</artifactId>
-+   <groupId>org.apache.maven.it2001</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it2001</groupId>
++   <artifactId>it2001-b</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
@@ -6030,8 +5964,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it2001/a/pom.xml.withoutxslt	2006-09-21 \
                18:49:32.000000000 -0400
-+++ ./maven2/maven-core-it/it2001/a/pom.xml	2006-09-21 18:49:34.000000000 -0400
+--- ./maven2/maven-core-it/it2001/a/pom.xml.withoutxslt	2006-10-05 \
14:38:16.000000000 -0400 ++++ ./maven2/maven-core-it/it2001/a/pom.xml	2006-10-05 \
14:38:19.000000000 -0400  @@ -1,21 +1,21 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -6055,9 +5989,9 @@
 -    </repository>
 -  </repositories>
 -</project>
-+   <artifactId>it2001-a</artifactId>
-+   <groupId>org.apache.maven.it2001</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it2001</groupId>
++   <artifactId>it2001-a</artifactId>
 +   <repositories>
 +      <repository>
 +         <id>test</id>
@@ -6075,9 +6009,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it2001/c/pom.xml.withoutxslt	2006-09-21 \
                18:49:34.000000000 -0400
-+++ ./maven2/maven-core-it/it2001/c/pom.xml	2006-09-21 18:49:37.000000000 -0400
-@@ -1,13 +1,15 @@
+--- ./maven2/maven-core-it/it2001/c/pom.xml.withoutxslt	2006-10-05 \
14:38:19.000000000 -0400 ++++ ./maven2/maven-core-it/it2001/c/pom.xml	2006-10-05 \
14:38:21.000000000 -0400 +@@ -1,13 +1,14 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -6092,22 +6026,21 @@
 -    </repository>
 -  </distributionManagement>
 -</project>
-+   <artifactId>it2001-c</artifactId>
-+   <groupId>org.apache.maven.it2001</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it2001</groupId>
++   <artifactId>it2001-c</artifactId>
 +   <distributionManagement>
 +      <repository>
 +         <id>test</id>
 +         <url>file:../target/test-repo</url>
 +      </repository>
 +   </distributionManagement>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0003/pom.xml.withoutxslt	2006-09-21 18:49:37.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0003/pom.xml	2006-09-21 18:49:39.000000000 -0400
+--- ./maven2/maven-core-it/it0003/pom.xml.withoutxslt	2006-10-05 14:38:21.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0003/pom.xml	2006-10-05 14:38:23.000000000 -0400
 @@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -6126,16 +6059,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0003</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0003</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -6143,8 +6076,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1005/pom.xml.withoutxslt	2006-09-21 18:49:39.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1005/pom.xml	2006-09-21 18:49:42.000000000 -0400
+--- ./maven2/maven-core-it/it1005/pom.xml.withoutxslt	2006-10-05 14:38:23.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1005/pom.xml	2006-10-05 14:38:26.000000000 -0400
 @@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -6163,16 +6096,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-it1005-plugin</artifactId>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <version>2.0.4-JPP</version>
++   <groupId>org.apache.maven.plugins</groupId>
++   <artifactId>maven-it1005-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +         <type>jar</type>
 +         <scope>compile</scope>
 +      </dependency>
@@ -6180,8 +6113,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1015/pom.xml.withoutxslt	2006-09-21 18:49:42.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1015/pom.xml	2006-09-21 18:49:45.000000000 -0400
+--- ./maven2/maven-core-it/it1015/pom.xml.withoutxslt	2006-10-05 14:38:26.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1015/pom.xml	2006-10-05 14:38:28.000000000 -0400
 @@ -1,23 +1,25 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -6207,9 +6140,9 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</project>
-+   <artifactId>maven-core-it1015</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>${version}</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it1015</artifactId>
 +   <packaging>jar</packaging>
 +   <pluginRepositories>
 +      <pluginRepository>
@@ -6221,9 +6154,9 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -6231,8 +6164,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0002/pom.xml.withoutxslt	2006-09-21 18:49:45.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0002/pom.xml	2006-09-21 18:49:47.000000000 -0400
+--- ./maven2/maven-core-it/it0002/pom.xml.withoutxslt	2006-10-05 14:38:28.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0002/pom.xml	2006-10-05 14:38:31.000000000 -0400
 @@ -1,23 +1,25 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -6258,16 +6191,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0002</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0002</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -6282,9 +6215,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0070/pom.xml.withoutxslt	2006-09-21 18:49:47.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0070/pom.xml	2006-09-21 18:49:50.000000000 -0400
-@@ -1,20 +1,23 @@
+--- ./maven2/maven-core-it/it0070/pom.xml.withoutxslt	2006-10-05 14:38:31.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0070/pom.xml	2006-10-05 14:38:33.000000000 -0400
+@@ -1,20 +1,22 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -6306,18 +6239,17 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0070</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0070</artifactId>
 +   <packaging>rar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.2-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-rar-plugin</artifactId>
-+            <version>2.2-SNAPSHOT</version>
 +            <configuration>
 +               <includeJar>false</includeJar>
 +               <raXmlFile>src/main/custom/ra.xml</raXmlFile>
@@ -6328,8 +6260,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0048/pom.xml.withoutxslt	2006-09-21 18:49:50.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0048/pom.xml	2006-09-21 18:49:52.000000000 -0400
+--- ./maven2/maven-core-it/it0048/pom.xml.withoutxslt	2006-10-05 14:38:33.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0048/pom.xml	2006-10-05 14:38:35.000000000 -0400
 @@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -6348,16 +6280,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0048</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0048</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -6365,8 +6297,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1010/pom.xml.withoutxslt	2006-09-21 18:49:52.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1010/pom.xml	2006-09-21 18:49:55.000000000 -0400
+--- ./maven2/maven-core-it/it1010/pom.xml.withoutxslt	2006-10-05 14:38:35.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1010/pom.xml	2006-10-05 14:38:38.000000000 -0400
 @@ -1,23 +1,25 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -6392,16 +6324,16 @@
 -    </plugins>
 -  </build>
 -</project>
-+   <artifactId>maven-core-it1010</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it1010</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +         </plugin>
 +      </plugins>
 +   </build>
@@ -6416,8 +6348,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1017/pom.xml.withoutxslt	2006-09-21 18:49:55.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1017/pom.xml	2006-09-21 18:49:57.000000000 -0400
+--- ./maven2/maven-core-it/it1017/pom.xml.withoutxslt	2006-10-05 14:38:38.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1017/pom.xml	2006-10-05 14:38:40.000000000 -0400
 @@ -1,14 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -6434,9 +6366,9 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <artifactId>maven-core-it1016</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it1016</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
@@ -6448,9 +6380,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0027/pom.xml.withoutxslt	2006-09-21 18:49:57.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0027/pom.xml	2006-09-21 18:50:00.000000000 -0400
-@@ -1,23 +1,26 @@
+--- ./maven2/maven-core-it/it0027/pom.xml.withoutxslt	2006-10-05 14:38:40.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0027/pom.xml	2006-10-05 14:38:43.000000000 -0400
+@@ -1,23 +1,25 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -6475,9 +6407,9 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</model>
-+   <artifactId>maven-core-it0027</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0027</artifactId>
 +   <packaging>jar</packaging>
 +   <pluginRepositories>
 +      <pluginRepository>
@@ -6486,22 +6418,21 @@
 +         <url>http://snapshots.maven.codehaus.org/maven2</url>
 +      </pluginRepository>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +         </plugin>
 +      </plugins>
 +   </build>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0001/pom.xml.withoutxslt	2006-09-21 18:50:00.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0001/pom.xml	2006-09-21 18:50:02.000000000 -0400
+--- ./maven2/maven-core-it/it0001/pom.xml.withoutxslt	2006-10-05 14:38:43.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0001/pom.xml	2006-10-05 14:38:46.000000000 -0400
 @@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -6520,16 +6451,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0001</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0001</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -6537,9 +6468,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0096/pom.xml.withoutxslt	2006-09-21 18:50:05.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0096/pom.xml	2006-09-21 18:50:07.000000000 -0400
-@@ -1,12 +1,14 @@
+--- ./maven2/maven-core-it/it0096/pom.xml.withoutxslt	2006-10-05 14:38:48.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0096/pom.xml	2006-10-05 14:38:50.000000000 -0400
+@@ -1,12 +1,13 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -6553,21 +6484,20 @@
 -    <module>project</module>
 -  </modules>
 -</project>
-+   <artifactId>maven-it0096-root</artifactId>
-+   <groupId>org.apache.maven.it0096</groupId>
 +   <version>1</version>
++   <groupId>org.apache.maven.it0096</groupId>
++   <artifactId>maven-it0096-root</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>plugin</module>
 +      <module>project</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0096/plugin/pom.xml.withoutxslt	2006-09-21 \
                18:50:02.000000000 -0400
-+++ ./maven2/maven-core-it/it0096/plugin/pom.xml	2006-09-21 18:50:05.000000000 -0400
+--- ./maven2/maven-core-it/it0096/plugin/pom.xml.withoutxslt	2006-10-05 \
14:38:46.000000000 -0400 ++++ ./maven2/maven-core-it/it0096/plugin/pom.xml	2006-10-05 \
14:38:48.000000000 -0400  @@ -1,19 +1,19 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -6589,27 +6519,27 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <artifactId>maven-it0096-plugin</artifactId>
 +   <parent>
 +      <groupId>org.apache.maven.it0096</groupId>
 +      <artifactId>maven-it0096-root</artifactId>
 +      <version>1</version>
 +   </parent>
++   <artifactId>maven-it0096-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0096/project/pom.xml.withoutxslt	2006-09-21 \
                18:50:07.000000000 -0400
-+++ ./maven2/maven-core-it/it0096/project/pom.xml	2006-09-21 18:50:10.000000000 \
                -0400
-@@ -1,32 +1,34 @@
+--- ./maven2/maven-core-it/it0096/project/pom.xml.withoutxslt	2006-10-05 \
14:38:50.000000000 -0400 ++++ \
./maven2/maven-core-it/it0096/project/pom.xml	2006-10-05 14:38:53.000000000 -0400 +@@ \
                -1,32 +1,33 @@
 -<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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -6644,17 +6574,16 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0096-project-level1</artifactId>
  +   <parent>
 +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0096</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0096-root</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1</version>  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0096-project-level1</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <modules \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>project-level2</module>  +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
@@ -6677,9 +6606,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0096/project/project-level2/project-level3/pom.xml.withoutxslt	2006-09-21 \
                18:50:10.000000000 -0400
-+++ ./maven2/maven-core-it/it0096/project/project-level2/project-level3/pom.xml	2006-09-21 \
                18:50:12.000000000 -0400
-@@ -1,16 +1,16 @@
+--- ./maven2/maven-core-it/it0096/project/project-level2/project-level3/pom.xml.withoutxslt	2006-10-05 \
14:38:53.000000000 -0400 ++++ \
./maven2/maven-core-it/it0096/project/project-level2/project-level3/pom.xml	2006-10-05 \
14:38:55.000000000 -0400 +@@ -1,16 +1,15 @@
 -<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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -6698,23 +6627,22 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0096-project-level3</artifactId>
  +   <parent>
 +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0096</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0096-project-level2</artifactId>
  +      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1</version>  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0096-project-level3</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <modules \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>project-jar</module>  +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0096/project/project-level2/project-level3/project-jar/pom.xml.withoutxslt	2006-09-21 \
                18:50:12.000000000 -0400
-+++ ./maven2/maven-core-it/it0096/project/project-level2/project-level3/project-jar/pom.xml	2006-09-21 \
18:50:15.000000000 -0400 +--- \
./maven2/maven-core-it/it0096/project/project-level2/project-level3/project-jar/pom.xml.withoutxslt	2006-10-05 \
14:38:55.000000000 -0400 ++++ \
./maven2/maven-core-it/it0096/project/project-level2/project-level3/project-jar/pom.xml	2006-10-05 \
14:38:58.000000000 -0400  @@ -1,34 +1,35 @@
 -<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"> @@ -6752,19 +6680,19 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0096-project-jar</artifactId>
  +   <parent>
 +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0096</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0096-project-level3</artifactId>
  +      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1</version>  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0096-project-jar</artifactId>
  +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-jar-plugin</artifactId>
 +            <version>2.1-SNAPSHOT</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-jar-plugin</artifactId>  \
+            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <goals>
@@ -6777,18 +6705,18 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0096/project/project-level2/pom.xml.withoutxslt	2006-09-21 \
                18:50:15.000000000 -0400
-+++ ./maven2/maven-core-it/it0096/project/project-level2/pom.xml	2006-09-21 \
                18:50:17.000000000 -0400
-@@ -1,16 +1,16 @@
+--- ./maven2/maven-core-it/it0096/project/project-level2/pom.xml.withoutxslt	2006-10-05 \
14:38:58.000000000 -0400 ++++ \
./maven2/maven-core-it/it0096/project/project-level2/pom.xml	2006-10-05 \
14:39:00.000000000 -0400 +@@ -1,16 +1,15 @@
 -<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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -6807,23 +6735,22 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0096-project-level2</artifactId>
  +   <parent>
 +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0096</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0096-project-level1</artifactId>
  +      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1</version>  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-it0096-project-level2</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <modules \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>project-level3</module>  +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0036/pom.xml.withoutxslt	2006-09-21 18:50:17.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0036/pom.xml	2006-09-21 18:50:20.000000000 -0400
+--- ./maven2/maven-core-it/it0036/pom.xml.withoutxslt	2006-10-05 14:39:00.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0036/pom.xml	2006-10-05 14:39:03.000000000 -0400
 @@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -6842,16 +6769,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0036</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0036</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -6859,8 +6786,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0036/release-pom.xml.withoutxslt	2006-09-21 \
                18:50:20.000000000 -0400
-+++ ./maven2/maven-core-it/it0036/release-pom.xml	2006-09-21 18:50:22.000000000 \
-0400 +--- ./maven2/maven-core-it/it0036/release-pom.xml.withoutxslt	2006-10-05 \
14:39:03.000000000 -0400 ++++ \
./maven2/maven-core-it/it0036/release-pom.xml	2006-10-05 14:39:06.000000000 -0400  @@ \
-1,16 +1,18 @@  +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -6879,16 +6806,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0036</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0036</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -6896,8 +6823,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0018/pom.xml.withoutxslt	2006-09-21 18:50:22.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0018/pom.xml	2006-09-21 18:50:25.000000000 -0400
+--- ./maven2/maven-core-it/it0018/pom.xml.withoutxslt	2006-10-05 14:39:06.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0018/pom.xml	2006-10-05 14:39:09.000000000 -0400
 @@ -1,27 +1,27 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -6927,9 +6854,9 @@
 -  </dependencies>
 -
 -</model>
-+   <artifactId>maven-core-it0018</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0018</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
@@ -6944,17 +6871,17 @@
 +         </exclusions>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1004/pom.xml.withoutxslt	2006-09-21 18:50:25.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1004/pom.xml	2006-09-21 18:50:28.000000000 -0400
+--- ./maven2/maven-core-it/it1004/pom.xml.withoutxslt	2006-10-05 14:39:09.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1004/pom.xml	2006-10-05 14:39:12.000000000 -0400
 @@ -1,21 +1,22 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -6978,9 +6905,9 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0018</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0018</artifactId>
 +   <distributionManagement>
 +      <repository>
 +         <id>repo1</id>
@@ -6991,17 +6918,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>ssh</artifactId>
 +         <version>1.0-alpha-6</version>
++         <groupId>org.apache.maven.wagon</groupId>
++         <artifactId>wagon-ssh</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0031/pom.xml.withoutxslt	2006-09-21 18:50:28.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0031/pom.xml	2006-09-21 18:50:30.000000000 -0400
-@@ -1,31 +1,28 @@
+--- ./maven2/maven-core-it/it0031/pom.xml.withoutxslt	2006-10-05 14:39:12.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0031/pom.xml	2006-10-05 14:39:14.000000000 -0400
+@@ -1,31 +1,27 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -7034,9 +6961,9 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</model>
-+   <artifactId>maven-it0031</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-it0031</artifactId>
 +   <pluginRepositories>
 +      <pluginRepository>
 +         <id>snapshots</id>
@@ -7044,14 +6971,13 @@
 +         <url>http://snapshots.maven.codehaus.org/maven2</url>
 +      </pluginRepository>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <configuration>
 +               <pluginItem>${test}</pluginItem>
 +            </configuration>
@@ -7061,9 +6987,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0012/pom.xml.withoutxslt	2006-09-21 18:50:30.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0012/pom.xml	2006-09-21 18:50:33.000000000 -0400
-@@ -1,28 +1,32 @@
+--- ./maven2/maven-core-it/it0012/pom.xml.withoutxslt	2006-10-05 14:39:14.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0012/pom.xml	2006-10-05 14:39:17.000000000 -0400
+@@ -1,28 +1,30 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -7093,9 +7019,9 @@
 -    <module>child-project</module>
 -  </modules>
 -</model>
-+   <artifactId>maven-core-it0012</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>3.8.1</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0012</artifactId>
 +   <packaging>pom</packaging>
 +   <pluginRepositories>
 +      <pluginRepository>
@@ -7107,14 +7033,12 @@
 +   <modules>
 +      <module>child-project</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <configuration>
 +               <pluginFile>touch-${version}.txt</pluginFile>
 +            </configuration>
@@ -7124,9 +7048,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0012/child-project/pom.xml.withoutxslt	2006-09-21 \
                18:50:33.000000000 -0400
-+++ ./maven2/maven-core-it/it0012/child-project/pom.xml	2006-09-21 \
                18:50:35.000000000 -0400
-@@ -1,19 +1,23 @@
+--- ./maven2/maven-core-it/it0012/child-project/pom.xml.withoutxslt	2006-10-05 \
14:39:17.000000000 -0400 ++++ \
./maven2/maven-core-it/it0012/child-project/pom.xml	2006-10-05 14:39:19.000000000 \
-0400 +@@ -1,19 +1,21 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -7147,18 +7071,16 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0012-child-project</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>3.0.3</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0012-child-project</artifactId>
 +   <packaging>jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <configuration>
 +               <outputDirectory>${basedir}/target/</outputDirectory>
 +               <pluginFile>child-touch-${version}.txt</pluginFile>
@@ -7169,9 +7091,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0023/pom.xml.withoutxslt	2006-09-21 18:50:35.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0023/pom.xml	2006-09-21 18:50:38.000000000 -0400
-@@ -1,31 +1,28 @@
+--- ./maven2/maven-core-it/it0023/pom.xml.withoutxslt	2006-10-05 14:39:19.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0023/pom.xml	2006-10-05 14:39:22.000000000 -0400
+@@ -1,31 +1,27 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -7204,9 +7126,9 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</model>
-+   <artifactId>maven-it0023</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-it0023</artifactId>
 +   <pluginRepositories>
 +      <pluginRepository>
 +         <id>snapshots</id>
@@ -7214,14 +7136,13 @@
 +         <url>http://snapshots.maven.codehaus.org/maven2</url>
 +      </pluginRepository>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <configuration>
 +               <pluginItem>${test}</pluginItem>
 +            </configuration>
@@ -7231,9 +7152,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1007/pom.xml.withoutxslt	2006-09-21 18:50:38.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1007/pom.xml	2006-09-21 18:50:40.000000000 -0400
-@@ -1,9 +1,12 @@
+--- ./maven2/maven-core-it/it1007/pom.xml.withoutxslt	2006-10-05 14:39:22.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1007/pom.xml	2006-10-05 14:39:24.000000000 -0400
+@@ -1,9 +1,11 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -7244,20 +7165,19 @@
 -    <maven>2005</maven>
 -  </prerequesites>
 -</model>
-+   <artifactId>maven-it1007-plugin</artifactId>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <version>2.0.4-JPP</version>
++   <groupId>org.apache.maven.plugins</groupId>
++   <artifactId>maven-it1007-plugin</artifactId>
 +   <prerequesites>
 +      <maven>2005</maven>
 +   </prerequesites>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0103/pom.xml.withoutxslt	2006-09-21 18:50:40.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0103/pom.xml	2006-09-21 18:50:43.000000000 -0400
-@@ -1,11 +1,13 @@
+--- ./maven2/maven-core-it/it0103/pom.xml.withoutxslt	2006-10-05 14:39:24.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0103/pom.xml	2006-10-05 14:39:26.000000000 -0400
+@@ -1,11 +1,12 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -7270,21 +7190,20 @@
 -    <module>level1</module>
 -  </modules>
 -</project>
-+   <artifactId>root</artifactId>
-+   <groupId>org.apache.maven.it0103</groupId>
 +   <version>1</version>
++   <groupId>org.apache.maven.it0103</groupId>
++   <artifactId>root</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>level1</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0103/level1/level2/pom.xml.withoutxslt	2006-09-21 \
                18:50:43.000000000 -0400
-+++ ./maven2/maven-core-it/it0103/level1/level2/pom.xml	2006-09-21 \
                18:50:45.000000000 -0400
-@@ -1,14 +1,16 @@
+--- ./maven2/maven-core-it/it0103/level1/level2/pom.xml.withoutxslt	2006-10-05 \
14:39:26.000000000 -0400 ++++ \
./maven2/maven-core-it/it0103/level1/level2/pom.xml	2006-10-05 14:39:29.000000000 \
-0400 +@@ -1,14 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -7300,24 +7219,23 @@
 -    <module>level3</module>
 -  </modules>
 -</project>
-+   <artifactId>level2</artifactId>
 +   <parent>
 +      <groupId>org.apache.maven.it0103</groupId>
 +      <artifactId>level1</artifactId>
 +      <version>1</version>
 +   </parent>
++   <artifactId>level2</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>level3</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0103/level1/level2/level3/pom.xml.withoutxslt	2006-09-21 \
                18:50:45.000000000 -0400
-+++ ./maven2/maven-core-it/it0103/level1/level2/level3/pom.xml	2006-09-21 \
                18:50:48.000000000 -0400
-@@ -1,12 +1,14 @@
+--- ./maven2/maven-core-it/it0103/level1/level2/level3/pom.xml.withoutxslt	2006-10-05 \
14:39:29.000000000 -0400 ++++ \
./maven2/maven-core-it/it0103/level1/level2/level3/pom.xml	2006-10-05 \
14:39:31.000000000 -0400 +@@ -1,12 +1,13 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -7331,22 +7249,21 @@
 -  <version>1</version>
 -
 -</project>
-+   <artifactId>level3</artifactId>
-+   <groupId>org.apache.maven.it0103</groupId>
 +   <version>1</version>
 +   <parent>
 +      <groupId>org.apache.maven.it0103</groupId>
 +      <artifactId>level1</artifactId>
 +      <version>1</version>
 +   </parent>
-+   <dependencies/>
++   <groupId>org.apache.maven.it0103</groupId>
++   <artifactId>level3</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0103/level1/pom.xml.withoutxslt	2006-09-21 \
                18:50:48.000000000 -0400
-+++ ./maven2/maven-core-it/it0103/level1/pom.xml	2006-09-21 18:50:50.000000000 -0400
-@@ -1,14 +1,16 @@
+--- ./maven2/maven-core-it/it0103/level1/pom.xml.withoutxslt	2006-10-05 \
14:39:31.000000000 -0400 ++++ ./maven2/maven-core-it/it0103/level1/pom.xml	2006-10-05 \
14:39:34.000000000 -0400 +@@ -1,14 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -7362,23 +7279,22 @@
 -    <module>level2</module>
 -  </modules>
 -</project>
-+   <artifactId>level1</artifactId>
 +   <parent>
 +      <groupId>org.apache.maven.it0103</groupId>
 +      <artifactId>root</artifactId>
 +      <version>1</version>
 +   </parent>
++   <artifactId>level1</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>level2</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0028/pom.xml.withoutxslt	2006-09-21 18:50:50.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0028/pom.xml	2006-09-21 18:50:53.000000000 -0400
+--- ./maven2/maven-core-it/it0028/pom.xml.withoutxslt	2006-10-05 14:39:34.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0028/pom.xml	2006-10-05 14:39:36.000000000 -0400
 @@ -1,29 +1,32 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -7410,17 +7326,17 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0028</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0028</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.1-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-compiler-plugin</artifactId>
-+            <version>2.1-SNAPSHOT</version>
 +            <configuration>
 +               <source>1.4</source>
 +               <target>1.4</target>
@@ -7431,9 +7347,9 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -7441,9 +7357,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0100/pom.xml.withoutxslt	2006-09-21 18:50:53.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0100/pom.xml	2006-09-21 18:50:55.000000000 -0400
-@@ -1,14 +1,14 @@
+--- ./maven2/maven-core-it/it0100/pom.xml.withoutxslt	2006-10-05 14:39:36.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0100/pom.xml	2006-10-05 14:39:38.000000000 -0400
+@@ -1,14 +1,13 @@
 -<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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -7460,22 +7376,21 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">root</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0100</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0</version> ++   <groupId \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0100</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">root</artifactId>  +   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">root</name>  +   <modules \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>parent/child</module>  +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0100/parent/pom.xml.withoutxslt	2006-09-21 \
                18:50:55.000000000 -0400
-+++ ./maven2/maven-core-it/it0100/parent/pom.xml	2006-09-21 18:50:58.000000000 -0400
-@@ -1,32 +1,34 @@
+--- ./maven2/maven-core-it/it0100/parent/pom.xml.withoutxslt	2006-10-05 \
14:39:38.000000000 -0400 ++++ ./maven2/maven-core-it/it0100/parent/pom.xml	2006-10-05 \
14:39:41.000000000 -0400 +@@ -1,32 +1,32 @@
 -<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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -7510,19 +7425,17 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">parent</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0100</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0</version> ++   <groupId \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0100</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">parent</artifactId>  +   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">parent</name>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-antrun-plugin</artifactId>
 +            <version>1.2-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-antrun-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <phase>validate</phase>
@@ -7543,9 +7456,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0100/parent/child/pom.xml.withoutxslt	2006-09-21 \
                18:50:58.000000000 -0400
-+++ ./maven2/maven-core-it/it0100/parent/child/pom.xml	2006-09-21 18:51:00.000000000 \
                -0400
-@@ -1,46 +1,47 @@
+--- ./maven2/maven-core-it/it0100/parent/child/pom.xml.withoutxslt	2006-10-05 \
14:39:41.000000000 -0400 ++++ \
./maven2/maven-core-it/it0100/parent/child/pom.xml	2006-10-05 14:39:43.000000000 \
-0400 +@@ -1,46 +1,44 @@
 -<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">
 -
@@ -7594,22 +7507,20 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">child</artifactId>  +   \
<parent>  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">parent</artifactId>  +      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it0100</groupId>
  +      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0</version>  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">child</artifactId>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">child</name>  +   <packaging \
xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-help-plugin</artifactId>
 +            <version>2.0.1-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-help-plugin</artifactId>  \
+            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <configuration>
@@ -7623,9 +7534,8 @@
 +            </executions>
 +         </plugin>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-verifier-plugin</artifactId>
 +            <version>1.0-beta-2-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-verifier-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <phase>verify</phase>
@@ -7640,9 +7550,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0021/pom.xml.withoutxslt	2006-09-21 18:51:00.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0021/pom.xml	2006-09-21 18:51:03.000000000 -0400
-@@ -1,35 +1,34 @@
+--- ./maven2/maven-core-it/it0021/pom.xml.withoutxslt	2006-10-05 14:39:43.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0021/pom.xml	2006-10-05 14:39:46.000000000 -0400
+@@ -1,35 +1,33 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -7678,9 +7588,9 @@
 -      <url>file:/tmp/testRepo</url>
 -    </repository>
 -  </distributionManagement>
-+   <artifactId>maven-it0021-plugin</artifactId>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <version>2.0.4-JPP</version>
++   <groupId>org.apache.maven.plugins</groupId>
++   <artifactId>maven-it0021-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <distributionManagement>
 +      <repository>
@@ -7689,7 +7599,6 @@
 +         <url>file:/tmp/testRepo</url>
 +      </repository>
 +   </distributionManagement>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <profiles>
 +      <profile>
@@ -7711,9 +7620,9 @@
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0086/pom.xml.withoutxslt	2006-09-21 18:51:03.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0086/pom.xml	2006-09-21 18:51:05.000000000 -0400
-@@ -1,45 +1,41 @@
+--- ./maven2/maven-core-it/it0086/pom.xml.withoutxslt	2006-10-05 14:39:46.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0086/pom.xml	2006-10-05 14:39:48.000000000 -0400
+@@ -1,45 +1,40 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -7725,9 +7634,9 @@
 -  <name>Plugin Dependency Classloading Test</name>
 -  
 -  <description>
-+   <artifactId>it0086</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>it0086</artifactId>
 +   <name>Plugin Dependency Classloading Test</name>
 +   <description>
      Ensure that classes in dependencies of the plugin can be loaded, both from the \
context loader and the plugin's classloader. @@ -7759,14 +7668,13 @@
 +         <url>http://snapshots.maven.codehaus.org/maven2</url>
 +      </pluginRepository>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <executions>
 +               <execution>
 +                  <phase>validate</phase>
@@ -7796,8 +7704,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0035/pom.xml.withoutxslt	2006-09-21 18:51:05.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0035/pom.xml	2006-09-21 18:51:08.000000000 -0400
+--- ./maven2/maven-core-it/it0035/pom.xml.withoutxslt	2006-10-05 14:39:48.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0035/pom.xml	2006-10-05 14:39:50.000000000 -0400
 @@ -1,20 +1,22 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -7820,15 +7728,15 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0035</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0035</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -7841,8 +7749,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0054/pom.xml.withoutxslt	2006-09-21 18:51:08.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0054/pom.xml	2006-09-21 18:51:10.000000000 -0400
+--- ./maven2/maven-core-it/it0054/pom.xml.withoutxslt	2006-10-05 14:39:50.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0054/pom.xml	2006-10-05 14:39:53.000000000 -0400
 @@ -1,27 +1,29 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -7872,9 +7780,9 @@
 -    </resources>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0054</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0054</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
@@ -7890,9 +7798,9 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -7900,8 +7808,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0037/pom.xml.withoutxslt	2006-09-21 18:51:13.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0037/pom.xml	2006-09-21 18:51:15.000000000 -0400
+--- ./maven2/maven-core-it/it0037/pom.xml.withoutxslt	2006-10-05 14:39:55.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0037/pom.xml	2006-10-05 14:39:58.000000000 -0400
 @@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -7920,16 +7828,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0037</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0037</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -7937,8 +7845,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0037/pom2.xml.withoutxslt	2006-09-21 18:51:10.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0037/pom2.xml	2006-09-21 18:51:13.000000000 -0400
+--- ./maven2/maven-core-it/it0037/pom2.xml.withoutxslt	2006-10-05 14:39:53.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0037/pom2.xml	2006-10-05 14:39:55.000000000 -0400
 @@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -7957,16 +7865,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0037</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-build2</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0037</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -7974,8 +7882,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0077/pom.xml.withoutxslt	2006-09-21 18:51:18.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0077/pom.xml	2006-09-21 18:51:21.000000000 -0400
+--- ./maven2/maven-core-it/it0077/pom.xml.withoutxslt	2006-10-05 14:40:00.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0077/pom.xml	2006-10-05 14:40:03.000000000 -0400
 @@ -1,28 +1,28 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -8006,9 +7914,9 @@
 -    </repository>
 -  </repositories>
 -</model>
-+   <artifactId>maven-core-it0077</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0077</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>sub1</module>
@@ -8023,9 +7931,9 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -8033,8 +7941,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0077/sub1/pom.xml.withoutxslt	2006-09-21 \
                18:51:15.000000000 -0400
-+++ ./maven2/maven-core-it/it0077/sub1/pom.xml	2006-09-21 18:51:18.000000000 -0400
+--- ./maven2/maven-core-it/it0077/sub1/pom.xml.withoutxslt	2006-10-05 \
14:39:58.000000000 -0400 ++++ ./maven2/maven-core-it/it0077/sub1/pom.xml	2006-10-05 \
14:40:00.000000000 -0400  @@ -1,41 +1,43 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -8078,13 +7986,13 @@
 -    </plugins>
 -  </build>
 -</project>
-+   <artifactId>maven-it0077-sub1</artifactId>
 +   <version>1.0</version>
 +   <parent>
 +      <groupId>org.apache.maven.it</groupId>
 +      <artifactId>maven-core-it0077</artifactId>
 +      <version>1.0</version>
 +   </parent>
++   <artifactId>maven-it0077-sub1</artifactId>
 +   <distributionManagement>
 +      <repository>
 +         <id>central</id>
@@ -8096,9 +8004,9 @@
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.1-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-jar-plugin</artifactId>
-+            <version>2.1-SNAPSHOT</version>
 +            <executions>
 +               <execution>
 +                  <goals>
@@ -8111,17 +8019,17 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>commons-lang</artifactId>
 +         <version>2.1</version>
++         <groupId>commons-lang</groupId>
++         <artifactId>commons-lang</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0077/sub2/pom.xml.withoutxslt	2006-09-21 \
                18:51:21.000000000 -0400
-+++ ./maven2/maven-core-it/it0077/sub2/pom.xml	2006-09-21 18:51:23.000000000 -0400
+--- ./maven2/maven-core-it/it0077/sub2/pom.xml.withoutxslt	2006-10-05 \
14:40:03.000000000 -0400 ++++ ./maven2/maven-core-it/it0077/sub2/pom.xml	2006-10-05 \
14:40:05.000000000 -0400  @@ -1,26 +1,27 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -8136,7 +8044,6 @@
 -
 -  <dependencies>
 -    <dependency>
-+   <artifactId>maven-it0077-sub2</artifactId>
 +   <version>1.0</version>
 +   <parent>
        <groupId>org.apache.maven.it</groupId>
@@ -8155,6 +8062,7 @@
 -  </dependencies>
 -</model>
 +   </parent>
++   <artifactId>maven-it0077-sub2</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
@@ -8174,9 +8082,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0081/pom.xml.withoutxslt	2006-09-21 18:51:23.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0081/pom.xml	2006-09-21 18:51:26.000000000 -0400
-@@ -1,13 +1,15 @@
+--- ./maven2/maven-core-it/it0081/pom.xml.withoutxslt	2006-10-05 14:40:05.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0081/pom.xml	2006-10-05 14:40:07.000000000 -0400
+@@ -1,13 +1,14 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -8191,23 +8099,22 @@
 -    <module>test-plugin</module>
 -  </modules>
 -</project>
-+   <artifactId>test-components</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
++   <groupId>test</groupId>
++   <artifactId>test-components</artifactId>
 +   <name>Test Components</name>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>test-component-c</module>
 +      <module>test-plugin</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0081/test-component-c/pom.xml.withoutxslt	2006-09-21 \
                18:51:26.000000000 -0400
-+++ ./maven2/maven-core-it/it0081/test-component-c/pom.xml	2006-09-21 \
                18:51:28.000000000 -0400
-@@ -1,37 +1,38 @@
+--- ./maven2/maven-core-it/it0081/test-component-c/pom.xml.withoutxslt	2006-10-05 \
14:40:07.000000000 -0400 ++++ \
./maven2/maven-core-it/it0081/test-component-c/pom.xml	2006-10-05 14:40:10.000000000 \
-0400 +@@ -1,37 +1,37 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -8246,16 +8153,15 @@
 -    </plugins>
 -  </build>
 -</project>
-+   <artifactId>test-component-c</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-component-c</artifactId>
 +   <name>Test Component C</name>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
@@ -8265,9 +8171,9 @@
 +            <version>0.1</version>
 +            <dependencies>
 +               <dependency>
-+                  <groupId>JPP/maven-wagon</groupId>
-+                  <artifactId>ftp</artifactId>
 +                  <version>1.0-alpha-6</version>
++                  <groupId>org.apache.maven.wagon</groupId>
++                  <artifactId>wagon-ftp</artifactId>
 +               </dependency>
 +            </dependencies>
 +            <executions>
@@ -8283,8 +8189,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0081/test-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:51:28.000000000 -0400
-+++ ./maven2/maven-core-it/it0081/test-plugin/pom.xml	2006-09-21 18:51:31.000000000 \
-0400 +--- ./maven2/maven-core-it/it0081/test-plugin/pom.xml.withoutxslt	2006-10-05 \
14:40:10.000000000 -0400 ++++ \
./maven2/maven-core-it/it0081/test-plugin/pom.xml	2006-10-05 14:40:12.000000000 -0400 \
@@ -1,21 +1,22 @@  +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -8308,30 +8214,30 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <artifactId>test-plugin</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Test Plugin</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1018/pom.xml.withoutxslt	2006-09-21 18:51:31.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1018/pom.xml	2006-09-21 18:51:33.000000000 -0400
-@@ -1,6 +1,9 @@
+--- ./maven2/maven-core-it/it1018/pom.xml.withoutxslt	2006-10-05 14:40:12.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1018/pom.xml	2006-10-05 14:40:14.000000000 -0400
+@@ -1,6 +1,8 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -8339,17 +8245,16 @@
 -  <artifactId>maven-core-it1018</artifactId>
 -  <version>1.0-SNAPSHOT</version>
 -</project>
-+   <artifactId>maven-core-it1018</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
-+   <dependencies/>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it1018</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0062/pom.xml.withoutxslt	2006-09-21 18:51:33.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0062/pom.xml	2006-09-21 18:51:36.000000000 -0400
-@@ -1,12 +1,15 @@
+--- ./maven2/maven-core-it/it0062/pom.xml.withoutxslt	2006-10-05 14:40:14.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0062/pom.xml	2006-10-05 14:40:17.000000000 -0400
+@@ -1,12 +1,14 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -8363,23 +8268,22 @@
 -    </repository>
 -  </distributionManagement>
 -</project>
-+   <artifactId>maven-core-it0062</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0062</artifactId>
 +   <distributionManagement>
 +      <repository>
 +         <id>repo</id>
 +         <url>file://localhost/${project.basedir}/target/test-repo</url>
 +      </repository>
 +   </distributionManagement>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0099/pom.xml.withoutxslt	2006-09-21 18:51:36.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0099/pom.xml	2006-09-21 18:51:38.000000000 -0400
-@@ -1,12 +1,13 @@
+--- ./maven2/maven-core-it/it0099/pom.xml.withoutxslt	2006-10-05 14:40:17.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0099/pom.xml	2006-10-05 14:40:19.000000000 -0400
+@@ -1,12 +1,12 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -8393,21 +8297,20 @@
 -    <module>child</module>
 -  </modules>
 -</project>
-+   <artifactId>maven-it0099-parent</artifactId>
-+   <groupId>org.apache.maven.it0099</groupId>
 +   <version>1</version>
++   <groupId>org.apache.maven.it0099</groupId>
++   <artifactId>maven-it0099-parent</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>child</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0099/child/pom.xml.withoutxslt	2006-09-21 \
                18:51:38.000000000 -0400
-+++ ./maven2/maven-core-it/it0099/child/pom.xml	2006-09-21 18:51:41.000000000 -0400
-@@ -1,9 +1,12 @@
+--- ./maven2/maven-core-it/it0099/child/pom.xml.withoutxslt	2006-10-05 \
14:40:19.000000000 -0400 ++++ ./maven2/maven-core-it/it0099/child/pom.xml	2006-10-05 \
14:40:21.000000000 -0400 +@@ -1,9 +1,11 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -8418,20 +8321,19 @@
 -  </parent>
 -  <artifactId>maven-it0099-child</artifactId>
 -</project>
-+   <artifactId>maven-it0099-child</artifactId>
 +   <parent>
 +      <groupId>org.apache.maven.it0099</groupId>
 +      <artifactId>maven-it0099-parent</artifactId>
 +      <version>1</version>
 +   </parent>
-+   <dependencies/>
++   <artifactId>maven-it0099-child</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it2003/pom.xml.withoutxslt	2006-09-21 18:51:41.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it2003/pom.xml	2006-09-21 18:51:43.000000000 -0400
-@@ -1,17 +1,19 @@
+--- ./maven2/maven-core-it/it2003/pom.xml.withoutxslt	2006-10-05 14:40:22.000000000 \
-0400 ++++ ./maven2/maven-core-it/it2003/pom.xml	2006-10-05 14:40:24.000000000 -0400
+@@ -1,17 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -8450,10 +8352,9 @@
 -    </pluginManagement>
 -  </build>
 -</project>
-+   <artifactId>it2003</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
-+   <dependencies/>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>it2003</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <pluginManagement>
@@ -8468,9 +8369,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0083/pom.xml.withoutxslt	2006-09-21 18:51:43.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0083/pom.xml	2006-09-21 18:51:46.000000000 -0400
-@@ -1,14 +1,16 @@
+--- ./maven2/maven-core-it/it0083/pom.xml.withoutxslt	2006-10-05 14:40:24.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0083/pom.xml	2006-10-05 14:40:26.000000000 -0400
+@@ -1,14 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -8486,9 +8387,9 @@
 -    <module>test-component-a</module>
 -  </modules>
 -</project>
-+   <artifactId>test-components</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
++   <groupId>test</groupId>
++   <artifactId>test-components</artifactId>
 +   <name>Test Components</name>
 +   <packaging>pom</packaging>
 +   <modules>
@@ -8496,13 +8397,12 @@
 +      <module>test-component-b</module>
 +      <module>test-component-a</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0083/test-component-b/pom.xml.withoutxslt	2006-09-21 \
                18:51:46.000000000 -0400
-+++ ./maven2/maven-core-it/it0083/test-component-b/pom.xml	2006-09-21 \
18:51:48.000000000 -0400 +--- \
./maven2/maven-core-it/it0083/test-component-b/pom.xml.withoutxslt	2006-10-05 \
14:40:26.000000000 -0400 ++++ \
./maven2/maven-core-it/it0083/test-component-b/pom.xml	2006-10-05 14:40:29.000000000 \
-0400  @@ -1,22 +1,22 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -8527,14 +8427,14 @@
 -		</dependency>
 -	</dependencies>
 -</project>
-+   <artifactId>test-component-b</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-component-b</artifactId>
 +   <name>Test Component B</name>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
@@ -8548,9 +8448,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0083/test-component-a/pom.xml.withoutxslt	2006-09-21 \
                18:51:48.000000000 -0400
-+++ ./maven2/maven-core-it/it0083/test-component-a/pom.xml	2006-09-21 \
                18:51:51.000000000 -0400
-@@ -1,14 +1,16 @@
+--- ./maven2/maven-core-it/it0083/test-component-a/pom.xml.withoutxslt	2006-10-05 \
14:40:29.000000000 -0400 ++++ \
./maven2/maven-core-it/it0083/test-component-a/pom.xml	2006-10-05 14:40:31.000000000 \
-0400 +@@ -1,14 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -8566,23 +8466,22 @@
 -  <name>Test Component A</name>
 -  <packaging>jar</packaging>
 -</project>
-+   <artifactId>test-component-a</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-component-a</artifactId>
 +   <name>Test Component A</name>
 +   <packaging>jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0083/test-component-c/pom.xml.withoutxslt	2006-09-21 \
                18:51:51.000000000 -0400
-+++ ./maven2/maven-core-it/it0083/test-component-c/pom.xml	2006-09-21 \
18:51:53.000000000 -0400 +--- \
./maven2/maven-core-it/it0083/test-component-c/pom.xml.withoutxslt	2006-10-05 \
14:40:31.000000000 -0400 ++++ \
./maven2/maven-core-it/it0083/test-component-c/pom.xml	2006-10-05 14:40:33.000000000 \
-0400  @@ -1,29 +1,28 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -8614,14 +8513,14 @@
 -	</dependencies>
 -
 -</project>
-+   <artifactId>test-component-c</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-component-c</artifactId>
 +   <name>Test Component C</name>
 +   <packaging>war</packaging>
 +   <modelVersion>4.0.0</modelVersion>
@@ -8641,8 +8540,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it2000/plugin/pom.xml.withoutxslt	2006-09-21 \
                18:51:53.000000000 -0400
-+++ ./maven2/maven-core-it/it2000/plugin/pom.xml	2006-09-21 18:51:56.000000000 -0400
+--- ./maven2/maven-core-it/it2000/plugin/pom.xml.withoutxslt	2006-10-05 \
14:40:33.000000000 -0400 ++++ ./maven2/maven-core-it/it2000/plugin/pom.xml	2006-10-05 \
14:40:36.000000000 -0400  @@ -1,22 +1,22 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -8667,9 +8566,9 @@
 -    </snapshotRepository>
 -  </distributionManagement>
 -</project>
-+   <artifactId>maven-it2000-plugin</artifactId>
-+   <groupId>org.apache.maven.plugins.it2000</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.plugins.it2000</groupId>
++   <artifactId>maven-it2000-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <distributionManagement>
 +      <snapshotRepository>
@@ -8680,17 +8579,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it2000/project/pom.xml.withoutxslt	2006-09-21 \
                18:51:56.000000000 -0400
-+++ ./maven2/maven-core-it/it2000/project/pom.xml	2006-09-21 18:51:58.000000000 \
                -0400
-@@ -1,13 +1,15 @@
+--- ./maven2/maven-core-it/it2000/project/pom.xml.withoutxslt	2006-10-05 \
14:40:36.000000000 -0400 ++++ \
./maven2/maven-core-it/it2000/project/pom.xml	2006-10-05 14:40:38.000000000 -0400 +@@ \
-1,13 +1,14 @@  +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -8705,22 +8604,21 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</project>
-+   <artifactId>maven-it2000</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-it2000</artifactId>
 +   <pluginRepositories>
 +      <pluginRepository>
 +         <id>test</id>
 +         <url>file:../test-repo</url>
 +      </pluginRepository>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0101/pom.xml.withoutxslt	2006-09-21 18:51:58.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0101/pom.xml	2006-09-21 18:52:01.000000000 -0400
+--- ./maven2/maven-core-it/it0101/pom.xml.withoutxslt	2006-10-05 14:40:38.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0101/pom.xml	2006-10-05 14:40:40.000000000 -0400
 @@ -1,17 +1,17 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -8740,9 +8638,9 @@
 -  </dependencies>
 -</project>
 -
-+   <artifactId>it0101</artifactId>
-+   <groupId>org.apache.maven.it0101</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it0101</groupId>
++   <artifactId>it0101</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
@@ -8756,9 +8654,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0040/pom.xml.withoutxslt	2006-09-21 18:52:01.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0040/pom.xml	2006-09-21 18:52:03.000000000 -0400
-@@ -1,24 +1,27 @@
+--- ./maven2/maven-core-it/it0040/pom.xml.withoutxslt	2006-10-05 14:40:40.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0040/pom.xml	2006-10-05 14:40:43.000000000 -0400
+@@ -1,24 +1,26 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -8784,9 +8682,9 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</project>
-+   <artifactId>maven-core-it0040</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0040</artifactId>
 +   <packaging>coreit-packaging</packaging>
 +   <pluginRepositories>
 +      <pluginRepository>
@@ -8795,14 +8693,13 @@
 +         <url>http://snapshots.maven.codehaus.org/maven2</url>
 +      </pluginRepository>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <extensions>true</extensions>
 +         </plugin>
 +      </plugins>
@@ -8810,9 +8707,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0080/pom.xml.withoutxslt	2006-09-21 18:52:03.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0080/pom.xml	2006-09-21 18:52:06.000000000 -0400
-@@ -1,14 +1,16 @@
+--- ./maven2/maven-core-it/it0080/pom.xml.withoutxslt	2006-10-05 14:40:43.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0080/pom.xml	2006-10-05 14:40:45.000000000 -0400
+@@ -1,14 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -8828,9 +8725,9 @@
 -    <module>test-component-a</module>
 -  </modules>
 -</project>
-+   <artifactId>test-components</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
++   <groupId>test</groupId>
++   <artifactId>test-components</artifactId>
 +   <name>Test Components</name>
 +   <packaging>pom</packaging>
 +   <modules>
@@ -8838,13 +8735,12 @@
 +      <module>test-component-b</module>
 +      <module>test-component-a</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0080/test-component-b/pom.xml.withoutxslt	2006-09-21 \
                18:52:06.000000000 -0400
-+++ ./maven2/maven-core-it/it0080/test-component-b/pom.xml	2006-09-21 \
18:52:08.000000000 -0400 +--- \
./maven2/maven-core-it/it0080/test-component-b/pom.xml.withoutxslt	2006-10-05 \
14:40:45.000000000 -0400 ++++ \
./maven2/maven-core-it/it0080/test-component-b/pom.xml	2006-10-05 14:40:48.000000000 \
-0400  @@ -1,22 +1,22 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -8863,8 +8759,6 @@
 -
 -  <dependencies>
 -    <dependency>
-+   <artifactId>test-component-b</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
@@ -8875,6 +8769,8 @@
 -  </dependencies>
 -</project>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-component-b</artifactId>
 +   <name>Test Component B</name>
 +   <packaging>war</packaging>
 +   <modelVersion>4.0.0</modelVersion>
@@ -8888,9 +8784,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0080/test-component-a/pom.xml.withoutxslt	2006-09-21 \
                18:52:08.000000000 -0400
-+++ ./maven2/maven-core-it/it0080/test-component-a/pom.xml	2006-09-21 \
                18:52:11.000000000 -0400
-@@ -1,14 +1,16 @@
+--- ./maven2/maven-core-it/it0080/test-component-a/pom.xml.withoutxslt	2006-10-05 \
14:40:48.000000000 -0400 ++++ \
./maven2/maven-core-it/it0080/test-component-a/pom.xml	2006-10-05 14:40:50.000000000 \
-0400 +@@ -1,14 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -8906,23 +8802,22 @@
 -  <name>Test Component A</name>
 -  <packaging>jar</packaging>
 -</project>
-+   <artifactId>test-component-a</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-component-a</artifactId>
 +   <name>Test Component A</name>
 +   <packaging>jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0080/test-component-c/pom.xml.withoutxslt	2006-09-21 \
                18:52:11.000000000 -0400
-+++ ./maven2/maven-core-it/it0080/test-component-c/pom.xml	2006-09-21 \
18:52:13.000000000 -0400 +--- \
./maven2/maven-core-it/it0080/test-component-c/pom.xml.withoutxslt	2006-10-05 \
14:40:50.000000000 -0400 ++++ \
./maven2/maven-core-it/it0080/test-component-c/pom.xml	2006-10-05 14:40:52.000000000 \
-0400  @@ -1,23 +1,23 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -8941,8 +8836,6 @@
 -
 -  <dependencies>
 -    <dependency>
-+   <artifactId>test-component-c</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-components</artifactId>
@@ -8954,6 +8847,8 @@
 -  </dependencies>
 -</project>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-component-c</artifactId>
 +   <name>Test Component C</name>
 +   <packaging>ear</packaging>
 +   <modelVersion>4.0.0</modelVersion>
@@ -8968,9 +8863,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0104/pom.xml.withoutxslt	2006-09-21 18:52:13.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0104/pom.xml	2006-09-21 18:52:16.000000000 -0400
-@@ -1,36 +1,36 @@
+--- ./maven2/maven-core-it/it0104/pom.xml.withoutxslt	2006-10-05 14:40:52.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0104/pom.xml	2006-10-05 14:40:55.000000000 -0400
+@@ -1,36 +1,35 @@
 -<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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -8993,9 +8888,9 @@
 -    <!-- pluginManagement -->
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">it0104</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it</groupId>  \
+   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it</groupId> \
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">it0104</artifactId>  +   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Quick Start \
Archetype</name>  +   <url xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org</url> \
                @@ -9014,9 +8909,8 @@
 -          </configuration>
 -        </plugin>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-surefire-plugin</artifactId>
 +            <version>2.1.4-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-surefire-plugin</artifactId>
  +            <configuration xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               \
<systemProperties>  +                  <property>
@@ -9033,17 +8927,17 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0060/pom.xml.withoutxslt	2006-09-21 18:52:16.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0060/pom.xml	2006-09-21 18:52:19.000000000 -0400
+--- ./maven2/maven-core-it/it0060/pom.xml.withoutxslt	2006-10-05 14:40:55.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0060/pom.xml	2006-10-05 14:40:57.000000000 -0400
 @@ -1,35 +1,36 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -9081,9 +8975,9 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0060</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0060</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>subproject</module>
@@ -9092,9 +8986,9 @@
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.1-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-compiler-plugin</artifactId>
-+            <version>2.1-SNAPSHOT</version>
 +            <inherited>true</inherited>
 +            <configuration>
 +               <testExcludes>
@@ -9106,9 +9000,9 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -9116,9 +9010,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0060/subproject/pom.xml.withoutxslt	2006-09-21 \
                18:52:19.000000000 -0400
-+++ ./maven2/maven-core-it/it0060/subproject/pom.xml	2006-09-21 18:52:21.000000000 \
                -0400
-@@ -1,25 +1,28 @@
+--- ./maven2/maven-core-it/it0060/subproject/pom.xml.withoutxslt	2006-10-05 \
14:40:57.000000000 -0400 ++++ \
./maven2/maven-core-it/it0060/subproject/pom.xml	2006-10-05 14:41:00.000000000 -0400 \
+@@ -1,25 +1,27 @@  +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -9145,22 +9039,21 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0060-subproject</artifactId>
 +   <version>1.0</version>
 +   <parent>
 +      <groupId>org.apache.maven.it</groupId>
 +      <artifactId>maven-core-it0060</artifactId>
 +      <version>1.0</version>
 +   </parent>
++   <artifactId>maven-core-it0060-subproject</artifactId>
 +   <packaging>jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.1-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-compiler-plugin</artifactId>
-+            <version>2.1-SNAPSHOT</version>
 +            <configuration>
 +               <testExcludes combine.children="append">
 +                  <testExclude \
implementation="java.lang.String">**/PersonThreeTest.java</testExclude> @@ -9172,8 \
+9065,8 @@  +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0098/pom.xml.withoutxslt	2006-09-21 18:52:21.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0098/pom.xml	2006-09-21 18:52:24.000000000 -0400
+--- ./maven2/maven-core-it/it0098/pom.xml.withoutxslt	2006-10-05 14:41:00.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0098/pom.xml	2006-10-05 14:41:02.000000000 -0400
 @@ -1,15 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -9191,22 +9084,22 @@
 -  </dependencies>
 -
 -</project>
-+   <artifactId>it0098</artifactId>
-+   <groupId>org.apache.maven.it0098</groupId>
 +   <version>1</version>
++   <groupId>org.apache.maven.it0098</groupId>
++   <artifactId>it0098</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0056/pom.xml.withoutxslt	2006-09-21 18:52:24.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0056/pom.xml	2006-09-21 18:52:26.000000000 -0400
+--- ./maven2/maven-core-it/it0056/pom.xml.withoutxslt	2006-10-05 14:41:02.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0056/pom.xml	2006-10-05 14:41:05.000000000 -0400
 @@ -1,42 +1,44 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -9251,17 +9144,17 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0056</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0056</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.1-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-compiler-plugin</artifactId>
-+            <version>2.1-SNAPSHOT</version>
 +            <executions>
 +               <execution>
 +                  <id>validation-phase-execution</id>
@@ -9284,9 +9177,9 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -9294,8 +9187,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0065/pom.xml.withoutxslt	2006-09-21 18:52:29.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0065/pom.xml	2006-09-21 18:52:31.000000000 -0400
+--- ./maven2/maven-core-it/it0065/pom.xml.withoutxslt	2006-10-05 14:41:07.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0065/pom.xml	2006-10-05 14:41:09.000000000 -0400
 @@ -1,21 +1,22 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -9319,9 +9212,9 @@
 -    <module>subproject</module>
 -  </modules>
 -</model>
-+   <artifactId>maven-core-it0065</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0065</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>plugin</module>
@@ -9330,9 +9223,9 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -9340,8 +9233,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0065/plugin/pom.xml.withoutxslt	2006-09-21 \
                18:52:26.000000000 -0400
-+++ ./maven2/maven-core-it/it0065/plugin/pom.xml	2006-09-21 18:52:29.000000000 -0400
+--- ./maven2/maven-core-it/it0065/plugin/pom.xml.withoutxslt	2006-10-05 \
14:41:05.000000000 -0400 ++++ ./maven2/maven-core-it/it0065/plugin/pom.xml	2006-10-05 \
14:41:07.000000000 -0400  @@ -1,34 +1,36 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -9378,13 +9271,13 @@
 -    </repository>
 -  </distributionManagement>
 -</project>
-+   <artifactId>maven-it0065-plugin</artifactId>
 +   <version>1.0-SNAPSHOT</version>
 +   <parent>
 +      <groupId>org.apache.maven.it</groupId>
 +      <artifactId>maven-core-it0065</artifactId>
 +      <version>1.0</version>
 +   </parent>
++   <artifactId>maven-it0065-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <distributionManagement>
 +      <repository>
@@ -9396,16 +9289,16 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +         <type>jar</type>
 +         <scope>compile</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -9413,9 +9306,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0065/subproject/pom.xml.withoutxslt	2006-09-21 \
                18:52:31.000000000 -0400
-+++ ./maven2/maven-core-it/it0065/subproject/pom.xml	2006-09-21 18:52:34.000000000 \
                -0400
-@@ -1,28 +1,30 @@
+--- ./maven2/maven-core-it/it0065/subproject/pom.xml.withoutxslt	2006-10-05 \
14:41:09.000000000 -0400 ++++ \
./maven2/maven-core-it/it0065/subproject/pom.xml	2006-10-05 14:41:12.000000000 -0400 \
+@@ -1,28 +1,29 @@  +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -9445,15 +9338,14 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0065-subproject</artifactId>
 +   <version>1.0</version>
 +   <parent>
 +      <groupId>org.apache.maven.it</groupId>
 +      <artifactId>maven-core-it0065</artifactId>
 +      <version>1.0</version>
 +   </parent>
++   <artifactId>maven-core-it0065-subproject</artifactId>
 +   <packaging>jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
@@ -9474,9 +9366,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0066/other-pom.xml.withoutxslt	2006-09-21 \
                18:52:34.000000000 -0400
-+++ ./maven2/maven-core-it/it0066/other-pom.xml	2006-09-21 18:52:36.000000000 -0400
-@@ -1,7 +1,10 @@
+--- ./maven2/maven-core-it/it0066/other-pom.xml.withoutxslt	2006-10-05 \
14:41:12.000000000 -0400 ++++ ./maven2/maven-core-it/it0066/other-pom.xml	2006-10-05 \
14:41:14.000000000 -0400 +@@ -1,7 +1,9 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -9485,18 +9377,17 @@
 -  <version>1.0-SNAPSHOT</version>
 -  <packaging>pom</packaging>
 -</project>
-+   <artifactId>maven-it0066</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-it0066</artifactId>
 +   <packaging>pom</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0033/pom.xml.withoutxslt	2006-09-21 18:52:36.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0033/pom.xml	2006-09-21 18:52:39.000000000 -0400
-@@ -1,19 +1,22 @@
+--- ./maven2/maven-core-it/it0033/pom.xml.withoutxslt	2006-10-05 14:41:14.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0033/pom.xml	2006-10-05 14:41:17.000000000 -0400
+@@ -1,19 +1,21 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -9517,18 +9408,17 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it00xx</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it00xx</artifactId>
 +   <packaging>ear</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.2-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-ear-plugin</artifactId>
-+            <version>2.2-SNAPSHOT</version>
 +            <configuration>
 +               <generateApplicationXml>true</generateApplicationXml>
 +            </configuration>
@@ -9538,9 +9428,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0026/pom.xml.withoutxslt	2006-09-21 18:52:39.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0026/pom.xml	2006-09-21 18:52:41.000000000 -0400
-@@ -1,31 +1,28 @@
+--- ./maven2/maven-core-it/it0026/pom.xml.withoutxslt	2006-10-05 14:41:17.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0026/pom.xml	2006-10-05 14:41:19.000000000 -0400
+@@ -1,31 +1,27 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -9573,9 +9463,9 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</model>
-+   <artifactId>maven-it0023</artifactId>
-+   <groupId>org.apache.maven.</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.</groupId>
++   <artifactId>maven-it0023</artifactId>
 +   <pluginRepositories>
 +      <pluginRepository>
 +         <id>snapshots</id>
@@ -9583,14 +9473,13 @@
 +         <url>http://snapshots.maven.codehaus.org/maven2</url>
 +      </pluginRepository>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <configuration>
 +               <pluginItem>${test}</pluginItem>
 +            </configuration>
@@ -9600,8 +9489,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0071/pom.xml.withoutxslt	2006-09-21 18:52:41.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0071/pom.xml	2006-09-21 18:52:44.000000000 -0400
+--- ./maven2/maven-core-it/it0071/pom.xml.withoutxslt	2006-10-05 14:41:19.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0071/pom.xml	2006-10-05 14:41:21.000000000 -0400
 @@ -1,39 +1,40 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -9643,9 +9532,9 @@
 -    <m2.foo>foo2</m2.foo>
 -  </properties>
 -</project>
-+   <artifactId>maven-core-it0071</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0071</artifactId>
 +   <packaging>jar</packaging>
 +   <pluginRepositories>
 +      <pluginRepository>
@@ -9661,9 +9550,9 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <configuration>
 +               <pluginItem>${m2.foo}</pluginItem>
 +            </configuration>
@@ -9672,9 +9561,9 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -9682,8 +9571,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0014/pom.xml.withoutxslt	2006-09-21 18:52:44.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0014/pom.xml	2006-09-21 18:52:47.000000000 -0400
+--- ./maven2/maven-core-it/it0014/pom.xml.withoutxslt	2006-10-05 14:41:21.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0014/pom.xml	2006-10-05 14:41:24.000000000 -0400
 @@ -1,28 +1,31 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -9714,17 +9603,17 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0014</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0014</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.1-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-compiler-plugin</artifactId>
-+            <version>2.1-SNAPSHOT</version>
 +            <configuration>
 +               <source>1.4</source>
 +               <target>1.4</target>
@@ -9734,9 +9623,9 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -9744,9 +9633,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0045/pom.xml.withoutxslt	2006-09-21 18:52:47.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0045/pom.xml	2006-09-21 18:52:49.000000000 -0400
-@@ -1,17 +1,20 @@
+--- ./maven2/maven-core-it/it0045/pom.xml.withoutxslt	2006-10-05 14:41:24.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0045/pom.xml	2006-10-05 14:41:26.000000000 -0400
+@@ -1,17 +1,19 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -9765,9 +9654,9 @@
 -    <module>subproject</module>
 -  </modules>
 -</model>
-+   <artifactId>maven-core-it0045</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0045</artifactId>
 +   <packaging>pom</packaging>
 +   <pluginRepositories>
 +      <pluginRepository>
@@ -9779,14 +9668,13 @@
 +   <modules>
 +      <module>subproject</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0045/subproject/pom.xml.withoutxslt	2006-09-21 \
                18:52:49.000000000 -0400
-+++ ./maven2/maven-core-it/it0045/subproject/pom.xml	2006-09-21 18:52:51.000000000 \
                -0400
-@@ -1,10 +1,13 @@
+--- ./maven2/maven-core-it/it0045/subproject/pom.xml.withoutxslt	2006-10-05 \
14:41:26.000000000 -0400 ++++ \
./maven2/maven-core-it/it0045/subproject/pom.xml	2006-10-05 14:41:28.000000000 -0400 \
+@@ -1,10 +1,12 @@  +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -9798,21 +9686,20 @@
 -  <artifactId>maven-core-it0045-subproject</artifactId>
 -  <packaging>jar</packaging>
 -</model>
-+   <artifactId>maven-core-it0045-subproject</artifactId>
 +   <parent>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-core-it0045</artifactId>
 +      <version>1.0</version>
 +   </parent>
++   <artifactId>maven-core-it0045-subproject</artifactId>
 +   <packaging>jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0043/pom.xml.withoutxslt	2006-09-21 18:52:51.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0043/pom.xml	2006-09-21 18:52:54.000000000 -0400
-@@ -1,50 +1,49 @@
+--- ./maven2/maven-core-it/it0043/pom.xml.withoutxslt	2006-10-05 14:41:28.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0043/pom.xml	2006-10-05 14:41:31.000000000 -0400
+@@ -1,50 +1,48 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -9864,9 +9751,9 @@
 -    </plugins>
 -  </build>
 -</project>
-+   <artifactId>maven-it0043</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-it0043</artifactId>
 +   <repositories>
 +      <repository>
 +         <id>central</id>
@@ -9885,9 +9772,8 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-help-plugin</artifactId>
 +            <version>2.0.1-SNAPSHOT</version>
++            <artifactId>maven-help-plugin</artifactId>
 +            <executions>
 +               <execution>
 +                  <phase>generate-test-resources</phase>
@@ -9904,16 +9790,16 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <artifactId>junit</artifactId>
++         <groupId>junit</groupId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0052/pom.xml.withoutxslt	2006-09-21 18:52:54.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0052/pom.xml	2006-09-21 18:52:57.000000000 -0400
+--- ./maven2/maven-core-it/it0052/pom.xml.withoutxslt	2006-10-05 14:41:31.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0052/pom.xml	2006-10-05 14:41:33.000000000 -0400
 @@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -9932,16 +9818,16 @@
 -    </dependency>
 -  </dependencies>
 -</model>
-+   <artifactId>maven-core-it0051</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0051</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -9949,8 +9835,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0055/pom.xml.withoutxslt	2006-09-21 18:52:57.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0055/pom.xml	2006-09-21 18:52:59.000000000 -0400
+--- ./maven2/maven-core-it/it0055/pom.xml.withoutxslt	2006-10-05 14:41:33.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0055/pom.xml	2006-10-05 14:41:36.000000000 -0400
 @@ -1,33 +1,35 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -9986,17 +9872,17 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0055</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0055</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.1-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-compiler-plugin</artifactId>
-+            <version>2.1-SNAPSHOT</version>
 +            <configuration>
 +               <excludes>
 +                  <exclude \
implementation="java.lang.String">**/PersonTwo.java</exclude> @@ -10010,9 +9896,9 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -10020,9 +9906,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0085/pom.xml.withoutxslt	2006-09-21 18:52:59.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0085/pom.xml	2006-09-21 18:53:02.000000000 -0400
-@@ -1,24 +1,24 @@
+--- ./maven2/maven-core-it/it0085/pom.xml.withoutxslt	2006-10-05 14:41:36.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0085/pom.xml	2006-10-05 14:41:38.000000000 -0400
+@@ -1,24 +1,23 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -10048,15 +9934,14 @@
 -    </dependencies>
 -  </dependencyManagement>
 -</project>
-+   <artifactId>it0085-parent</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>it0085-parent</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>dep</module>
 +      <module>war</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement>
 +      <dependencies>
@@ -10071,8 +9956,8 @@
 +   </dependencyManagement>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0085/dep/pom.xml.withoutxslt	2006-09-21 \
                18:53:02.000000000 -0400
-+++ ./maven2/maven-core-it/it0085/dep/pom.xml	2006-09-21 18:53:04.000000000 -0400
+--- ./maven2/maven-core-it/it0085/dep/pom.xml.withoutxslt	2006-10-05 \
14:41:38.000000000 -0400 ++++ ./maven2/maven-core-it/it0085/dep/pom.xml	2006-10-05 \
14:41:40.000000000 -0400  @@ -1,16 +1,17 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -10086,7 +9971,6 @@
 -
 -  <dependencies>
 -    <dependency>
-+   <artifactId>it0085-dep</artifactId>
 +   <parent>
        <groupId>org.apache.maven.it</groupId>
 -      <artifactId>pom-dep</artifactId>
@@ -10096,6 +9980,7 @@
 +      <artifactId>it0085-parent</artifactId>
 +      <version>1.0</version>
 +   </parent>
++   <artifactId>it0085-dep</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
@@ -10106,8 +9991,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0085/war/pom.xml.withoutxslt	2006-09-21 \
                18:53:04.000000000 -0400
-+++ ./maven2/maven-core-it/it0085/war/pom.xml	2006-09-21 18:53:07.000000000 -0400
+--- ./maven2/maven-core-it/it0085/war/pom.xml.withoutxslt	2006-10-05 \
14:41:40.000000000 -0400 ++++ ./maven2/maven-core-it/it0085/war/pom.xml	2006-10-05 \
14:41:43.000000000 -0400  @@ -1,24 +1,25 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -10127,7 +10012,6 @@
 -      <version>3.8.1</version>
 -    </dependency>
 -    <dependency>
-+   <artifactId>it0085-war</artifactId>
 +   <parent>
        <groupId>org.apache.maven.it</groupId>
 -      <artifactId>it0085-dep</artifactId>
@@ -10138,13 +10022,14 @@
 -  </dependencies>
 -</project>
 +   </parent>
++   <artifactId>it0085-war</artifactId>
 +   <packaging>war</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +      </dependency>
 +      <dependency>
 +         <groupId>org.apache.maven.it</groupId>
@@ -10156,8 +10041,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0088/pom.xml.withoutxslt	2006-09-21 18:53:07.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0088/pom.xml	2006-09-21 18:53:09.000000000 -0400
+--- ./maven2/maven-core-it/it0088/pom.xml.withoutxslt	2006-10-05 14:41:43.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0088/pom.xml	2006-10-05 14:41:45.000000000 -0400
 @@ -1,50 +1,52 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -10210,9 +10095,9 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</project>
-+   <artifactId>maven-core-it0088</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0088</artifactId>
 +   <pluginRepositories>
 +      <pluginRepository>
 +         <id>apache.snapshots</id>
@@ -10230,9 +10115,9 @@
 +      </resources>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-core-it-plugin</artifactId>
 +            <executions>
 +               <execution>
 +                  <phase>process-resources</phase>
@@ -10251,9 +10136,9 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -10261,9 +10146,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1012/pom.xml.withoutxslt	2006-09-21 18:53:10.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1012/pom.xml	2006-09-21 18:53:12.000000000 -0400
-@@ -1,7 +1,10 @@
+--- ./maven2/maven-core-it/it1012/pom.xml.withoutxslt	2006-10-05 14:41:45.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1012/pom.xml	2006-10-05 14:41:48.000000000 -0400
+@@ -1,7 +1,9 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -10272,18 +10157,17 @@
 -  <version>1.0-SNAPSHOT</version>
 -  <packaging>this-doesnt-exist</packaging>
 -</project>
-+   <artifactId>maven-it1012</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-it1012</artifactId>
 +   <packaging>this-doesnt-exist</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0029/pom.xml.withoutxslt	2006-09-21 18:53:12.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0029/pom.xml	2006-09-21 18:53:15.000000000 -0400
-@@ -1,27 +1,27 @@
+--- ./maven2/maven-core-it/it0029/pom.xml.withoutxslt	2006-10-05 14:41:48.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0029/pom.xml	2006-10-05 14:41:50.000000000 -0400
+@@ -1,27 +1,26 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -10312,14 +10196,13 @@
 -    </pluginManagement>
 -  </build>
 -</project>
-+   <artifactId>maven-core-it0029</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0029</artifactId>
 +   <packaging>pom</packaging>
 +   <modules>
 +      <module>child-project</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <pluginManagement>
@@ -10338,8 +10221,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0029/child-project/pom.xml.withoutxslt	2006-09-21 \
                18:53:15.000000000 -0400
-+++ ./maven2/maven-core-it/it0029/child-project/pom.xml	2006-09-21 \
18:53:17.000000000 -0400 +--- \
./maven2/maven-core-it/it0029/child-project/pom.xml.withoutxslt	2006-10-05 \
14:41:50.000000000 -0400 ++++ \
./maven2/maven-core-it/it0029/child-project/pom.xml	2006-10-05 14:41:52.000000000 \
-0400  @@ -1,29 +1,32 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -10371,30 +10254,30 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0029-child</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
 +   <parent>
 +      <groupId>org.apache.maven.it</groupId>
 +      <artifactId>maven-core-it0029</artifactId>
 +      <version>1.0-SNAPSHOT</version>
 +   </parent>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0029-child</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.1-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-compiler-plugin</artifactId>
-+            <version>2.1-SNAPSHOT</version>
 +         </plugin>
 +      </plugins>
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -10402,8 +10285,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0072/pom.xml.withoutxslt	2006-09-21 18:53:17.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0072/pom.xml	2006-09-21 18:53:20.000000000 -0400
+--- ./maven2/maven-core-it/it0072/pom.xml.withoutxslt	2006-10-05 14:41:52.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0072/pom.xml	2006-10-05 14:41:55.000000000 -0400
 @@ -1,28 +1,29 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -10434,9 +10317,9 @@
 -    <m2.version>1.0-SNAPSHOT</m2.version>
 -  </properties>
 -</project>
-+   <artifactId>maven-core-it0072</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>${m2.version}</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0072</artifactId>
 +   <packaging>jar</packaging>
 +   <pluginRepositories>
 +      <pluginRepository>
@@ -10452,9 +10335,9 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -10462,8 +10345,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0016/pom.xml.withoutxslt	2006-09-21 18:53:20.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0016/pom.xml	2006-09-21 18:53:22.000000000 -0400
+--- ./maven2/maven-core-it/it0016/pom.xml.withoutxslt	2006-10-05 14:41:55.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0016/pom.xml	2006-10-05 14:41:57.000000000 -0400
 @@ -1,36 +1,37 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -10502,45 +10385,45 @@
 -    </plugins>
 -  </build>
 -</model>
-+   <artifactId>maven-core-it0016</artifactId>
-+   <groupId>org.apache.maven</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-core-it0016</artifactId>
 +   <packaging>war</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.0-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-war-plugin</artifactId>
-+            <version>2.0-SNAPSHOT</version>
 +         </plugin>
 +      </plugins>
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>geronimo-servlet-2.4-api</artifactId>
 +         <version>2.4</version>
++         <groupId>javax.servlet</groupId>
++         <artifactId>servlet-api</artifactId>
 +         <scope>provided</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>commons-logging</artifactId>
 +         <version>1.0.4</version>
++         <groupId>commons-logging</groupId>
++         <artifactId>commons-logging</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0078/pom.xml.withoutxslt	2006-09-21 18:53:22.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0078/pom.xml	2006-09-21 18:53:25.000000000 -0400
-@@ -1,21 +1,24 @@
+--- ./maven2/maven-core-it/it0078/pom.xml.withoutxslt	2006-10-05 14:41:57.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0078/pom.xml	2006-10-05 14:42:00.000000000 -0400
+@@ -1,21 +1,23 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -10563,11 +10446,10 @@
 -    </pluginManagement>
 -  </build>
 -</project>
-+   <artifactId>maven-core-it0078</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0078</artifactId>
 +   <packaging>jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <pluginManagement>
@@ -10586,8 +10468,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it1014/pom.xml.withoutxslt	2006-09-21 18:53:25.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it1014/pom.xml	2006-09-21 18:53:27.000000000 -0400
+--- ./maven2/maven-core-it/it1014/pom.xml.withoutxslt	2006-10-05 14:42:00.000000000 \
-0400 ++++ ./maven2/maven-core-it/it1014/pom.xml	2006-10-05 14:42:02.000000000 -0400
 @@ -1,14 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -10604,22 +10486,22 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <artifactId>maven-it1014</artifactId>
-+   <groupId>org.apache.maven.it1014</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.it1014</groupId>
++   <artifactId>maven-it1014</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>commons-logging</artifactId>
 +         <version>1.0.4</version>
++         <groupId>commons-logging</groupId>
++         <artifactId>commons-logging</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0094/test/pom.xml.withoutxslt	2006-09-21 \
                18:53:27.000000000 -0400
-+++ ./maven2/maven-core-it/it0094/test/pom.xml	2006-09-21 18:53:30.000000000 -0400
+--- ./maven2/maven-core-it/it0094/test/pom.xml.withoutxslt	2006-10-05 \
14:42:02.000000000 -0400 ++++ ./maven2/maven-core-it/it0094/test/pom.xml	2006-10-05 \
14:42:05.000000000 -0400  @@ -1,33 +1,29 @@
 -<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"> @@ -10656,12 +10538,12 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it0094-test</artifactId>
  +   <parent>
 +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it</groupId>  \
+      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it0094</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it0094-test</artifactId>
  +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
@@ -10684,9 +10566,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0094/pom.xml.withoutxslt	2006-09-21 18:53:30.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0094/pom.xml	2006-09-21 18:53:32.000000000 -0400
-@@ -1,15 +1,14 @@
+--- ./maven2/maven-core-it/it0094/pom.xml.withoutxslt	2006-10-05 14:42:05.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0094/pom.xml	2006-10-05 14:42:07.000000000 -0400
+@@ -1,15 +1,13 @@
 -<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">
 -
@@ -10704,21 +10586,20 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it0094</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it</groupId>  \
+   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it</groupId> \
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it0094</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <modules \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      <module>mojo</module>
 +      <module>test</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0094/mojo/pom.xml.withoutxslt	2006-09-21 \
                18:53:32.000000000 -0400
-+++ ./maven2/maven-core-it/it0094/mojo/pom.xml	2006-09-21 18:53:35.000000000 -0400
+--- ./maven2/maven-core-it/it0094/mojo/pom.xml.withoutxslt	2006-10-05 \
14:42:07.000000000 -0400 ++++ ./maven2/maven-core-it/it0094/mojo/pom.xml	2006-10-05 \
14:42:09.000000000 -0400  @@ -1,65 +1,62 @@
 -<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"> @@ -10787,14 +10668,14 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it0094-mojo</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it</groupId>  \
+   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
                <parent>
-+      <groupId>JPP/codehaus</groupId>
-+      <artifactId>mojo</artifactId>
 +      <version>5</version>
++      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.mojo</groupId> ++  \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">mojo</artifactId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.it</groupId> \
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it0094-mojo</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<reporting xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      <plugins>
@@ -10807,49 +10688,49 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-model</artifactId>  +     \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>log4j</artifactId>
 +         <version>1.2.9</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">log4j</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">log4j</artifactId>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>xalan-j2</artifactId>
 +         <version>1.0.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">xalan</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">xalan</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>xerces-j2</artifactId>
 +         <version>2.7.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">xerces</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">xercesImpl</artifactId>  +      \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>xml-commons-apis</artifactId>
 +         <version>2.0.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">xml-apis</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">xml-apis</artifactId>  +        \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0053/pom.xml.withoutxslt	2006-09-21 18:53:35.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0053/pom.xml	2006-09-21 18:53:38.000000000 -0400
+--- ./maven2/maven-core-it/it0053/pom.xml.withoutxslt	2006-10-05 14:42:09.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0053/pom.xml	2006-10-05 14:42:12.000000000 -0400
 @@ -1,23 +1,24 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -10875,9 +10756,9 @@
 -    </snapshotRepository>
 -  </distributionManagement>
 -</model>
-+   <artifactId>maven-core-it0053</artifactId>
-+   <groupId>org.apache.maven.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.it</groupId>
++   <artifactId>maven-core-it0053</artifactId>
 +   <packaging>jar</packaging>
 +   <distributionManagement>
 +      <snapshotRepository>
@@ -10888,9 +10769,9 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -10898,8 +10779,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core-it/it0013/pom.xml.withoutxslt	2006-09-21 18:53:38.000000000 \
                -0400
-+++ ./maven2/maven-core-it/it0013/pom.xml	2006-09-21 18:53:40.000000000 -0400
+--- ./maven2/maven-core-it/it0013/pom.xml.withoutxslt	2006-10-05 14:42:12.000000000 \
-0400 ++++ ./maven2/maven-core-it/it0013/pom.xml	2006-10-05 14:42:14.000000000 -0400
 @@ -1,30 +1,32 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -10932,9 +10813,9 @@
 -    </repository>
 -  </distributionManagement>
 -</project>
-+   <artifactId>maven-it0013-plugin</artifactId>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <version>2.0.4-JPP</version>
++   <groupId>org.apache.maven.plugins</groupId>
++   <artifactId>maven-it0013-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <distributionManagement>
 +      <repository>
@@ -10946,16 +10827,16 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +         <type>jar</type>
 +         <scope>compile</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -10963,8 +10844,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/bootstrap/bootstrap-installer/pom.xml.withoutxslt	2006-09-21 \
                18:53:40.000000000 -0400
-+++ ./maven2/bootstrap/bootstrap-installer/pom.xml	2006-09-21 18:53:43.000000000 \
-0400 +--- ./maven2/bootstrap/bootstrap-installer/pom.xml.withoutxslt	2006-10-05 \
14:42:14.000000000 -0400 ++++ \
./maven2/bootstrap/bootstrap-installer/pom.xml	2006-10-05 14:42:17.000000000 -0400  \
                @@ -1,21 +1,22 @@
 -<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"> @@ -10989,30 +10870,30 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>bootstrap-installer</artifactId>
 +   <version>2.0.4-SNAPSHOT</version>
++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.bootstrap</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">bootstrap-installer</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Bootstrap \
Installer</name>  +   <description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Tool used to bootstrap \
m2.</description>  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>bootstrap-mini</artifactId>
 +         <version>2.0.4-SNAPSHOT</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.bootstrap</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">bootstrap-mini</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/bootstrap/bootstrap-mini/pom.xml.withoutxslt	2006-09-21 \
                18:53:43.000000000 -0400
-+++ ./maven2/bootstrap/bootstrap-mini/pom.xml	2006-09-21 18:53:45.000000000 -0400
-@@ -1,9 +1,11 @@
+--- ./maven2/bootstrap/bootstrap-mini/pom.xml.withoutxslt	2006-10-05 \
14:42:17.000000000 -0400 ++++ ./maven2/bootstrap/bootstrap-mini/pom.xml	2006-10-05 \
14:42:19.000000000 -0400 +@@ -1,9 +1,10 @@
 -<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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -11024,19 +10905,18 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>bootstrap-mini</artifactId>
 +   <version>2.0.4-SNAPSHOT</version>
++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.bootstrap</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">bootstrap-mini</artifactId>  +  \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Bootstrap Mini \
Builder</name>  +   <description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Tool used to bootstrap \
                m2.</description>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-model-converter/pom.xml.withoutxslt	2006-09-21 18:53:45.000000000 \
                -0400
-+++ ./maven2/maven-model-converter/pom.xml	2006-09-21 18:53:48.000000000 -0400
-@@ -1,33 +1,38 @@
+--- ./maven2/maven-model-converter/pom.xml.withoutxslt	2006-10-05 14:42:19.000000000 \
-0400 ++++ ./maven2/maven-model-converter/pom.xml	2006-10-05 14:42:22.000000000 -0400
+@@ -1,33 +1,37 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -11059,12 +10939,8 @@
 -      <artifactId>maven-model</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>model-converter</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
        <version>2.0.4</version>
 -    </dependency>
 -    <dependency>
@@ -11077,39 +10953,42 @@
 -      <scope>test</scope>
 -    </dependency>
 -  </dependencies>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-model-converter</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Model Converter</name>  + \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Converts between version 3.0.0 \
and version 4.0.0 models.</description>  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model-v3</artifactId>
 +         <version>2.0</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-model-v3</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-model</artifactId>  +     \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-container-default</artifactId>
  +         <scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-model/pom.xml.withoutxslt	2006-09-21 18:53:48.000000000 -0400
-+++ ./maven2/maven-model/pom.xml	2006-09-21 18:53:51.000000000 -0400
-@@ -1,92 +1,97 @@
+--- ./maven2/maven-model/pom.xml.withoutxslt	2006-10-05 14:42:22.000000000 -0400
++++ ./maven2/maven-model/pom.xml	2006-10-05 14:42:24.000000000 -0400
+@@ -1,92 +1,96 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -11162,22 +11041,20 @@
 -            <artifactId>modello-maven-plugin</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>model</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-model</artifactId>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Model</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Model</description>  +   \
<modelVersion>4.0.0</modelVersion>  +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
              <version>1.0-alpha-8</version>
 -            <executions>
 -              <execution>
@@ -11193,6 +11070,8 @@
 -                  <packageWithVersion>true</packageWithVersion>
 -                </configuration>
 -              </execution>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.modello</groupId> \
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">modello-maven-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <goals>
@@ -11248,9 +11127,9 @@
 +         <build>
 +            <plugins>
 +               <plugin>
-+                  <groupId>JPP/modello</groupId>
-+                  <artifactId>maven-plugin</artifactId>
 +                  <version>1.0-alpha-8</version>
++                  <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.modello</groupId> \
++                  <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">modello-maven-plugin</artifactId>
  +                  <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +                     \
<execution>  +                        <id>v3</id>
@@ -11268,9 +11147,8 @@
 +                  </executions>
 +               </plugin>
 +               <plugin>
-+                  <groupId>org.apache.maven.plugins</groupId>
-+                  <artifactId>maven-jar-plugin</artifactId>
 +                  <version>2.1-SNAPSHOT</version>
++                  <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-jar-plugin</artifactId>  \
+                  <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +                     \
<execution>  +                        <phase>package</phase>
@@ -11289,17 +11167,17 @@
 +   </profiles>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/pom.xml.withoutxslt	2006-09-21 18:53:53.000000000 -0400
-+++ ./maven2/pom.xml	2006-09-21 18:53:56.000000000 -0400
-@@ -1,344 +1,347 @@
+--- ./maven2/pom.xml.withoutxslt	2006-10-05 14:42:27.000000000 -0400
++++ ./maven2/pom.xml	2006-10-05 14:42:29.000000000 -0400
+@@ -1,344 +1,346 @@
 -<?xml version="1.0" encoding="UTF-8"?><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">
 -  <modelVersion>4.0.0</modelVersion>
 -  <groupId>org.apache.maven</groupId>
@@ -11460,9 +11338,9 @@
 -    <pluginManagement>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>maven</artifactId>
 +   <version>2.0.4</version>
++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId>  +   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven</name>  +   <description \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven is a project development \
management and comprehension tool. Based on the concept of a project object model: \
builds, dependency management, documentation creation, site publication, and \
distribution publication are all controlled from the declarative file. Maven can be \
extended by plugins to utilise a number of other development tools for reporting or \
the build process.</description> @@ -11870,9 +11748,8 @@
 +         <build>
 +            <plugins>
 +               <plugin>
-+                  <groupId>org.apache.maven.plugins</groupId>
-+                  <artifactId>maven-clean-plugin</artifactId>
 +                  <version>2.1.1-SNAPSHOT</version>
++                  <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-clean-plugin</artifactId> \
+                  <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +                     \
<execution>  +                        <id>clean-before-source-assembly</id>
@@ -11892,9 +11769,9 @@
 -        <groupId>org.codehaus.plexus</groupId>
 -        <artifactId>plexus-container-default</artifactId>
 -        <version>1.0-alpha-9</version>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  </dependency>
 -      <dependency>
@@ -11949,46 +11826,46 @@
 +   <dependencyManagement>
 +      <dependencies>
 +         <dependency>
-+            <groupId>JPP/plexus</groupId>
-+            <artifactId>container-default</artifactId>
 +            <version>1.0-alpha-9</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-container-default</artifactId>
  +         </dependency>
 +         <dependency>
-+            <groupId>JPP/plexus</groupId>
-+            <artifactId>utils</artifactId>
-+            <version>1.1</version>
++            <version>1.2</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +         <dependency>
-+            <groupId>JPP/maven-wagon</groupId>
-+            <artifactId>provider-api</artifactId>
 +            <version>1.0-alpha-6</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.wagon</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">wagon-provider-api</artifactId> \
+         </dependency>  +         <dependency>
-+            <groupId>JPP/maven-wagon</groupId>
-+            <artifactId>ssh</artifactId>
 +            <version>1.0-alpha-6</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.wagon</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">wagon-ssh</artifactId>  +       \
</dependency>  +         <dependency>
-+            <groupId>JPP/maven-wagon</groupId>
-+            <artifactId>ssh-external</artifactId>
 +            <version>1.0-alpha-6</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.wagon</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">wagon-ssh-external</artifactId> \
+         </dependency>  +         <dependency>
-+            <groupId>JPP/maven-wagon</groupId>
-+            <artifactId>file</artifactId>
 +            <version>1.0-alpha-6</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.wagon</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">wagon-file</artifactId>  +      \
</dependency>  +         <dependency>
-+            <groupId>JPP/maven-wagon</groupId>
-+            <artifactId>http-lightweight</artifactId>
 +            <version>1.0-alpha-6</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.wagon</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">wagon-http-lightweight</artifactId>
  +         </dependency>
 +      </dependencies>
 +   </dependencyManagement>
  </project>
 \ No newline at end of file
---- ./maven2/maven-plugin-registry/pom.xml.withoutxslt	2006-09-21 18:53:51.000000000 \
                -0400
-+++ ./maven2/maven-plugin-registry/pom.xml	2006-09-21 18:53:53.000000000 -0400
+--- ./maven2/maven-plugin-registry/pom.xml.withoutxslt	2006-10-05 14:42:24.000000000 \
-0400 ++++ ./maven2/maven-plugin-registry/pom.xml	2006-10-05 14:42:27.000000000 -0400
 @@ -1,51 +1,55 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -12042,22 +11919,22 @@
 -  </dependencies>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-registry</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-registry</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Plugin Registry \
Model</name>  +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
 +            <version>1.0-alpha-8</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.modello</groupId> \
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">modello-maven-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <id>site-xsd</id>
@@ -12083,22 +11960,22 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-container-default</artifactId>
  +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-profile/pom.xml.withoutxslt	2006-09-21 18:53:56.000000000 -0400
-+++ ./maven2/maven-profile/pom.xml	2006-09-21 18:53:59.000000000 -0400
-@@ -1,55 +1,60 @@
+--- ./maven2/maven-profile/pom.xml.withoutxslt	2006-10-05 14:42:29.000000000 -0400
++++ ./maven2/maven-profile/pom.xml	2006-10-05 14:42:32.000000000 -0400
+@@ -1,55 +1,59 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -12144,12 +12021,8 @@
 -      <artifactId>maven-model</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>profile</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
        <version>2.0.4</version>
 -    </dependency>
 -    <dependency>
@@ -12161,15 +12034,18 @@
 -      <artifactId>plexus-container-default</artifactId>
 -    </dependency>
 -  </dependencies>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-profile</artifactId>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Profile Model</name>  +   \
<modelVersion>4.0.0</modelVersion>  +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
 +            <version>1.0-alpha-8</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.modello</groupId> \
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">modello-maven-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <id>site-xsd</id>
@@ -12195,27 +12071,27 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-model</artifactId>  +     \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-container-default</artifactId>
  +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-core/pom.xml.withoutxslt	2006-09-21 18:53:59.000000000 -0400
-+++ ./maven2/maven-core/pom.xml	2006-09-21 18:54:01.000000000 -0400
-@@ -1,168 +1,179 @@
+--- ./maven2/maven-core/pom.xml.withoutxslt	2006-10-05 14:42:32.000000000 -0400
++++ ./maven2/maven-core/pom.xml	2006-10-05 14:42:34.000000000 -0400
+@@ -1,168 +1,178 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -12385,14 +12261,14 @@
 -  </distributionManagement>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>mavencore</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core</artifactId>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Core</name>  +   \
<distributionManagement xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      <site>
@@ -12404,9 +12280,8 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-assembly-plugin</artifactId>
 +            <version>2.1-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-assembly-plugin</artifactId>
  +            <configuration xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               \
<descriptor>src/assemble/bin.xml</descriptor>  +               \
<finalName>maven-${version}</finalName> @@ -12416,81 +12291,81 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>settings</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-settings</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>file</artifactId>
 +         <version>1.0-alpha-6</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.wagon</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">wagon-file</artifactId>  +      \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">runtime</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-parameter-documenter</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-parameter-documenter</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>http-lightweight</artifactId>
 +         <version>1.0-alpha-6</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.wagon</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">wagon-http-lightweight</artifactId>
  +         <scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">runtime</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>reporting-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.reporting</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-reporting-api</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>profile</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-profile</artifactId>  +   \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-model</artifactId>  +     \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>provider-api</artifactId>
 +         <version>1.0-alpha-6</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.wagon</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">wagon-provider-api</artifactId> \
+      </dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-container-default</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>repository-metadata</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-repository-metadata</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>error-diagnostics</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-error-diagnostics</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-project</artifactId>  +   \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-registry</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-registry</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>commons-cli</artifactId>
 +         <version>1.0</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">commons-cli</groupId> ++        \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">commons-cli</artifactId>  +     \
<exclusions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +            <exclusion>
 +               <artifactId>commons-lang</artifactId>
@@ -12503,25 +12378,25 @@
 +         </exclusions>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>ssh-external</artifactId>
 +         <version>1.0-alpha-6</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.wagon</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">wagon-ssh-external</artifactId> \
+         <scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">runtime</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-descriptor</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-descriptor</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>interactivity-api</artifactId>
 +         <version>1.0-alpha-1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-interactivity-api</artifactId>
  +         <exclusions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +            <exclusion>
 +               <artifactId>plexus-utils</artifactId>
@@ -12534,37 +12409,37 @@
 +         </exclusions>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-manager</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact-manager</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>monitor</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-monitor</artifactId>  +   \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>ssh</artifactId>
 +         <version>1.0-alpha-6</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.wagon</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">wagon-ssh</artifactId>  +       \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">runtime</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>classworlds</artifactId>
 +         <version>1.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">classworlds</groupId> ++        \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">classworlds</artifactId>  +     \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-core/src/test/resources/pom.xml.withoutxslt	2006-09-21 \
                18:54:01.000000000 -0400
-+++ ./maven2/maven-core/src/test/resources/pom.xml	2006-09-21 18:54:04.000000000 \
-0400 +--- ./maven2/maven-core/src/test/resources/pom.xml.withoutxslt	2006-10-05 \
14:42:34.000000000 -0400 ++++ \
./maven2/maven-core/src/test/resources/pom.xml	2006-10-05 14:42:37.000000000 -0400  \
                @@ -1,29 +1,30 @@
 -<model 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"> @@ -12597,9 +12472,9 @@
 -</model>
 +<?xml version="1.0" encoding="utf-8"?>
 +<model>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>mavencore</artifactId>
 +   <version>2.0.4</version>
++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core</artifactId>  +   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven</name>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2001</inceptionYear> @@ \
-12609,9 +12484,9 @@  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-model</artifactId>  +     \
<type xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</type>  +         <scope \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency> @@ -12626,8 +12501,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-core/src/test/resources/remote-repo-1/maven-test/poms/maven-test-b-1.0.pom.withoutxslt	2006-09-21 \
                18:54:04.000000000 -0400
-+++ ./maven2/maven-core/src/test/resources/remote-repo-1/maven-test/poms/maven-test-b-1.0.pom	2006-09-21 \
18:54:06.000000000 -0400 +--- \
./maven2/maven-core/src/test/resources/remote-repo-1/maven-test/poms/maven-test-b-1.0.pom.withoutxslt	2006-10-05 \
14:42:37.000000000 -0400 ++++ \
./maven2/maven-core/src/test/resources/remote-repo-1/maven-test/poms/maven-test-b-1.0.pom	2006-10-05 \
14:42:39.000000000 -0400  @@ -1,21 +1,23 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
@@ -12650,8 +12525,8 @@
 -      <scope>compile</scope>
 -    </dependency>
 -  </dependencies>
-+   <artifactId>maven-test-a</artifactId>
 +   <groupId>maven-test</groupId>
++   <artifactId>maven-test-a</artifactId>
 +   <packaging>jar</packaging>
 +   <dependencies>
 +      <dependency>
@@ -12672,8 +12547,8 @@
 +   <dependencyManagement/>
  </model>
 \ No newline at end of file
---- ./maven2/maven-repository-metadata/pom.xml.withoutxslt	2006-09-21 \
                18:54:06.000000000 -0400
-+++ ./maven2/maven-repository-metadata/pom.xml	2006-09-21 18:54:09.000000000 -0400
+--- ./maven2/maven-repository-metadata/pom.xml.withoutxslt	2006-10-05 \
14:42:39.000000000 -0400 ++++ ./maven2/maven-repository-metadata/pom.xml	2006-10-05 \
14:42:42.000000000 -0400  @@ -1,49 +1,52 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -12725,23 +12600,23 @@
 -  </dependencies>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>repository-metadata</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-repository-metadata</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Repository Metadata \
Model</name>  +   <description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Plugin \
Mapping</description>  +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
 +            <version>1.0-alpha-8</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.modello</groupId> \
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">modello-maven-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <id>site-xsd</id>
@@ -12768,17 +12643,17 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-error-diagnostics/pom.xml.withoutxslt	2006-09-21 \
                18:54:09.000000000 -0400
-+++ ./maven2/maven-error-diagnostics/pom.xml	2006-09-21 18:54:12.000000000 -0400
-@@ -1,20 +1,24 @@
+--- ./maven2/maven-error-diagnostics/pom.xml.withoutxslt	2006-10-05 \
14:42:42.000000000 -0400 ++++ ./maven2/maven-error-diagnostics/pom.xml	2006-10-05 \
14:42:44.000000000 -0400 +@@ -1,20 +1,23 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -12792,14 +12667,13 @@
 -  <description>Provides a manager component which will process a given Throwable \
instance through a set of diagnostic  +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>error-diagnostics</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-error-diagnostics</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Error Diagnostics</name>  \
+   <description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Provides a manager component \
                which will process a given Throwable instance through a set of \
                diagnostic
      sub-components, and return a String message with user-friendly information \
about the error and possibly @@ -12813,17 +12687,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-container-default</artifactId>
  +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-plugin-tools/maven-plugin-tools-java/pom.xml.withoutxslt	2006-09-21 \
                18:54:12.000000000 -0400
-+++ ./maven2/maven-plugin-tools/maven-plugin-tools-java/pom.xml	2006-09-21 \
                18:54:14.000000000 -0400
-@@ -1,28 +1,31 @@
+--- ./maven2/maven-plugin-tools/maven-plugin-tools-java/pom.xml.withoutxslt	2006-10-05 \
14:42:44.000000000 -0400 ++++ \
./maven2/maven-plugin-tools/maven-plugin-tools-java/pom.xml	2006-10-05 \
14:42:47.000000000 -0400 +@@ -1,28 +1,30 @@
 -<?xml version="1.0" encoding="UTF-8"?><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-plugin-tools</artifactId>
@@ -12840,12 +12714,8 @@
 -      <artifactId>maven-plugin-tools-api</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-tools-java</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>plugin-tools</artifactId>
        <version>2.0.4</version>
 -    </dependency>
 -    <dependency>
@@ -12859,32 +12729,35 @@
 -      <version>1.5</version>
 -    </dependency>
 -  </dependencies>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools</artifactId> \
++      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools-java</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Plugin Tools for \
Java</name>  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-tools-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools-api</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-descriptor</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-descriptor</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>qdox</artifactId>
 +         <version>1.5</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">qdox</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">qdox</artifactId>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-plugin-tools/maven-plugin-tools-api/pom.xml.withoutxslt	2006-09-21 \
                18:54:14.000000000 -0400
-+++ ./maven2/maven-plugin-tools/maven-plugin-tools-api/pom.xml	2006-09-21 \
                18:54:17.000000000 -0400
-@@ -1,27 +1,31 @@
+--- ./maven2/maven-plugin-tools/maven-plugin-tools-api/pom.xml.withoutxslt	2006-10-05 \
14:42:47.000000000 -0400 ++++ \
./maven2/maven-plugin-tools/maven-plugin-tools-api/pom.xml	2006-10-05 \
14:42:49.000000000 -0400 +@@ -1,27 +1,30 @@
 -<?xml version="1.0" encoding="UTF-8"?><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-plugin-tools</artifactId>
@@ -12901,12 +12774,8 @@
 -      <artifactId>maven-project</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-tools-api</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>plugin-tools</artifactId>
        <version>2.0.4</version>
 -    </dependency>
 -    <dependency>
@@ -12919,32 +12788,35 @@
 -      <artifactId>plexus-utils</artifactId>
 -    </dependency>
 -  </dependencies>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools</artifactId> \
++      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools-api</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Plugin Tools APIs</name>  \
+   <modelVersion>4.0.0</modelVersion>  +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-project</artifactId>  +   \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-descriptor</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-descriptor</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-plugin-tools/maven-plugin-tools-beanshell/pom.xml.withoutxslt	2006-09-21 \
                18:54:17.000000000 -0400
-+++ ./maven2/maven-plugin-tools/maven-plugin-tools-beanshell/pom.xml	2006-09-21 \
                18:54:20.000000000 -0400
-@@ -1,28 +1,31 @@
+--- ./maven2/maven-plugin-tools/maven-plugin-tools-beanshell/pom.xml.withoutxslt	2006-10-05 \
14:42:49.000000000 -0400 ++++ \
./maven2/maven-plugin-tools/maven-plugin-tools-beanshell/pom.xml	2006-10-05 \
14:42:52.000000000 -0400 +@@ -1,28 +1,30 @@
 -<?xml version="1.0" encoding="UTF-8"?><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-plugin-tools</artifactId>
@@ -12961,12 +12833,8 @@
 -      <artifactId>maven-plugin-tools-api</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-tools-beanshell</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>plugin-tools</artifactId>
        <version>2.0.4</version>
 -    </dependency>
 -    <dependency>
@@ -12980,32 +12848,35 @@
 -      <version>2.0.4</version>
 -    </dependency>
 -  </dependencies>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools</artifactId> \
++      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools-beanshell</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Plugin Tools for \
Beanshell</name>  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-tools-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools-api</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>bsh</artifactId>
 +         <version>1.3.0</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">bsh</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">bsh</artifactId>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-descriptor</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-descriptor</artifactId>
  +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-plugin-tools/pom.xml.withoutxslt	2006-09-21 18:54:20.000000000 \
                -0400
-+++ ./maven2/maven-plugin-tools/pom.xml	2006-09-21 18:54:22.000000000 -0400
-@@ -1,21 +1,24 @@
+--- ./maven2/maven-plugin-tools/pom.xml.withoutxslt	2006-10-05 14:42:52.000000000 \
-0400 ++++ ./maven2/maven-plugin-tools/pom.xml	2006-10-05 14:42:54.000000000 -0400
+@@ -1,21 +1,23 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -13028,14 +12899,14 @@
 -  </modules>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-tools</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools</artifactId> \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Plugin Tools Base \
POM</name>  +   <modules xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> @@ -13046,13 +12917,12 @@
 +      <module>maven-plugin-tools-model</module>
 +      <module>maven-plugin-tools-ant</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-plugin-tools/maven-plugin-tools-model/pom.xml.withoutxslt	2006-09-21 \
                18:54:22.000000000 -0400
-+++ ./maven2/maven-plugin-tools/maven-plugin-tools-model/pom.xml	2006-09-21 \
18:54:25.000000000 -0400 +--- \
./maven2/maven-plugin-tools/maven-plugin-tools-model/pom.xml.withoutxslt	2006-10-05 \
14:42:54.000000000 -0400 ++++ \
./maven2/maven-plugin-tools/maven-plugin-tools-model/pom.xml	2006-10-05 \
14:42:57.000000000 -0400  @@ -1,57 +1,61 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -13101,12 +12971,8 @@
 -      <artifactId>maven-plugin-descriptor</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-tools-model</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>plugin-tools</artifactId>
        <version>2.0.4</version>
 -    </dependency>
 -    <dependency>
@@ -13118,15 +12984,19 @@
 -      <artifactId>plexus-container-default</artifactId>
 -    </dependency>
 -  </dependencies>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools</artifactId> \
++      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools-model</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Plugin Metadata \
Model</name>  +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
 +            <version>1.0-alpha-8</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.modello</groupId> \
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">modello-maven-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <id>site-xsd</id>
@@ -13153,27 +13023,27 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-descriptor</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-descriptor</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-container-default</artifactId>
  +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml.withoutxslt	2006-09-21 \
                18:54:25.000000000 -0400
-+++ ./maven2/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml	2006-09-21 \
                18:54:27.000000000 -0400
-@@ -1,28 +1,31 @@
+--- ./maven2/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml.withoutxslt	2006-10-05 \
14:42:57.000000000 -0400 ++++ \
./maven2/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml	2006-10-05 \
14:42:59.000000000 -0400 +@@ -1,28 +1,30 @@
 -<?xml version="1.0" encoding="UTF-8"?><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-plugin-tools</artifactId>
@@ -13190,12 +13060,8 @@
 -      <artifactId>maven-plugin-tools-api</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-tools-pluggy</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>plugin-tools</artifactId>
        <version>2.0.4</version>
 -    </dependency>
 -    <dependency>
@@ -13209,31 +13075,34 @@
 -      <version>2.0.4</version>
 -    </dependency>
 -  </dependencies>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools</artifactId> \
++      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools-pluggy</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Pluggy Simplistic Plugin \
Generator</name>  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-tools-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools-api</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-model</artifactId>  +     \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-tools-java</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools-java</artifactId>
  +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-plugin-tools/maven-plugin-tools-ant/pom.xml.withoutxslt	2006-09-21 \
                18:54:27.000000000 -0400
-+++ ./maven2/maven-plugin-tools/maven-plugin-tools-ant/pom.xml	2006-09-21 \
18:54:30.000000000 -0400 +--- \
./maven2/maven-plugin-tools/maven-plugin-tools-ant/pom.xml.withoutxslt	2006-10-05 \
14:42:59.000000000 -0400 ++++ \
./maven2/maven-plugin-tools/maven-plugin-tools-ant/pom.xml	2006-10-05 \
14:43:02.000000000 -0400  @@ -1,33 +1,36 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -13252,12 +13121,8 @@
 -      <artifactId>maven-plugin-tools-api</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-tools-ant</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>plugin-tools</artifactId>
        <version>2.0.4</version>
 -    </dependency>
 -    <dependency>
@@ -13275,37 +13140,41 @@
 -      <artifactId>plexus-utils</artifactId>
 -    </dependency>
 -  </dependencies>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools</artifactId> \
++      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools-ant</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Ant Plugin Tools</name>  \
+   <modelVersion>4.0.0</modelVersion>  +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-tools-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools-api</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-descriptor</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-descriptor</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-tools-model</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools-model</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/referenceParameter/pom.xml.withoutxslt	2006-09-21 \
                18:54:30.000000000 -0400
-+++ ./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/referenceParameter/pom.xml	2006-09-21 \
                18:54:33.000000000 -0400
-@@ -1,41 +1,42 @@
+--- ./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/referenceParameter/pom.xml.withoutxslt	2006-10-05 \
14:43:02.000000000 -0400 ++++ \
./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/referenceParameter/pom.xml	2006-10-05 \
14:43:04.000000000 -0400 +@@ -1,41 +1,41 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<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 \
                ../../../../maven-site/target/site/maven-v4_0_0.xsd ">
 -  <modelVersion>4.0.0</modelVersion>
@@ -13349,9 +13218,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-ant-it-referenceParameter</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-ant-it-referenceParameter</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Ant-Mojo Integration Test with \
non-String parameter</name>  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Tests using an Ant script to \
drive a mojo where a parameter is not a String type.</description> @@ -13359,17 \
+13228,16 @@  +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-plugin-plugin</artifactId>
 +            <version>2.1.1-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-plugin</artifactId>
  +            <configuration xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               \
<goalPrefix>antWithRefs</goalPrefix>  +            </configuration>
 +            <dependencies>
 +               <dependency>
-+                  <groupId>JPP/maven2</groupId>
-+                  <artifactId>plugin-tools-ant</artifactId>
 +                  <version>2.0.4</version>
++                  <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools-ant</artifactId>
  +               </dependency>
 +            </dependencies>
 +         </plugin>
@@ -13377,22 +13245,22 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>script-ant</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-script-ant</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>ant</artifactId>
 +         <version>1.6.5</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">ant</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">ant</artifactId>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/basic/pom.xml.withoutxslt	2006-09-21 \
                18:54:33.000000000 -0400
-+++ ./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/basic/pom.xml	2006-09-21 \
                18:54:35.000000000 -0400
-@@ -1,36 +1,37 @@
+--- ./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/basic/pom.xml.withoutxslt	2006-10-05 \
14:43:04.000000000 -0400 ++++ \
./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/basic/pom.xml	2006-10-05 \
14:43:07.000000000 -0400 +@@ -1,36 +1,36 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<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 \
                ../../../../maven-site/target/site/maven-v4_0_0.xsd ">
 -  <modelVersion>4.0.0</modelVersion>
@@ -13431,9 +13299,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-ant-it-basic</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.ant.it</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.ant.it</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-ant-it-basic</artifactId> \
+   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Basic Ant-Mojo Integration \
Test</name>  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Tests the simplest case of \
using an Ant script to drive a mojo.</description> @@ -13441,17 +13309,16 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-plugin-plugin</artifactId>
 +            <version>2.1.1-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-plugin</artifactId>
  +            <configuration xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               \
<prefix>antBasic</prefix>  +            </configuration>
 +            <dependencies>
 +               <dependency>
-+                  <groupId>JPP/maven2</groupId>
-+                  <artifactId>plugin-tools-ant</artifactId>
 +                  <version>2.0.4</version>
++                  <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools-ant</artifactId>
  +               </dependency>
 +            </dependencies>
 +         </plugin>
@@ -13459,16 +13326,16 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>ant</artifactId>
 +         <version>1.6.5</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">ant</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">ant</artifactId>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/pom.xml.withoutxslt	2006-09-21 \
                18:54:38.000000000 -0400
-+++ ./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/pom.xml	2006-09-21 \
18:54:41.000000000 -0400 +--- \
./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/pom.xml.withoutxslt	2006-10-05 \
14:43:09.000000000 -0400 ++++ \
./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/pom.xml	2006-10-05 \
14:43:11.000000000 -0400  @@ -1,24 +1,22 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<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 \
../../../../maven-site/target/site/maven-v4_0_0.xsd "> @@ -13496,9 +13363,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">simpleUsage-root</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.ant.it</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.ant.it</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">simpleUsage-root</artifactId>  \
+   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Simple-Usage Ant-Mojo \
Integration Test - Root</name>  +   <packaging \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Tests the simplest case of \
using an Ant script to drive a mojo.</description> @@ -13509,17 +13376,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>ant</artifactId>
 +         <version>1.6.5</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">ant</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">ant</artifactId>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/pom.xml.withoutxslt	2006-09-21 \
                18:54:35.000000000 -0400
-+++ ./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/pom.xml	2006-09-21 \
                18:54:38.000000000 -0400
-@@ -1,45 +1,46 @@
+--- ./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/pom.xml.withoutxslt	2006-10-05 \
14:43:07.000000000 -0400 ++++ \
./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/pom.xml	2006-10-05 \
14:43:09.000000000 -0400 +@@ -1,45 +1,45 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<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 \
                ../../../../maven-site/target/site/maven-v4_0_0.xsd ">
 -  <modelVersion>4.0.0</modelVersion>
@@ -13567,12 +13434,12 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">simpleUsage-plugin</artifactId> \
+   <parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.ant.it</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">simpleUsage-root</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">simpleUsage-plugin</artifactId> \
+   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Simple Ant-Mojo</name>  +   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Tests the simplest case of \
using an Ant script to drive a mojo.</description> @@ -13581,17 +13448,16 @@
 +      <scriptSourceDirectory xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">src/main/scripts</scriptSourceDirectory>
  +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-plugin-plugin</artifactId>
 +            <version>2.1.1-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-plugin</artifactId>
  +            <configuration xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               \
<prefix>antSimpleUsage</prefix>  +            </configuration>
 +            <dependencies>
 +               <dependency>
-+                  <groupId>JPP/maven2</groupId>
-+                  <artifactId>plugin-tools-ant</artifactId>
 +                  <version>2.0.4</version>
++                  <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools-ant</artifactId>
  +               </dependency>
 +            </dependencies>
 +         </plugin>
@@ -13599,21 +13465,21 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>ant</artifactId>
 +         <version>1.6.5</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">ant</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">ant</artifactId>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>script-ant</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-script-ant</artifactId>  \
+      </dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/usage/pom.xml.withoutxslt	2006-09-21 \
                18:54:41.000000000 -0400
-+++ ./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/usage/pom.xml	2006-09-21 \
18:54:43.000000000 -0400 +--- \
./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/usage/pom.xml.withoutxslt	2006-10-05 \
14:43:11.000000000 -0400 ++++ \
./maven2/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/usage/pom.xml	2006-10-05 \
14:43:14.000000000 -0400  @@ -1,51 +1,48 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<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 \
../../../../maven-site/target/site/maven-v4_0_0.xsd "> @@ -13668,12 +13534,12 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">simpleUsage-usage</artifactId>  \
+   <parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.ant.it</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">simpleUsage-root</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">simpleUsage-usage</artifactId>  \
+   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Simple Ant-Mojo Usage \
Case</name>  +   <description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Tests the simplest case of \
using an Ant script to drive a mojo.</description>  +   \
<modelVersion>4.0.0</modelVersion> @@ -13685,9 +13551,9 @@
 +            <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +       \
<dependencies>  +               <dependency>
-+                  <groupId>JPP/plexus</groupId>
-+                  <artifactId>ant-factory</artifactId>
 +                  <version>1.0-alpha-1</version>
++                  <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++                  <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-ant-factory</artifactId> \
+               </dependency>  +            </dependencies>
 +            <configuration xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> @@ -13707,16 +13573,16 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>ant</artifactId>
 +         <version>1.6.5</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">ant</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">ant</artifactId>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-embedder-it/pom.xml.withoutxslt	2006-09-21 18:54:43.000000000 \
                -0400
-+++ ./maven2/maven-embedder-it/pom.xml	2006-09-21 18:54:46.000000000 -0400
+--- ./maven2/maven-embedder-it/pom.xml.withoutxslt	2006-10-05 14:43:14.000000000 \
-0400 ++++ ./maven2/maven-embedder-it/pom.xml	2006-10-05 14:43:16.000000000 -0400
 @@ -1,20 +1,22 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -13732,37 +13598,36 @@
 -  <version>2.0-beta-2-SNAPSHOT</version>
 -  <dependencies>
 -    <dependency>
--      <groupId>org.apache.maven</groupId>
++   <version>2.0-beta-2-SNAPSHOT</version>
++   <parent>
++      <version>2.0.4</version>
++      <artifactId>maven</artifactId>
+       <groupId>org.apache.maven</groupId>
 -      <artifactId>maven-embedder</artifactId>
 -      <version>2.0-beta-2-SNAPSHOT</version>
 -      <classifier>dep</classifier>
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <artifactId>maven-embedder-it</artifactId>
-+   <groupId>org.apache.maven</groupId>
-+   <version>2.0-beta-2-SNAPSHOT</version>
-+   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
-+      <version>2.0.4</version>
 +   </parent>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-embedder-it</artifactId>
 +   <name>Maven Embedder Integration Tests</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>embedder</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-embedder</artifactId>
 +         <classifier>dep</classifier>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-monitor/pom.xml.withoutxslt	2006-09-21 18:54:46.000000000 -0400
-+++ ./maven2/maven-monitor/pom.xml	2006-09-21 18:54:48.000000000 -0400
-@@ -1,12 +1,15 @@
+--- ./maven2/maven-monitor/pom.xml.withoutxslt	2006-10-05 14:43:16.000000000 -0400
++++ ./maven2/maven-monitor/pom.xml	2006-10-05 14:43:19.000000000 -0400
+@@ -1,12 +1,14 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -13776,22 +13641,21 @@
 -  <version>2.0.4</version>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>monitor</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-monitor</artifactId>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven \
                Monitor</name>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-plugin-descriptor/pom.xml.withoutxslt	2006-09-21 \
                18:54:48.000000000 -0400
-+++ ./maven2/maven-plugin-descriptor/pom.xml	2006-09-21 18:54:51.000000000 -0400
+--- ./maven2/maven-plugin-descriptor/pom.xml.withoutxslt	2006-10-05 \
14:43:19.000000000 -0400 ++++ ./maven2/maven-plugin-descriptor/pom.xml	2006-10-05 \
14:43:21.000000000 -0400  @@ -1,57 +1,60 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -13839,12 +13703,8 @@
 -      <artifactId>maven-plugin-api</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-descriptor</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
        <version>2.0.4</version>
 -    </dependency>
 -    <dependency>
@@ -13857,15 +13717,19 @@
 -      <artifactId>plexus-container-default</artifactId>
 -    </dependency>
 -  </dependencies>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-descriptor</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Plugin Descriptor \
Model</name>  +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
 +            <version>1.0-alpha-8</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.modello</groupId> \
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">modello-maven-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <id>site-xsd</id>
@@ -13891,26 +13755,26 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-container-default</artifactId>
  +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-repository-tools/pom.xml.withoutxslt	2006-09-21 \
                18:54:51.000000000 -0400
-+++ ./maven2/maven-repository-tools/pom.xml	2006-09-21 18:54:54.000000000 -0400
+--- ./maven2/maven-repository-tools/pom.xml.withoutxslt	2006-10-05 \
14:43:21.000000000 -0400 ++++ ./maven2/maven-repository-tools/pom.xml	2006-10-05 \
14:43:24.000000000 -0400  @@ -1,60 +1,61 @@
 -<model 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"> @@ -13974,24 +13838,24 @@
 -</model>
 +<?xml version="1.0" encoding="utf-8"?>
 +<model>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-repository-tools</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-repository-tools</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Repo Reaper</name>  +   \
<modelVersion>4.0.0</modelVersion>  +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>mavencore</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core</artifactId>  +      \
<type xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</type>  +         <scope \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-model</artifactId>  +     \
<type xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</type>  +         <scope \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency> @@ -14003,9 +13867,9 @@
 +         <scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>dom4j</artifactId>
 +         <version>1.6.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">dom4j</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">dom4j</artifactId>  +         \
<type xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</type>  +         <scope \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency> @@ -14024,9 +13888,9 @@
 +         <scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact</artifactId>  +  \
<type xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</type>  +         <scope \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency> @@ -14034,9 +13898,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/integration-tests/maven-core-it-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:54:54.000000000 -0400
-+++ ./maven2/integration-tests/maven-core-it-plugin/pom.xml	2006-09-21 \
                18:54:57.000000000 -0400
-@@ -1,46 +1,48 @@
+--- ./maven2/integration-tests/maven-core-it-plugin/pom.xml.withoutxslt	2006-10-05 \
14:43:24.000000000 -0400 ++++ \
./maven2/integration-tests/maven-core-it-plugin/pom.xml	2006-10-05 14:43:26.000000000 \
-0400 +@@ -1,46 +1,47 @@
 -<model 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>
@@ -14056,12 +13920,8 @@
 -      <artifactId>maven-project</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<model>
-+   <artifactId>maven-core-it-plugin</artifactId>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <version>2.0.4-JPP</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>maven-plugin-parent</artifactId>
        <version>2.0</version>
 -    </dependency>
 -    <dependency>
@@ -14091,49 +13951,52 @@
 -    </dependency>
 -  </dependencies>
 -</model>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-parent</artifactId>
 ++      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-plugin</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Core Integration Test \
Plugin</name>  +   <inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2001</inceptionYear>  +   \
<modelVersion>4.0.0</modelVersion>  +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-project</artifactId>  +   \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-archiver</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>jline</artifactId>
 +         <version>1.0.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jline</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jline</artifactId>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>bsh</artifactId>
 +         <version>1.3.0</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">bsh</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">bsh</artifactId>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>xalan-j2</artifactId>
 +         <version>1.0.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">xalan</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">xalan</artifactId>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/integration-tests/maven-core-it-support/1.2/pom.xml.withoutxslt	2006-09-21 \
                18:54:57.000000000 -0400
-+++ ./maven2/integration-tests/maven-core-it-support/1.2/pom.xml	2006-09-21 \
                18:54:59.000000000 -0400
-@@ -1,31 +1,33 @@
+--- ./maven2/integration-tests/maven-core-it-support/1.2/pom.xml.withoutxslt	2006-10-05 \
14:43:26.000000000 -0400 ++++ \
./maven2/integration-tests/maven-core-it-support/1.2/pom.xml	2006-10-05 \
14:43:29.000000000 -0400 +@@ -1,31 +1,32 @@
 -<model 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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -14167,9 +14030,9 @@
 -</model>
 +<?xml version="1.0" encoding="utf-8"?>
 +<model>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-support</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.2</version> ++   <groupId \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-support</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">coreit-packaging</packaging>  + \
<distributionManagement xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      <repository>
@@ -14184,14 +14047,13 @@
 +         <url>http://snapshots.maven.codehaus.org/maven2/</url>
 +      </pluginRepository>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-plugin</artifactId>
  +            <extensions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</extensions>  +         \
</plugin>  +      </plugins>
@@ -14199,8 +14061,8 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/integration-tests/maven-core-it-support/1.3/pom.xml.withoutxslt	2006-09-21 \
                18:54:59.000000000 -0400
-+++ ./maven2/integration-tests/maven-core-it-support/1.3/pom.xml	2006-09-21 \
18:55:02.000000000 -0400 +--- \
./maven2/integration-tests/maven-core-it-support/1.3/pom.xml.withoutxslt	2006-10-05 \
14:43:29.000000000 -0400 ++++ \
./maven2/integration-tests/maven-core-it-support/1.3/pom.xml	2006-10-05 \
14:43:31.000000000 -0400  @@ -1,44 +1,45 @@
 -<model 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"> @@ -14248,9 +14110,9 @@
 -</model>
 +<?xml version="1.0" encoding="utf-8"?>
 +<model>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-support</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.3</version> ++   <groupId \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-support</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<distributionManagement xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      <repository>
@@ -14269,18 +14131,18 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-plugin</artifactId>
  +            <extensions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</extensions>  +         \
</plugin>  +      </plugins>
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>commons-lang</artifactId>
 +         <version>2.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">commons-lang</groupId> ++       \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">commons-lang</artifactId>  +    \
<exclusions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +            <exclusion>
 +               <groupId>junit</groupId>
@@ -14292,9 +14154,9 @@
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/integration-tests/maven-core-it-support/1.1-old-location/pom.xml.withoutxslt	2006-09-21 \
                18:55:02.000000000 -0400
-+++ ./maven2/integration-tests/maven-core-it-support/1.1-old-location/pom.xml	2006-09-21 \
                18:55:04.000000000 -0400
-@@ -1,19 +1,21 @@
+--- ./maven2/integration-tests/maven-core-it-support/1.1-old-location/pom.xml.withoutxslt	2006-10-05 \
14:43:31.000000000 -0400 ++++ \
./maven2/integration-tests/maven-core-it-support/1.1-old-location/pom.xml	2006-10-05 \
14:43:33.000000000 -0400 +@@ -1,19 +1,20 @@
 -<model 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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -14316,9 +14178,9 @@
 -</model>
 +<?xml version="1.0" encoding="utf-8"?>
 +<model>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-support-old-location</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.1</version> ++   <groupId \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-support-old-location</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<distributionManagement xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      <repository>
@@ -14331,14 +14193,13 @@
 +         <message>Testing</message>
 +      </relocation>
 +   </distributionManagement>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/integration-tests/maven-core-it-support/1.1/pom.xml.withoutxslt	2006-09-21 \
                18:55:04.000000000 -0400
-+++ ./maven2/integration-tests/maven-core-it-support/1.1/pom.xml	2006-09-21 \
                18:55:07.000000000 -0400
-@@ -1,15 +1,17 @@
+--- ./maven2/integration-tests/maven-core-it-support/1.1/pom.xml.withoutxslt	2006-10-05 \
14:43:33.000000000 -0400 ++++ \
./maven2/integration-tests/maven-core-it-support/1.1/pom.xml	2006-10-05 \
14:43:36.000000000 -0400 +@@ -1,15 +1,16 @@
 -<model 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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -14356,9 +14217,9 @@
 -</model>
 +<?xml version="1.0" encoding="utf-8"?>
 +<model>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-support</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.1</version> ++   <groupId \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-support</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<distributionManagement xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      <repository>
@@ -14367,13 +14228,12 @@
 +         <url>scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2</url>
  +      </repository>
 +   </distributionManagement>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/integration-tests/maven-core-it-support/1.4/pom.xml.withoutxslt	2006-09-21 \
                18:55:07.000000000 -0400
-+++ ./maven2/integration-tests/maven-core-it-support/1.4/pom.xml	2006-09-21 \
18:55:09.000000000 -0400 +--- \
./maven2/integration-tests/maven-core-it-support/1.4/pom.xml.withoutxslt	2006-10-05 \
14:43:36.000000000 -0400 ++++ \
./maven2/integration-tests/maven-core-it-support/1.4/pom.xml	2006-10-05 \
14:43:38.000000000 -0400  @@ -1,38 +1,39 @@
 -<model 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"> @@ -14415,9 +14275,9 @@
 -</model>
 +<?xml version="1.0" encoding="utf-8"?>
 +<model>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-support</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.4</version> ++   <groupId \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-support</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<distributionManagement xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      <repository>
@@ -14436,26 +14296,26 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <artifactId>maven-core-it-plugin</artifactId>
-+            <groupId>org.apache.maven.plugins</groupId>
 +            <version>2.0.4-JPP</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-plugin</artifactId>
  +            <extensions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</extensions>  +         \
</plugin>  +      </plugins>
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>commons-io</artifactId>
 +         <version>1.0</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">commons-io</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">commons-io</artifactId>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/integration-tests/maven-core-it-support/1.0/pom.xml.withoutxslt	2006-09-21 \
                18:55:09.000000000 -0400
-+++ ./maven2/integration-tests/maven-core-it-support/1.0/pom.xml	2006-09-21 \
                18:55:12.000000000 -0400
-@@ -1,15 +1,17 @@
+--- ./maven2/integration-tests/maven-core-it-support/1.0/pom.xml.withoutxslt	2006-10-05 \
14:43:38.000000000 -0400 ++++ \
./maven2/integration-tests/maven-core-it-support/1.0/pom.xml	2006-10-05 \
14:43:40.000000000 -0400 +@@ -1,15 +1,16 @@
 -<model 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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -14473,9 +14333,9 @@
 -</model>
 +<?xml version="1.0" encoding="utf-8"?>
 +<model>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-support</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0</version> ++   <groupId \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-support</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<distributionManagement xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      <repository>
@@ -14484,14 +14344,13 @@
 +         <url>scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2</url>
  +      </repository>
 +   </distributionManagement>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./maven2/maven-reporting/maven-reporting-impl/pom.xml.withoutxslt	2006-09-21 \
                18:55:12.000000000 -0400
-+++ ./maven2/maven-reporting/maven-reporting-impl/pom.xml	2006-09-21 \
                18:55:14.000000000 -0400
-@@ -1,59 +1,62 @@
+--- ./maven2/maven-reporting/maven-reporting-impl/pom.xml.withoutxslt	2006-10-05 \
14:43:40.000000000 -0400 ++++ \
./maven2/maven-reporting/maven-reporting-impl/pom.xml	2006-10-05 14:43:43.000000000 \
-0400 +@@ -1,59 +1,61 @@
 -<?xml version="1.0" encoding="UTF-8"?><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-reporting</artifactId>
@@ -14519,12 +14378,8 @@
 -      <artifactId>maven-project</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>reporting-impl</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>reporting</artifactId>
        <version>2.0.4</version>
 -    </dependency>
 -    <dependency>
@@ -14558,7 +14413,10 @@
 -      <version>1.0-alpha-7</version>
 -    </dependency>
 -  </dependencies>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-reporting</artifactId> ++ \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.reporting</groupId>
  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-reporting-impl</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Reporting \
Implementation</name>  +   <developers xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      <developer>
@@ -14574,47 +14432,47 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-project</artifactId>  +   \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>commons-validator</artifactId>
 +         <version>1.1.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">commons-validator</groupId> ++  \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">commons-validator</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP/maven-doxia</groupId>
-+         <artifactId>core</artifactId>
 +         <version>1.0-alpha-7</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.doxia</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">doxia-core</artifactId>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>oro</artifactId>
 +         <version>2.0.7</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">oro</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">oro</artifactId>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>reporting-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.reporting</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-reporting-api</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-doxia</groupId>
-+         <artifactId>site-renderer</artifactId>
 +         <version>1.0-alpha-7</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.doxia</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">doxia-site-renderer</artifactId>
  +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-reporting/pom.xml.withoutxslt	2006-09-21 18:55:14.000000000 -0400
-+++ ./maven2/maven-reporting/pom.xml	2006-09-21 18:55:17.000000000 -0400
-@@ -1,17 +1,20 @@
+--- ./maven2/maven-reporting/pom.xml.withoutxslt	2006-10-05 14:43:43.000000000 -0400
++++ ./maven2/maven-reporting/pom.xml	2006-10-05 14:43:45.000000000 -0400
+@@ -1,17 +1,19 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -14633,28 +14491,27 @@
 -  </modules>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>reporting</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.reporting</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-reporting</artifactId>  + \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Reporting</name>  +   \
<modules xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>maven-reporting-api</module>  +      <module>maven-reporting-impl</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-reporting/maven-reporting-api/pom.xml.withoutxslt	2006-09-21 \
                18:55:17.000000000 -0400
-+++ ./maven2/maven-reporting/maven-reporting-api/pom.xml	2006-09-21 \
                18:55:19.000000000 -0400
-@@ -1,29 +1,32 @@
+--- ./maven2/maven-reporting/maven-reporting-api/pom.xml.withoutxslt	2006-10-05 \
14:43:45.000000000 -0400 ++++ \
./maven2/maven-reporting/maven-reporting-api/pom.xml	2006-10-05 14:43:48.000000000 \
-0400 +@@ -1,29 +1,31 @@
 -<?xml version="1.0" encoding="UTF-8"?><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-reporting</artifactId>
@@ -14685,14 +14542,13 @@
 -  </dependencies>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>reporting-api</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>reporting</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-reporting</artifactId> ++ \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.reporting</groupId>
  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-reporting-api</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Reporting API</name>  +   \
<developers xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      <developer>
@@ -14708,16 +14564,16 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven-doxia</groupId>
-+         <artifactId>sink-api</artifactId>
 +         <version>1.0-alpha-7</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.doxia</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">doxia-sink-api</artifactId>  +  \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-artifact-test/pom.xml.withoutxslt	2006-09-21 18:55:19.000000000 \
                -0400
-+++ ./maven2/maven-artifact-test/pom.xml	2006-09-21 18:55:22.000000000 -0400
+--- ./maven2/maven-artifact-test/pom.xml.withoutxslt	2006-10-05 14:43:48.000000000 \
-0400 ++++ ./maven2/maven-artifact-test/pom.xml	2006-10-05 14:43:50.000000000 -0400
 @@ -1,39 +1,42 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -14742,12 +14598,8 @@
 -      <artifactId>maven-settings</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>artifact-test</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
        <version>2.0.4</version>
 -    </dependency>
 -    <dependency>
@@ -14765,43 +14617,47 @@
 -      <artifactId>plexus-container-default</artifactId>
 -    </dependency>
 -  </dependencies>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact-test</artifactId>
  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Artifact Test Helper \
Library</name>  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">compile</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>settings</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-settings</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-manager</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact-manager</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-container-default</artifactId>
  +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-artifact-ant/sample-build-test.pom.withoutxslt	2006-09-21 \
                18:55:22.000000000 -0400
-+++ ./maven2/maven-artifact-ant/sample-build-test.pom	2006-09-21 18:55:25.000000000 \
                -0400
-@@ -1,6 +1,9 @@
+--- ./maven2/maven-artifact-ant/sample-build-test.pom.withoutxslt	2006-10-05 \
14:43:50.000000000 -0400 ++++ \
./maven2/maven-artifact-ant/sample-build-test.pom	2006-10-05 14:43:53.000000000 -0400 \
                +@@ -1,6 +1,8 @@
 -<project>
 -  <modelVersion>4.0.0</modelVersion>
 -  <groupId>org.apache.maven.test</groupId>
@@ -14810,17 +14666,16 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId>sample-build-test</artifactId>
-+   <groupId>org.apache.maven.test</groupId>
 +   <version>2.0-beta-4-SNAPSHOT</version>
-+   <dependencies/>
++   <groupId>org.apache.maven.test</groupId>
++   <artifactId>sample-build-test</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-artifact-ant/pom.xml.withoutxslt	2006-09-21 18:55:25.000000000 \
                -0400
-+++ ./maven2/maven-artifact-ant/pom.xml	2006-09-21 18:55:27.000000000 -0400
-@@ -1,93 +1,103 @@
+--- ./maven2/maven-artifact-ant/pom.xml.withoutxslt	2006-10-05 14:43:53.000000000 \
-0400 ++++ ./maven2/maven-artifact-ant/pom.xml	2006-10-05 14:43:55.000000000 -0400
+@@ -1,93 +1,101 @@
 -<?xml version="1.0" encoding="UTF-8"?><project>
 -  <parent>
 -    <artifactId>maven</artifactId>
@@ -14849,7 +14704,13 @@
 -      <scope>test</scope>
 -    </dependency>
 -    <dependency>
--      <groupId>org.apache.maven</groupId>
++<?xml version="1.0" encoding="utf-8"?>
++<project>
++   <version>2.0.4-SNAPSHOT</version>
++   <parent>
++      <version>2.0.4</version>
++      <artifactId>maven</artifactId>
+       <groupId>org.apache.maven</groupId>
 -      <artifactId>maven-project</artifactId>
 -      <version>2.0.2</version>
 -      <exclusions>
@@ -14913,24 +14774,15 @@
 -      <artifactId>plexus-container-default</artifactId>
 -    </dependency>
 -  </dependencies>
-+<?xml version="1.0" encoding="utf-8"?>
-+<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>artifact-ant</artifactId>
-+   <version>2.0.4-SNAPSHOT</version>
-+   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
-+      <version>2.0.4</version>
 +   </parent>
++   <artifactId>maven-artifact-ant</artifactId>
 +   <name>Maven Tasks for Ant</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-assembly-plugin</artifactId>
 +            <version>2.1-SNAPSHOT</version>
++            <artifactId>maven-assembly-plugin</artifactId>
 +            <configuration>
 +               <descriptor>src/main/assembly/dep.xml</descriptor>
 +            </configuration>
@@ -14939,15 +14791,15 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +         <exclusions>
 +            <exclusion>
 +               <artifactId>junit</artifactId>
@@ -14956,36 +14808,36 @@
 +         </exclusions>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>error-diagnostics</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-error-diagnostics</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>settings</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-settings</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>file</artifactId>
 +         <version>1.0-alpha-6</version>
++         <groupId>org.apache.maven.wagon</groupId>
++         <artifactId>wagon-file</artifactId>
 +         <scope>runtime</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>http-lightweight</artifactId>
 +         <version>1.0-alpha-6</version>
++         <groupId>org.apache.maven.wagon</groupId>
++         <artifactId>wagon-http-lightweight</artifactId>
 +         <scope>runtime</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>ant</artifactId>
 +         <version>1.6.5</version>
++         <groupId>ant</groupId>
++         <artifactId>ant</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-manager</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact-manager</artifactId>
 +         <exclusions>
 +            <exclusion>
 +               <artifactId>junit</artifactId>
@@ -14994,32 +14846,32 @@
 +         </exclusions>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-utils</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>provider-api</artifactId>
 +         <version>1.0-alpha-6</version>
++         <groupId>org.apache.maven.wagon</groupId>
++         <artifactId>wagon-provider-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-container-default</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/pom.xml.withoutxslt	2006-09-21 18:55:27.000000000 -0400
-+++ ./maven2/maven-project/pom.xml	2006-09-21 18:55:30.000000000 -0400
-@@ -1,54 +1,59 @@
+--- ./maven2/maven-project/pom.xml.withoutxslt	2006-10-05 14:43:55.000000000 -0400
++++ ./maven2/maven-project/pom.xml	2006-10-05 14:43:58.000000000 -0400
+@@ -1,54 +1,58 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -15033,14 +14885,13 @@
 -  <description>This library is used to not only read Maven project object model \
files, but to assemble inheritence  +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>project</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-project</artifactId>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Project Builder</name>  + \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">This library is used to not \
only read Maven project object model files, but to assemble inheritence  and to \
retrieve remote models as required.</description> @@ -15088,53 +14939,53 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>settings</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-settings</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-test</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact-test</artifactId>
  +         <scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>profile</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-profile</artifactId>  +   \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-model</artifactId>  +     \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-manager</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact-manager</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-container-default</artifactId>
  +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/canonical-pom.xml.withoutxslt	2006-09-21 \
                18:57:15.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/canonical-pom.xml	2006-09-21 \
                18:57:18.000000000 -0400
-@@ -1,32 +1,33 @@
+--- ./maven2/maven-project/src/test/resources/canonical-pom.xml.withoutxslt	2006-10-05 \
14:45:37.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/canonical-pom.xml	2006-10-05 \
14:45:39.000000000 -0400 +@@ -1,32 +1,32 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 +<?xml version="1.0" encoding="utf-8"?>
@@ -15159,11 +15010,10 @@
 -            <goals>
 -              <goal>plexus:runtime</goal>
 -            </goals>
-+   <artifactId>maven-core</artifactId>
-+   <groupId>maven</groupId>
 +   <version>2.0-SNAPSHOT</version>
++   <groupId>maven</groupId>
++   <artifactId>maven-core</artifactId>
 +   <name>Maven</name>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
@@ -15198,9 +15048,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom.withoutxslt	2006-09-21 \
                18:55:38.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom	2006-09-21 \
                18:55:40.000000000 -0400
-@@ -1,7 +1,10 @@
+--- ./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom.withoutxslt	2006-10-05 \
14:44:05.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom	2006-10-05 \
14:44:07.000000000 -0400 +@@ -1,7 +1,9 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -15208,17 +15058,16 @@
 -  <artifactId>maven-test-d</artifactId>
 -  <packaging>jar</packaging>
 -  <version>1.1</version>
-+   <artifactId>maven-test-d</artifactId>
-+   <groupId>maven-test</groupId>
 +   <version>1.1</version>
++   <groupId>maven-test</groupId>
++   <artifactId>maven-test-d</artifactId>
 +   <packaging>jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom.withoutxslt	2006-09-21 \
                18:55:30.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom	2006-09-21 \
18:55:33.000000000 -0400 +--- \
./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom.withoutxslt	2006-10-05 \
14:43:58.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom	2006-10-05 \
14:44:00.000000000 -0400  @@ -1,23 +1,25 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -15243,9 +15092,9 @@
 -      <scope>compile</scope>
 -    </dependency>
 -  </dependencies>
-+   <artifactId>maven-test-a</artifactId>
-+   <groupId>maven-test</groupId>
 +   <version>1.0</version>
++   <groupId>maven-test</groupId>
++   <artifactId>maven-test-a</artifactId>
 +   <packaging>jar</packaging>
 +   <repositories>
 +      <repository>
@@ -15267,8 +15116,8 @@
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom.withoutxslt	2006-09-21 \
                18:55:33.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom	2006-09-21 \
18:55:35.000000000 -0400 +--- \
./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom.withoutxslt	2006-10-05 \
14:44:00.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom	2006-10-05 \
14:44:03.000000000 -0400  @@ -1,23 +1,25 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -15293,9 +15142,9 @@
 -      <scope>compile</scope>
 -    </dependency>
 -  </dependencies>
-+   <artifactId>maven-test-b</artifactId>
-+   <groupId>maven-test</groupId>
 +   <version>1.0</version>
++   <groupId>maven-test</groupId>
++   <artifactId>maven-test-b</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
@@ -15317,9 +15166,9 @@
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom.withoutxslt	2006-09-21 \
                18:55:40.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom	2006-09-21 \
                18:55:42.000000000 -0400
-@@ -1,7 +1,10 @@
+--- ./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom.withoutxslt	2006-10-05 \
14:44:07.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom	2006-10-05 \
14:44:10.000000000 -0400 +@@ -1,7 +1,9 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -15327,17 +15176,16 @@
 -  <artifactId>maven-test-d</artifactId>
 -  <packaging>jar</packaging>
 -  <version>1.1</version>
-+   <artifactId>maven-test-d</artifactId>
-+   <groupId>maven-test</groupId>
 +   <version>1.1</version>
++   <groupId>maven-test</groupId>
++   <artifactId>maven-test-d</artifactId>
 +   <packaging>jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom.withoutxslt	2006-09-21 \
                18:55:35.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom	2006-09-21 \
18:55:38.000000000 -0400 +--- \
./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom.withoutxslt	2006-10-05 \
14:44:03.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom	2006-10-05 \
14:44:05.000000000 -0400  @@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -15355,9 +15203,9 @@
 -      <scope>compile</scope>
 -    </dependency>
 -  </dependencies>
-+   <artifactId>maven-test-c</artifactId>
-+   <groupId>maven-test</groupId>
 +   <version>1.0</version>
++   <groupId>maven-test</groupId>
++   <artifactId>maven-test-c</artifactId>
 +   <packaging>jar</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
@@ -15372,8 +15220,8 @@
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom.withoutxslt	2006-09-21 \
                18:55:42.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom	2006-09-21 \
18:55:45.000000000 -0400 +--- \
./maven2/maven-project/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom.withoutxslt	2006-10-05 \
14:44:10.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom	2006-10-05 \
14:44:12.000000000 -0400  @@ -1,49 +1,51 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -15424,8 +15272,8 @@
 -      <scope>compile</scope>
 -    </dependency>
 -  </dependencies>
-+   <artifactId>maven-test-snapshot-resolving</artifactId>
 +   <groupId>snapshot-test</groupId>
++   <artifactId>maven-test-snapshot-resolving</artifactId>
 +   <packaging>jar</packaging>
 +   <repositories>
 +      <repository>
@@ -15474,9 +15322,9 @@
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom.withoutxslt	2006-09-21 \
                18:55:45.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom	2006-09-21 \
                18:55:48.000000000 -0400
-@@ -1,14 +1,17 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom.withoutxslt	2006-10-05 \
14:44:12.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom	2006-10-05 \
14:44:15.000000000 -0400 +@@ -1,14 +1,16 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -15491,25 +15339,24 @@
 -  <name>p3</name>
 -  <version>1.0</version>
 -  <inceptionYear>2000</inceptionYear>
-+   <artifactId>p3</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
 +   <parent>
 +      <artifactId>p2</artifactId>
 +      <groupId>maven</groupId>
 +      <version>1.0</version>
 +   </parent>
++   <groupId>maven</groupId>
++   <artifactId>p3</artifactId>
 +   <packaging>pom</packaging>
 +   <name>p3</name>
 +   <inceptionYear>2000</inceptionYear>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom.withoutxslt	2006-09-21 \
                18:55:55.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom	2006-09-21 \
                18:55:57.000000000 -0400
-@@ -1,18 +1,21 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom.withoutxslt	2006-10-05 \
14:44:22.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom	2006-10-05 \
14:44:24.000000000 -0400 +@@ -1,18 +1,20 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -15528,14 +15375,14 @@
 -      <name>mailing-list</name>
 -    </mailingList>
 -  </mailingLists>
-+   <artifactId>p2</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
 +   <parent>
 +      <artifactId>p1</artifactId>
 +      <groupId>maven</groupId>
 +      <version>1.0</version>
 +   </parent>
++   <groupId>maven</groupId>
++   <artifactId>p2</artifactId>
 +   <packaging>pom</packaging>
 +   <name>p2</name>
 +   <mailingLists>
@@ -15543,14 +15390,13 @@
 +         <name>mailing-list</name>
 +      </mailingList>
 +   </mailingLists>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom.withoutxslt	2006-09-21 \
                18:55:50.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom	2006-09-21 \
                18:55:52.000000000 -0400
-@@ -1,16 +1,19 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom.withoutxslt	2006-10-05 \
14:44:17.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom	2006-10-05 \
14:44:19.000000000 -0400 +@@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -15567,27 +15413,26 @@
 -  <scm>
 -    <url>scm-url</url>
 -  </scm>
-+   <artifactId>p1</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
 +   <parent>
 +      <artifactId>p0</artifactId>
 +      <groupId>maven</groupId>
 +      <version>1.0</version>
 +   </parent>
++   <groupId>maven</groupId>
++   <artifactId>p1</artifactId>
 +   <packaging>pom</packaging>
 +   <name>p1</name>
 +   <scm>
 +      <url>scm-url</url>
 +   </scm>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom.withoutxslt	2006-09-21 \
                18:55:52.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom	2006-09-21 \
                18:55:55.000000000 -0400
-@@ -1,13 +1,16 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom.withoutxslt	2006-10-05 \
14:44:19.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom	2006-10-05 \
14:44:22.000000000 -0400 +@@ -1,13 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -15601,24 +15446,23 @@
 -  <packaging>jar</packaging>
 -  <name>p4</name>
 -  <version>1.0</version>
-+   <artifactId>p4</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
 +   <parent>
 +      <artifactId>p3</artifactId>
 +      <groupId>maven</groupId>
 +      <version>1.0</version>
 +   </parent>
++   <groupId>maven</groupId>
++   <artifactId>p4</artifactId>
 +   <packaging>jar</packaging>
 +   <name>p4</name>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom.withoutxslt	2006-09-21 \
                18:55:48.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom	2006-09-21 \
                18:55:50.000000000 -0400
-@@ -1,11 +1,14 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom.withoutxslt	2006-10-05 \
14:44:15.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom	2006-10-05 \
14:44:17.000000000 -0400 +@@ -1,11 +1,13 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -15630,22 +15474,21 @@
 -  <organization>
 -    <name>Codehaus</name>
 -  </organization>
-+   <artifactId>p0</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
++   <groupId>maven</groupId>
++   <artifactId>p0</artifactId>
 +   <packaging>pom</packaging>
 +   <name>p0</name>
 +   <organization>
 +      <name>Codehaus</name>
 +   </organization>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml.withoutxslt	2006-09-21 \
                18:55:57.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml	2006-09-21 \
                18:56:00.000000000 -0400
-@@ -1,11 +1,14 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml.withoutxslt	2006-10-05 \
14:44:24.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml	2006-10-05 \
14:44:26.000000000 -0400 +@@ -1,11 +1,13 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -15657,22 +15500,21 @@
 -  <organization>
 -    <name>Codehaus</name>
 -  </organization>
-+   <artifactId>p0</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
++   <groupId>maven</groupId>
++   <artifactId>p0</artifactId>
 +   <packaging>pom</packaging>
 +   <name>p0</name>
 +   <organization>
 +      <name>Codehaus</name>
 +   </organization>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml.withoutxslt	2006-09-21 \
                18:56:00.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml	2006-09-21 \
                18:56:02.000000000 -0400
-@@ -1,18 +1,21 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml.withoutxslt	2006-10-05 \
14:44:26.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml	2006-10-05 \
14:44:29.000000000 -0400 +@@ -1,18 +1,20 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -15691,14 +15533,14 @@
 -      <name>mailing-list</name>
 -    </mailingList>
 -  </mailingLists>
-+   <artifactId>p2</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
 +   <parent>
 +      <artifactId>p1</artifactId>
 +      <groupId>maven</groupId>
 +      <version>1.0</version>
 +   </parent>
++   <groupId>maven</groupId>
++   <artifactId>p2</artifactId>
 +   <packaging>pom</packaging>
 +   <name>p2</name>
 +   <mailingLists>
@@ -15706,14 +15548,13 @@
 +         <name>mailing-list</name>
 +      </mailingList>
 +   </mailingLists>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml.withoutxslt	2006-09-21 \
                18:56:02.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml	2006-09-21 \
                18:56:05.000000000 -0400
-@@ -1,13 +1,16 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml.withoutxslt	2006-10-05 \
14:44:29.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml	2006-10-05 \
14:44:31.000000000 -0400 +@@ -1,13 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -15727,24 +15568,23 @@
 -  <packaging>jar</packaging>
 -  <name>p4</name>
 -  <version>1.0</version>
-+   <artifactId>p4</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
 +   <parent>
 +      <artifactId>p3</artifactId>
 +      <groupId>maven</groupId>
 +      <version>1.0</version>
 +   </parent>
++   <groupId>maven</groupId>
++   <artifactId>p4</artifactId>
 +   <packaging>jar</packaging>
 +   <name>p4</name>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml.withoutxslt	2006-09-21 \
                18:56:05.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml	2006-09-21 \
                18:56:07.000000000 -0400
-@@ -1,13 +1,16 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml.withoutxslt	2006-10-05 \
14:44:31.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml	2006-10-05 \
14:44:33.000000000 -0400 +@@ -1,13 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -15758,24 +15598,23 @@
 -  <packaging>jar</packaging>
 -  <name>p5</name>
 -  <version>1.0</version>
-+   <artifactId>p5</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
 +   <parent>
 +      <artifactId>p3</artifactId>
 +      <groupId>maven</groupId>
 +      <version>1.0</version>
 +   </parent>
++   <groupId>maven</groupId>
++   <artifactId>p5</artifactId>
 +   <packaging>jar</packaging>
 +   <name>p5</name>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml.withoutxslt	2006-09-21 \
                18:56:07.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml	2006-09-21 \
                18:56:10.000000000 -0400
-@@ -1,14 +1,17 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml.withoutxslt	2006-10-05 \
14:44:33.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml	2006-10-05 \
14:44:36.000000000 -0400 +@@ -1,14 +1,16 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -15790,25 +15629,24 @@
 -  <name>p3</name>
 -  <version>1.0</version>
 -  <inceptionYear>2000</inceptionYear>
-+   <artifactId>p3</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
 +   <parent>
 +      <artifactId>p2</artifactId>
 +      <groupId>maven</groupId>
 +      <version>1.0</version>
 +   </parent>
++   <groupId>maven</groupId>
++   <artifactId>p3</artifactId>
 +   <packaging>pom</packaging>
 +   <name>p3</name>
 +   <inceptionYear>2000</inceptionYear>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml.withoutxslt	2006-09-21 \
                18:56:10.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml	2006-09-21 \
                18:56:13.000000000 -0400
-@@ -1,32 +1,37 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml.withoutxslt	2006-10-05 \
14:44:36.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml	2006-10-05 \
14:44:38.000000000 -0400 +@@ -1,32 +1,35 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -15841,27 +15679,25 @@
 -      </plugin>
 -    </plugins>
 -  </build>
-+   <artifactId>p1</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
 +   <parent>
 +      <artifactId>p0</artifactId>
 +      <groupId>maven</groupId>
 +      <version>1.0</version>
 +   </parent>
++   <groupId>maven</groupId>
++   <artifactId>p1</artifactId>
 +   <packaging>pom</packaging>
 +   <name>p1</name>
 +   <scm>
 +      <url>scm-url</url>
 +   </scm>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-compiler-plugin</artifactId>
 +            <version>2.1-SNAPSHOT</version>
++            <artifactId>maven-compiler-plugin</artifactId>
 +            <executions>
 +               <execution>
 +                  <id>test</id>
@@ -15877,9 +15713,9 @@
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p3-1.0.pom.withoutxslt	2006-09-21 \
                18:56:13.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p3-1.0.pom	2006-09-21 \
                18:56:15.000000000 -0400
-@@ -1,16 +1,19 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p3-1.0.pom.withoutxslt	2006-10-05 \
14:44:38.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p3-1.0.pom	2006-10-05 \
14:44:41.000000000 -0400 +@@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -15896,27 +15732,26 @@
 -  <organization>
 -    <name>p3-org</name>
 -  </organization>
-+   <artifactId>p3</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
 +   <parent>
 +      <artifactId>p2</artifactId>
 +      <groupId>maven</groupId>
 +      <version>1.0</version>
 +   </parent>
++   <groupId>maven</groupId>
++   <artifactId>p3</artifactId>
 +   <packaging>pom</packaging>
 +   <name>p3</name>
 +   <organization>
 +      <name>p3-org</name>
 +   </organization>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p2-1.0.pom.withoutxslt	2006-09-21 \
                18:56:23.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p2-1.0.pom	2006-09-21 \
                18:56:25.000000000 -0400
-@@ -1,16 +1,19 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p2-1.0.pom.withoutxslt	2006-10-05 \
14:44:48.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p2-1.0.pom	2006-10-05 \
14:44:50.000000000 -0400 +@@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -15933,27 +15768,26 @@
 -  <organization>
 -    <name>p2-org</name>
 -  </organization>
-+   <artifactId>p2</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
 +   <parent>
 +      <artifactId>p1</artifactId>
 +      <groupId>maven</groupId>
 +      <version>1.0</version>
 +   </parent>
++   <groupId>maven</groupId>
++   <artifactId>p2</artifactId>
 +   <packaging>pom</packaging>
 +   <name>p2</name>
 +   <organization>
 +      <name>p2-org</name>
 +   </organization>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p1-1.0.pom.withoutxslt	2006-09-21 \
                18:56:18.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p1-1.0.pom	2006-09-21 \
                18:56:20.000000000 -0400
-@@ -1,16 +1,19 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p1-1.0.pom.withoutxslt	2006-10-05 \
14:44:43.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p1-1.0.pom	2006-10-05 \
14:44:45.000000000 -0400 +@@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -15970,27 +15804,26 @@
 -  <organization>
 -    <name>p1-org</name>
 -  </organization>
-+   <artifactId>p1</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
 +   <parent>
 +      <artifactId>p0</artifactId>
 +      <groupId>maven</groupId>
 +      <version>1.0</version>
 +   </parent>
++   <groupId>maven</groupId>
++   <artifactId>p1</artifactId>
 +   <packaging>pom</packaging>
 +   <name>p1</name>
 +   <organization>
 +      <name>p1-org</name>
 +   </organization>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p4-1.0.pom.withoutxslt	2006-09-21 \
                18:56:20.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p4-1.0.pom	2006-09-21 \
                18:56:23.000000000 -0400
-@@ -1,16 +1,19 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p4-1.0.pom.withoutxslt	2006-10-05 \
14:44:45.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p4-1.0.pom	2006-10-05 \
14:44:48.000000000 -0400 +@@ -1,16 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -16007,27 +15840,26 @@
 -  <organization>
 -    <name>p4-org</name>
 -  </organization>
-+   <artifactId>p4</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
 +   <parent>
 +      <artifactId>p3</artifactId>
 +      <groupId>maven</groupId>
 +      <version>1.0</version>
 +   </parent>
++   <groupId>maven</groupId>
++   <artifactId>p4</artifactId>
 +   <packaging>jar</packaging>
 +   <name>p4</name>
 +   <organization>
 +      <name>p4-org</name>
 +   </organization>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p0-1.0.pom.withoutxslt	2006-09-21 \
                18:56:15.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p0-1.0.pom	2006-09-21 \
                18:56:18.000000000 -0400
-@@ -1,11 +1,14 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p0-1.0.pom.withoutxslt	2006-10-05 \
14:44:41.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p0-1.0.pom	2006-10-05 \
14:44:43.000000000 -0400 +@@ -1,11 +1,13 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -16039,22 +15871,21 @@
 -  <organization>
 -    <name>p0-org</name>
 -  </organization>
-+   <artifactId>p0</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
++   <groupId>maven</groupId>
++   <artifactId>p0</artifactId>
 +   <packaging>pom</packaging>
 +   <name>p0</name>
 +   <organization>
 +      <name>p0-org</name>
 +   </organization>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t03/p0/pom.xml.withoutxslt	2006-09-21 \
                18:56:25.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t03/p0/pom.xml	2006-09-21 \
                18:56:28.000000000 -0400
-@@ -1,11 +1,14 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t03/p0/pom.xml.withoutxslt	2006-10-05 \
14:44:50.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t03/p0/pom.xml	2006-10-05 \
14:44:52.000000000 -0400 +@@ -1,11 +1,13 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -16066,22 +15897,21 @@
 -  <organization>
 -    <name>Codehaus</name>
 -  </organization>
-+   <artifactId>p0</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
++   <groupId>maven</groupId>
++   <artifactId>p0</artifactId>
 +   <packaging>pom</packaging>
 +   <name>p0</name>
 +   <organization>
 +      <name>Codehaus</name>
 +   </organization>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml.withoutxslt	2006-09-21 \
                18:56:28.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml	2006-09-21 \
                18:56:30.000000000 -0400
-@@ -1,26 +1,33 @@
+--- ./maven2/maven-project/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml.withoutxslt	2006-10-05 \
14:44:52.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml	2006-10-05 \
14:44:55.000000000 -0400 +@@ -1,26 +1,31 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -16108,27 +15938,25 @@
 -      </plugin>
 -    </plugins>
 -  </build>
-+   <artifactId>p1</artifactId>
-+   <groupId>maven</groupId>
 +   <version>1.0</version>
 +   <parent>
 +      <artifactId>p0</artifactId>
 +      <groupId>maven</groupId>
 +      <version>1.0</version>
 +   </parent>
++   <groupId>maven</groupId>
++   <artifactId>p1</artifactId>
 +   <packaging>pom</packaging>
 +   <name>p1</name>
 +   <scm>
 +      <url>scm-url</url>
 +   </scm>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-antrun-plugin</artifactId>
 +            <version>1.2-SNAPSHOT</version>
++            <artifactId>maven-antrun-plugin</artifactId>
 +            <configuration>
 +               <tasks>
 +                  <echo>${project.parent.basedir}</echo>
@@ -16140,8 +15968,8 @@
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/missing-dependency-groupId-pom.xml.withoutxslt	2006-09-21 \
                18:56:53.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/missing-dependency-groupId-pom.xml	2006-09-21 \
18:56:55.000000000 -0400 +--- \
./maven2/maven-project/src/test/resources/validation/missing-dependency-groupId-pom.xml.withoutxslt	2006-10-05 \
14:45:16.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/missing-dependency-groupId-pom.xml	2006-10-05 \
14:45:18.000000000 -0400  @@ -1,13 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -16157,9 +15985,9 @@
 -    </dependency>
 -  </dependencies>
 -</project>
++   <version>99.44</version>
 +   <artifactId>foo</artifactId>
 +   <groupId>foo</groupId>
-+   <version>99.44</version>
 +   <packaging>bleh</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
@@ -16171,9 +15999,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/missing-plugin-artifactId-pom.xml.withoutxslt	2006-09-21 \
                18:56:43.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/missing-plugin-artifactId-pom.xml	2006-09-21 \
                18:56:45.000000000 -0400
-@@ -1,14 +1,17 @@
+--- ./maven2/maven-project/src/test/resources/validation/missing-plugin-artifactId-pom.xml.withoutxslt	2006-10-05 \
14:45:07.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/missing-plugin-artifactId-pom.xml	2006-10-05 \
14:45:09.000000000 -0400 +@@ -1,14 +1,16 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -16189,11 +16017,10 @@
 -    </plugins>
 -  </build>
 -</project>
++   <version>99.44</version>
 +   <artifactId>foo</artifactId>
 +   <groupId>foo</groupId>
-+   <version>99.44</version>
 +   <packaging>bleh</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
@@ -16205,8 +16032,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/missing-dependency-version-pom.xml.withoutxslt	2006-09-21 \
                18:56:50.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/missing-dependency-version-pom.xml	2006-09-21 \
18:56:53.000000000 -0400 +--- \
./maven2/maven-project/src/test/resources/validation/missing-dependency-version-pom.xml.withoutxslt	2006-10-05 \
14:45:14.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/missing-dependency-version-pom.xml	2006-10-05 \
14:45:16.000000000 -0400  @@ -1,13 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -16222,9 +16049,9 @@
 -    </dependency>
 -  </dependencies>
 -</project>
++   <version>99.44</version>
 +   <artifactId>foo</artifactId>
 +   <groupId>foo</groupId>
-+   <version>99.44</version>
 +   <packaging>bleh</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
@@ -16236,9 +16063,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/missing-report-artifactId-pom.xml.withoutxslt	2006-09-21 \
                18:56:35.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/missing-report-artifactId-pom.xml	2006-09-21 \
                18:56:38.000000000 -0400
-@@ -1,14 +1,15 @@
+--- ./maven2/maven-project/src/test/resources/validation/missing-report-artifactId-pom.xml.withoutxslt	2006-10-05 \
14:44:59.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/missing-report-artifactId-pom.xml	2006-10-05 \
14:45:02.000000000 -0400 +@@ -1,14 +1,14 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -16254,22 +16081,21 @@
 -    </plugins>
 -  </reporting>
 -</project>
++   <version>99.44</version>
 +   <artifactId>foo</artifactId>
 +   <groupId>foo</groupId>
-+   <version>99.44</version>
 +   <packaging>bleh</packaging>
 +   <reporting>
 +      <plugins>
 +         <plugin/>
 +      </plugins>
 +   </reporting>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/missing-dependency-artifactId-pom.xml.withoutxslt	2006-09-21 \
                18:56:38.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/missing-dependency-artifactId-pom.xml	2006-09-21 \
18:56:40.000000000 -0400 +--- \
./maven2/maven-project/src/test/resources/validation/missing-dependency-artifactId-pom.xml.withoutxslt	2006-10-05 \
14:45:02.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/missing-dependency-artifactId-pom.xml	2006-10-05 \
14:45:04.000000000 -0400  @@ -1,13 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -16285,9 +16111,9 @@
 -    </dependency>
 -  </dependencies>
 -</project>
++   <version>99.44</version>
 +   <artifactId>foo</artifactId>
 +   <groupId>foo</groupId>
-+   <version>99.44</version>
 +   <packaging>bleh</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
@@ -16299,9 +16125,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/missing-type-pom.xml.withoutxslt	2006-09-21 \
                18:57:08.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/missing-type-pom.xml	2006-09-21 \
                18:57:10.000000000 -0400
-@@ -1,7 +1,10 @@
+--- ./maven2/maven-project/src/test/resources/validation/missing-type-pom.xml.withoutxslt	2006-10-05 \
14:45:30.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/missing-type-pom.xml	2006-10-05 \
14:45:32.000000000 -0400 +@@ -1,7 +1,9 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -16310,18 +16136,17 @@
 -  <version>99.44</version>
 -  <packaging></packaging>
 -</project>
-+   <artifactId>bar</artifactId>
-+   <groupId>foo</groupId>
 +   <version>99.44</version>
++   <groupId>foo</groupId>
++   <artifactId>bar</artifactId>
 +   <packaging/>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/missing-dependency-mgmt-groupId-pom.xml.withoutxslt	2006-09-21 \
                18:56:33.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/missing-dependency-mgmt-groupId-pom.xml	2006-09-21 \
                18:56:35.000000000 -0400
-@@ -1,15 +1,17 @@
+--- ./maven2/maven-project/src/test/resources/validation/missing-dependency-mgmt-groupId-pom.xml.withoutxslt	2006-10-05 \
14:44:57.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/missing-dependency-mgmt-groupId-pom.xml	2006-10-05 \
14:44:59.000000000 -0400 +@@ -1,15 +1,16 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -16338,11 +16163,10 @@
 -    </dependencies>
 -  </dependencyManagement>
 -</project>
++   <version>99.44</version>
 +   <artifactId>foo</artifactId>
 +   <groupId>foo</groupId>
-+   <version>99.44</version>
 +   <packaging>bleh</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement>
 +      <dependencies>
@@ -16354,9 +16178,9 @@
 +   </dependencyManagement>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/invalid-ids-pom.xml.withoutxslt	2006-09-21 \
                18:57:13.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/invalid-ids-pom.xml	2006-09-21 \
                18:57:15.000000000 -0400
-@@ -1,7 +1,10 @@
+--- ./maven2/maven-project/src/test/resources/validation/invalid-ids-pom.xml.withoutxslt	2006-10-05 \
14:45:35.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/invalid-ids-pom.xml	2006-10-05 \
14:45:37.000000000 -0400 +@@ -1,7 +1,9 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -16365,18 +16189,17 @@
 -  <version>99.44</version>
 -  <packaging>bleh</packaging>
 -</project>
-+   <artifactId>m$-do$</artifactId>
-+   <groupId>o/a/m</groupId>
 +   <version>99.44</version>
++   <groupId>o/a/m</groupId>
++   <artifactId>m$-do$</artifactId>
 +   <packaging>bleh</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/missing-dependency-mgmt-artifactId-pom.xml.withoutxslt	2006-09-21 \
                18:57:05.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/missing-dependency-mgmt-artifactId-pom.xml	2006-09-21 \
                18:57:08.000000000 -0400
-@@ -1,15 +1,17 @@
+--- ./maven2/maven-project/src/test/resources/validation/missing-dependency-mgmt-artifactId-pom.xml.withoutxslt	2006-10-05 \
14:45:28.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/missing-dependency-mgmt-artifactId-pom.xml	2006-10-05 \
14:45:30.000000000 -0400 +@@ -1,15 +1,16 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -16393,11 +16216,10 @@
 -    </dependencies>
 -  </dependencyManagement>
 -</project>
++   <version>99.44</version>
 +   <artifactId>foo</artifactId>
 +   <groupId>foo</groupId>
-+   <version>99.44</version>
 +   <packaging>bleh</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement>
 +      <dependencies>
@@ -16409,9 +16231,9 @@
 +   </dependencyManagement>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/missing-version-pom.xml.withoutxslt	2006-09-21 \
                18:57:00.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/missing-version-pom.xml	2006-09-21 \
                18:57:03.000000000 -0400
-@@ -1,6 +1,9 @@
+--- ./maven2/maven-project/src/test/resources/validation/missing-version-pom.xml.withoutxslt	2006-10-05 \
14:45:23.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/missing-version-pom.xml	2006-10-05 \
14:45:25.000000000 -0400 +@@ -1,6 +1,8 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -16419,17 +16241,16 @@
 -  <artifactId>bar</artifactId>
 -  <packaging>bleh</packaging>
 -</project>
-+   <artifactId>bar</artifactId>
 +   <groupId>foo</groupId>
++   <artifactId>bar</artifactId>
 +   <packaging>bleh</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/missing-groupId-pom.xml.withoutxslt	2006-09-21 \
                18:57:10.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/missing-groupId-pom.xml	2006-09-21 \
                18:57:13.000000000 -0400
-@@ -1,6 +1,9 @@
+--- ./maven2/maven-project/src/test/resources/validation/missing-groupId-pom.xml.withoutxslt	2006-10-05 \
14:45:32.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/missing-groupId-pom.xml	2006-10-05 \
14:45:35.000000000 -0400 +@@ -1,6 +1,8 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -16437,17 +16258,16 @@
 -  <version>99.44</version>
 -  <packaging>bleh</packaging>
 -</project>
-+   <artifactId>bar</artifactId>
 +   <version>99.44</version>
++   <artifactId>bar</artifactId>
 +   <packaging>bleh</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/missing-repository-id-pom.xml.withoutxslt	2006-09-21 \
                18:57:03.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/missing-repository-id-pom.xml	2006-09-21 \
                18:57:05.000000000 -0400
-@@ -1,17 +1,16 @@
+--- ./maven2/maven-project/src/test/resources/validation/missing-repository-id-pom.xml.withoutxslt	2006-10-05 \
14:45:25.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/missing-repository-id-pom.xml	2006-10-05 \
14:45:28.000000000 -0400 +@@ -1,17 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -16466,9 +16286,9 @@
 -    </pluginRepository>
 -  </pluginRepositories>
 -</project>
++   <version>99.44</version>
 +   <artifactId>foo</artifactId>
 +   <groupId>foo</groupId>
-+   <version>99.44</version>
 +   <packaging>bleh</packaging>
 +   <repositories>
 +      <repository/>
@@ -16476,14 +16296,13 @@
 +   <pluginRepositories>
 +      <pluginRepository/>
 +   </pluginRepositories>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/missing-resource-directory-pom.xml.withoutxslt	2006-09-21 \
                18:56:55.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/missing-resource-directory-pom.xml	2006-09-21 \
                18:56:58.000000000 -0400
-@@ -1,19 +1,18 @@
+--- ./maven2/maven-project/src/test/resources/validation/missing-resource-directory-pom.xml.withoutxslt	2006-10-05 \
14:45:18.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/missing-resource-directory-pom.xml	2006-10-05 \
14:45:21.000000000 -0400 +@@ -1,19 +1,17 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -16504,11 +16323,10 @@
 -    </testResources>
 -  </build>
 -</project>
++   <version>99.44</version>
 +   <artifactId>foo</artifactId>
 +   <groupId>foo</groupId>
-+   <version>99.44</version>
 +   <packaging>bleh</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <resources>
@@ -16521,19 +16339,18 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/missing-1-pom.xml.withoutxslt	2006-09-21 \
                18:56:48.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/missing-1-pom.xml	2006-09-21 \
                18:56:50.000000000 -0400
-@@ -1,2 +1,5 @@
+--- ./maven2/maven-project/src/test/resources/validation/missing-1-pom.xml.withoutxslt	2006-10-05 \
14:45:11.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/missing-1-pom.xml	2006-10-05 \
14:45:14.000000000 -0400 +@@ -1,2 +1,4 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -</project>
-+   <dependencies/>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/invalid-aggregator-packaging-pom.xml.withoutxslt	2006-09-21 \
                18:56:58.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/invalid-aggregator-packaging-pom.xml	2006-09-21 \
                18:57:00.000000000 -0400
-@@ -1,11 +1,13 @@
+--- ./maven2/maven-project/src/test/resources/validation/invalid-aggregator-packaging-pom.xml.withoutxslt	2006-10-05 \
14:45:21.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/invalid-aggregator-packaging-pom.xml	2006-10-05 \
14:45:23.000000000 -0400 +@@ -1,11 +1,12 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -16546,21 +16363,20 @@
 -    <module>test-module</module>
 -  </modules>
 -</project>
++   <version>99.44</version>
 +   <artifactId>foo</artifactId>
 +   <groupId>foo</groupId>
-+   <version>99.44</version>
 +   <packaging>bleh</packaging>
 +   <modules>
 +      <module>test-module</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/missing-artifactId-pom.xml.withoutxslt	2006-09-21 \
                18:56:45.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/missing-artifactId-pom.xml	2006-09-21 \
                18:56:48.000000000 -0400
-@@ -1,6 +1,9 @@
+--- ./maven2/maven-project/src/test/resources/validation/missing-artifactId-pom.xml.withoutxslt	2006-10-05 \
14:45:09.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/missing-artifactId-pom.xml	2006-10-05 \
14:45:11.000000000 -0400 +@@ -1,6 +1,8 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -16568,17 +16384,16 @@
 -  <version>99.44</version>
 -  <packaging>bleh</packaging>
 -</project>
-+   <groupId>foo</groupId>
 +   <version>99.44</version>
++   <groupId>foo</groupId>
 +   <packaging>bleh</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/missing-dependency-mgmt-version-pom.xml.withoutxslt	2006-09-21 \
                18:56:40.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/missing-dependency-mgmt-version-pom.xml	2006-09-21 \
                18:56:43.000000000 -0400
-@@ -1,15 +1,17 @@
+--- ./maven2/maven-project/src/test/resources/validation/missing-dependency-mgmt-version-pom.xml.withoutxslt	2006-10-05 \
14:45:04.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/missing-dependency-mgmt-version-pom.xml	2006-10-05 \
14:45:07.000000000 -0400 +@@ -1,15 +1,16 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -16595,11 +16410,10 @@
 -    </dependencies>
 -  </dependencyManagement>
 -</project>
++   <version>99.44</version>
 +   <artifactId>foo</artifactId>
 +   <groupId>foo</groupId>
-+   <version>99.44</version>
 +   <packaging>bleh</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement>
 +      <dependencies>
@@ -16611,9 +16425,9 @@
 +   </dependencyManagement>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/test/resources/validation/missing-modelVersion-pom.xml.withoutxslt	2006-09-21 \
                18:56:30.000000000 -0400
-+++ ./maven2/maven-project/src/test/resources/validation/missing-modelVersion-pom.xml	2006-09-21 \
                18:56:33.000000000 -0400
-@@ -1,6 +1,9 @@
+--- ./maven2/maven-project/src/test/resources/validation/missing-modelVersion-pom.xml.withoutxslt	2006-10-05 \
14:44:55.000000000 -0400 ++++ \
./maven2/maven-project/src/test/resources/validation/missing-modelVersion-pom.xml	2006-10-05 \
14:44:57.000000000 -0400 +@@ -1,6 +1,8 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <groupId>foo</groupId>
@@ -16621,17 +16435,16 @@
 -  <version>99.44</version>
 -  <packaging>bleh</packaging>
 -</project>
-+   <artifactId>foo</artifactId>
-+   <groupId>foo</groupId>
 +   <version>99.44</version>
++   <groupId>foo</groupId>
++   <artifactId>foo</artifactId>
 +   <packaging>bleh</packaging>
-+   <dependencies/>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.withoutxslt	2006-09-21 \
                18:57:18.000000000 -0400
-+++ ./maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2006-09-21 \
                18:57:20.000000000 -0400
-@@ -1,119 +1,110 @@
+--- ./maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.withoutxslt	2006-10-05 \
14:45:39.000000000 -0400 ++++ \
./maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2006-10-05 \
14:45:42.000000000 -0400 +@@ -1,119 +1,109 @@
 -<!-- START SNIPPET: superpom -->
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -16781,7 +16594,6 @@
 +   <reporting>
 +      <outputDirectory>target/site</outputDirectory>
 +   </reporting>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <directory>target</directory>
@@ -16814,10 +16626,10 @@
 +         <build>
 +            <plugins>
 +               <plugin>
-+                  <groupId>org.apache.maven.plugins</groupId>
-+                  <artifactId>maven-source-plugin</artifactId>
 +                  <version>2.0.1-SNAPSHOT</version>
 +                  <inherited>true</inherited>
++                  <groupId>org.apache.maven.plugins</groupId>
++                  <artifactId>maven-source-plugin</artifactId>
 +                  <executions>
 +                     <execution>
 +                        <id>attach-sources</id>
@@ -16828,10 +16640,10 @@
 +                  </executions>
 +               </plugin>
 +               <plugin>
-+                  <groupId>org.apache.maven.plugins</groupId>
-+                  <artifactId>maven-javadoc-plugin</artifactId>
 +                  <version>2.0-SNAPSHOT</version>
 +                  <inherited>true</inherited>
++                  <groupId>org.apache.maven.plugins</groupId>
++                  <artifactId>maven-javadoc-plugin</artifactId>
 +                  <executions>
 +                     <execution>
 +                        <id>attach-javadocs</id>
@@ -16842,10 +16654,10 @@
 +                  </executions>
 +               </plugin>
 +               <plugin>
-+                  <groupId>org.apache.maven.plugins</groupId>
-+                  <artifactId>maven-deploy-plugin</artifactId>
 +                  <version>2.2.1-SNAPSHOT</version>
 +                  <inherited>true</inherited>
++                  <groupId>org.apache.maven.plugins</groupId>
++                  <artifactId>maven-deploy-plugin</artifactId>
 +                  <configuration>
 +                     <updateReleaseInfo>true</updateReleaseInfo>
 +                  </configuration>
@@ -16857,9 +16669,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-settings/pom.xml.withoutxslt	2006-09-21 18:57:20.000000000 -0400
-+++ ./maven2/maven-settings/pom.xml	2006-09-21 18:57:23.000000000 -0400
-@@ -1,55 +1,60 @@
+--- ./maven2/maven-settings/pom.xml.withoutxslt	2006-10-05 14:45:42.000000000 -0400
++++ ./maven2/maven-settings/pom.xml	2006-10-05 14:45:44.000000000 -0400
+@@ -1,55 +1,59 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -16905,12 +16717,8 @@
 -      <artifactId>maven-model</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>settings</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
        <version>2.0.4</version>
 -    </dependency>
 -    <dependency>
@@ -16922,15 +16730,18 @@
 -      <artifactId>plexus-container-default</artifactId>
 -    </dependency>
 -  </dependencies>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-settings</artifactId>  +  \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Local Settings \
Model</name>  +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
 +            <version>1.0-alpha-8</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.modello</groupId> \
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">modello-maven-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <id>site-xsd</id>
@@ -16956,27 +16767,27 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-model</artifactId>  +     \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-container-default</artifactId>
  +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-embedder/pom.xml.withoutxslt	2006-09-21 18:57:23.000000000 -0400
-+++ ./maven2/maven-embedder/pom.xml	2006-09-21 18:57:26.000000000 -0400
-@@ -1,48 +1,52 @@
+--- ./maven2/maven-embedder/pom.xml.withoutxslt	2006-10-05 14:45:44.000000000 -0400
++++ ./maven2/maven-embedder/pom.xml	2006-10-05 14:45:47.000000000 -0400
+@@ -1,48 +1,51 @@
 -<?xml version="1.0" encoding="UTF-8"?><project>
 -  <parent>
 -    <artifactId>maven</artifactId>
@@ -17000,7 +16811,13 @@
 -  </build>
 -  <dependencies>
 -    <dependency>
--      <groupId>org.apache.maven</groupId>
++<?xml version="1.0" encoding="utf-8"?>
++<project>
++   <version>2.0.4</version>
++   <parent>
++      <version>2.0.4</version>
++      <artifactId>maven</artifactId>
+       <groupId>org.apache.maven</groupId>
 -      <artifactId>maven-core</artifactId>
 -      <version>${mavenVersion}</version>
 -    </dependency>
@@ -17024,16 +16841,9 @@
 -  <properties>
 -    <mavenVersion>2.0.3</mavenVersion>
 -  </properties>
-+<?xml version="1.0" encoding="utf-8"?>
-+<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>embedder</artifactId>
-+   <version>2.0.4</version>
-+   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
-+      <version>2.0.4</version>
 +   </parent>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-embedder</artifactId>
 +   <name>Maven Embedder</name>
 +   <reporting>
 +      <plugins>
@@ -17058,9 +16868,8 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-assembly-plugin</artifactId>
 +            <version>2.1-SNAPSHOT</version>
++            <artifactId>maven-assembly-plugin</artifactId>
 +            <configuration>
 +               <descriptor>src/main/assembly/dep.xml</descriptor>
 +            </configuration>
@@ -17069,16 +16878,16 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>mavencore</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-core</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2/maven-embedder/src/test/embedder-test-project/pom.xml.withoutxslt	2006-09-21 \
                18:57:26.000000000 -0400
-+++ ./maven2/maven-embedder/src/test/embedder-test-project/pom.xml	2006-09-21 \
18:57:28.000000000 -0400 +--- \
./maven2/maven-embedder/src/test/embedder-test-project/pom.xml.withoutxslt	2006-10-05 \
14:45:47.000000000 -0400 ++++ \
./maven2/maven-embedder/src/test/embedder-test-project/pom.xml	2006-10-05 \
14:45:49.000000000 -0400  @@ -1,18 +1,19 @@
 -<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"> @@ -17100,26 +16909,26 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">embedder-test-project</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">embedder-test-project</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Quick Start \
Archetype</name>  +   <url xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org</url>  \
+   <modelVersion>4.0.0</modelVersion>  +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-embedder/src/test/resources/pom.xml.withoutxslt	2006-09-21 \
                18:57:28.000000000 -0400
-+++ ./maven2/maven-embedder/src/test/resources/pom.xml	2006-09-21 18:57:31.000000000 \
-0400 +--- ./maven2/maven-embedder/src/test/resources/pom.xml.withoutxslt	2006-10-05 \
14:45:49.000000000 -0400 ++++ \
./maven2/maven-embedder/src/test/resources/pom.xml	2006-10-05 14:45:52.000000000 \
-0400  @@ -1,37 +1,40 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -17159,18 +16968,18 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>model</artifactId>
 +   <version>2.0.4</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-model</artifactId>
 +   <name>Maven Model</name>
 +   <description>Maven Model</description>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
 +            <version>1.0-alpha-8</version>
++            <groupId>org.codehaus.modello</groupId>
++            <artifactId>modello-maven-plugin</artifactId>
 +            <executions>
 +               <execution>
 +                  <goals>
@@ -17190,17 +16999,17 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
 +         <version>1.0.3</version>
++         <groupId>plexus</groupId>
++         <artifactId>plexus-utils</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2/maven-artifact/pom.xml.withoutxslt	2006-09-21 18:57:31.000000000 -0400
-+++ ./maven2/maven-artifact/pom.xml	2006-09-21 18:57:34.000000000 -0400
-@@ -1,23 +1,27 @@
+--- ./maven2/maven-artifact/pom.xml.withoutxslt	2006-10-05 14:45:52.000000000 -0400
++++ ./maven2/maven-artifact/pom.xml	2006-10-05 14:51:31.000000000 -0400
+@@ -1,23 +1,32 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -17225,34 +17034,39 @@
 -  </dependencies>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>artifact</artifactId>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact</artifactId> ++  \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
<version>2.0.4</version>  +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent>  +   <name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Artifact</name>  +   \
<modelVersion>4.0.0</modelVersion>  +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-container-default</artifactId>
  +         <scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency> ++      <dependency>
++         <groupId>jdom</groupId>
++         <artifactId>jdom</artifactId>
++         <version>1.0</version>
++      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2-plugins/maven-repository-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:57:34.000000000 -0400
-+++ ./maven2-plugins/maven-repository-plugin/pom.xml	2006-09-21 18:57:37.000000000 \
-0400 +--- ./maven2-plugins/maven-repository-plugin/pom.xml.withoutxslt	2006-10-05 \
14:45:54.000000000 -0400 ++++ \
./maven2-plugins/maven-repository-plugin/pom.xml	2006-10-05 14:45:57.000000000 -0400  \
@@ -1,42 +1,44 @@  +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -17297,52 +17111,52 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-repository-plugin</artifactId>
 +   <version>2.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <groupId>org.apache.maven.plugins</groupId>
++   <artifactId>maven-repository-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Repository Plugin</name>
 +   <url>http://maven.apache.org</url>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>1.0-alpha-5</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-archiver</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-eclipse-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:57:37.000000000 -0400
-+++ ./maven2-plugins/maven-eclipse-plugin/pom.xml	2006-09-21 18:57:39.000000000 \
                -0400
-@@ -1,79 +1,81 @@
+--- ./maven2-plugins/maven-eclipse-plugin/pom.xml.withoutxslt	2006-10-05 \
14:45:57.000000000 -0400 ++++ \
./maven2-plugins/maven-eclipse-plugin/pom.xml	2006-10-05 14:51:39.000000000 -0400 +@@ \
                -1,79 +1,80 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<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"> @@ -17424,13 +17238,13 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-eclipse-plugin</artifactId>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-eclipse-plugin</artifactId>
 ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
  +   <version>2.2-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugins</artifactId> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
  +   </parent>
 +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Eclipse Plugin</name> @@ \
-17445,9 +17259,8 @@  +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-surefire-plugin</artifactId>
 +            <version>2.1.4-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-surefire-plugin</artifactId>
  +            <configuration xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <excludes>
 +                  <exclude>**/Abstract*TestCase.java</exclude>
@@ -17459,54 +17272,54 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-project</artifactId>  +   \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-model</artifactId>  +     \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-manager</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact-manager</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>embedder</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-embedder</artifactId>  +  \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>settings</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-settings</artifactId>  +  \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-idea-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:57:39.000000000 -0400
-+++ ./maven2-plugins/maven-idea-plugin/pom.xml	2006-09-21 18:57:42.000000000 -0400
-@@ -1,74 +1,78 @@
+--- ./maven2-plugins/maven-idea-plugin/pom.xml.withoutxslt	2006-10-05 \
14:45:59.000000000 -0400 ++++ ./maven2-plugins/maven-idea-plugin/pom.xml	2006-10-05 \
14:51:42.000000000 -0400 +@@ -1,74 +1,76 @@
 -<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>
@@ -17583,13 +17396,12 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-idea-plugin</artifactId>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-idea-plugin</artifactId>  \
+   <version>2.0-beta-2-SNAPSHOT</version>  +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugins</artifactId> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
  +   </parent>
 +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven IDEA Plugin</name> @@ \
-17600,9 +17412,8 @@  +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-surefire-plugin</artifactId>
 +            <version>2.1.4-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-surefire-plugin</artifactId>
  +            <configuration xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               \
<childDelegation>false</childDelegation>  +            </configuration>
@@ -17611,58 +17422,58 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-project</artifactId>  +   \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-manager</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact-manager</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-model</artifactId>  +     \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>provider-api</artifactId>
 +         <version>1.0-alpha-6</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.wagon</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">wagon-provider-api</artifactId> \
+      </dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>dom4j</artifactId>
 +         <version>1.6.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">dom4j</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">dom4j</artifactId>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven-shared</groupId>
-+         <artifactId>plugin-testing-harness</artifactId>
 +         <version>1.0-SNAPSHOT</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-testing-harness</artifactId>
  +         <scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-idea-plugin/src/test/remote-repo/junit/junit/3.8.1/junit-3.8.1.pom.withoutxslt	2006-09-21 \
                18:57:42.000000000 -0400
-+++ ./maven2-plugins/maven-idea-plugin/src/test/remote-repo/junit/junit/3.8.1/junit-3.8.1.pom	2006-09-21 \
                18:57:45.000000000 -0400
-@@ -1,6 +1,9 @@
+--- ./maven2-plugins/maven-idea-plugin/src/test/remote-repo/junit/junit/3.8.1/junit-3.8.1.pom.withoutxslt	2006-10-05 \
14:46:02.000000000 -0400 ++++ \
./maven2-plugins/maven-idea-plugin/src/test/remote-repo/junit/junit/3.8.1/junit-3.8.1.pom	2006-10-05 \
14:46:04.000000000 -0400 +@@ -1,6 +1,8 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -17670,16 +17481,15 @@
 -  <artifactId>junit</artifactId>
 -  <version>3.8.1</version>
 -</project>
-+   <groupId>JPP</groupId>
-+   <artifactId>junit</artifactId>
 +   <version>3.8.1</version>
-+   <dependencies/>
++   <groupId>junit</groupId>
++   <artifactId>junit</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-idea-plugin/src/test/remote-repo/org/apache/maven/maven/2.0.1/maven-2.0.1.pom.withoutxslt	2006-09-21 \
                18:57:45.000000000 -0400
-+++ ./maven2-plugins/maven-idea-plugin/src/test/remote-repo/org/apache/maven/maven/2.0.1/maven-2.0.1.pom	2006-09-21 \
18:57:47.000000000 -0400 +--- \
./maven2-plugins/maven-idea-plugin/src/test/remote-repo/org/apache/maven/maven/2.0.1/maven-2.0.1.pom.withoutxslt	2006-10-05 \
14:46:04.000000000 -0400 ++++ \
./maven2-plugins/maven-idea-plugin/src/test/remote-repo/org/apache/maven/maven/2.0.1/maven-2.0.1.pom	2006-10-05 \
14:46:07.000000000 -0400  @@ -1,340 +1,341 @@
 -<?xml version="1.0" encoding="UTF-8"?><project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -17847,9 +17657,9 @@
 -    <pluginManagement>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>maven</artifactId>
 +   <version>2.0.4</version>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven</artifactId>
 +   <packaging>pom</packaging>
 +   <name>Maven</name>
 +   <description>Maven is a project development management and comprehension tool. \
Based on the concept of a project object model: builds, dependency management, \
documentation creation, site publication, and distribution publication are all \
controlled from the declarative file. Maven can be extended by plugins to utilise a \
number of other development tools for reporting or the build process.</description> \
@@ -18210,9 +18020,9 @@  +   <build>
 +      <extensions>
 +         <extension>
-+            <groupId>JPP/maven-wagon</groupId>
-+            <artifactId>ssh-external</artifactId>
 +            <version>1.0-alpha-6</version>
++            <groupId>org.apache.maven.wagon</groupId>
++            <artifactId>wagon-ssh-external</artifactId>
 +         </extension>
 +      </extensions>
 +      <pluginManagement>
@@ -18273,9 +18083,9 @@
 -        <groupId>org.codehaus.plexus</groupId>
 -        <artifactId>plexus-container-default</artifactId>
 -        <version>1.0-alpha-9</version>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
        </dependency>
 -      <dependency>
@@ -18326,42 +18136,42 @@
 +   <dependencyManagement>
 +      <dependencies>
 +         <dependency>
-+            <groupId>JPP/plexus</groupId>
-+            <artifactId>container-default</artifactId>
 +            <version>1.0-alpha-9</version>
++            <groupId>org.codehaus.plexus</groupId>
++            <artifactId>plexus-container-default</artifactId>
 +         </dependency>
 +         <dependency>
-+            <groupId>JPP/plexus</groupId>
-+            <artifactId>utils</artifactId>
-+            <version>1.1</version>
++            <version>1.2</version>
++            <groupId>org.codehaus.plexus</groupId>
++            <artifactId>plexus-utils</artifactId>
 +         </dependency>
 +         <dependency>
-+            <groupId>JPP/maven-wagon</groupId>
-+            <artifactId>provider-api</artifactId>
 +            <version>1.0-alpha-6</version>
++            <groupId>org.apache.maven.wagon</groupId>
++            <artifactId>wagon-provider-api</artifactId>
 +         </dependency>
 +         <dependency>
-+            <groupId>JPP/maven-wagon</groupId>
-+            <artifactId>ssh</artifactId>
 +            <version>1.0-alpha-6</version>
++            <groupId>org.apache.maven.wagon</groupId>
++            <artifactId>wagon-ssh</artifactId>
 +         </dependency>
 +         <dependency>
-+            <groupId>JPP/maven-wagon</groupId>
-+            <artifactId>file</artifactId>
 +            <version>1.0-alpha-6</version>
++            <groupId>org.apache.maven.wagon</groupId>
++            <artifactId>wagon-file</artifactId>
 +         </dependency>
 +         <dependency>
-+            <groupId>JPP/maven-wagon</groupId>
-+            <artifactId>http-lightweight</artifactId>
 +            <version>1.0-alpha-6</version>
++            <groupId>org.apache.maven.wagon</groupId>
++            <artifactId>wagon-http-lightweight</artifactId>
 +         </dependency>
 +      </dependencies>
 +   </dependencyManagement>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-idea-plugin/src/test/remote-repo/org/apache/maven/maven-model/2.0.1/maven-model-2.0.1.pom.withoutxslt	2006-09-21 \
                18:57:47.000000000 -0400
-+++ ./maven2-plugins/maven-idea-plugin/src/test/remote-repo/org/apache/maven/maven-model/2.0.1/maven-model-2.0.1.pom	2006-09-21 \
                18:57:50.000000000 -0400
-@@ -1,12 +1,14 @@
+--- ./maven2-plugins/maven-idea-plugin/src/test/remote-repo/org/apache/maven/maven-model/2.0.1/maven-model-2.0.1.pom.withoutxslt	2006-10-05 \
14:46:07.000000000 -0400 ++++ \
./maven2-plugins/maven-idea-plugin/src/test/remote-repo/org/apache/maven/maven-model/2.0.1/maven-model-2.0.1.pom	2006-10-05 \
14:46:09.000000000 -0400 +@@ -1,12 +1,13 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<project>
 -  <parent>
@@ -18375,22 +18185,21 @@
 -  <version>2.0.1</version>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>model</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId>maven</artifactId>
++      <groupId>org.apache.maven</groupId>
 +   </parent>
-+   <dependencies/>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-model</artifactId>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2-plugins/maven-rar-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:57:50.000000000 -0400
-+++ ./maven2-plugins/maven-rar-plugin/pom.xml	2006-09-21 18:57:53.000000000 -0400
-@@ -1,29 +1,32 @@
+--- ./maven2-plugins/maven-rar-plugin/pom.xml.withoutxslt	2006-10-05 \
14:46:09.000000000 -0400 ++++ ./maven2-plugins/maven-rar-plugin/pom.xml	2006-10-05 \
14:46:12.000000000 -0400 +@@ -1,29 +1,31 @@
 -<?xml version="1.0" encoding="UTF-8"?><project>
 -  <parent>
 -    <artifactId>maven-plugins</artifactId>
@@ -18422,40 +18231,39 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-rar-plugin</artifactId>
 +   <version>2.2-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-rar-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Rar plugin</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-archiver</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-source-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:57:53.000000000 -0400
-+++ ./maven2-plugins/maven-source-plugin/pom.xml	2006-09-21 18:57:55.000000000 -0400
-@@ -1,34 +1,37 @@
+--- ./maven2-plugins/maven-source-plugin/pom.xml.withoutxslt	2006-10-05 \
14:46:12.000000000 -0400 ++++ ./maven2-plugins/maven-source-plugin/pom.xml	2006-10-05 \
14:46:14.000000000 -0400 +@@ -1,34 +1,36 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -18491,45 +18299,44 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-source-plugin</artifactId>
 +   <version>2.0.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-source-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Source Plug-In</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>1.0-alpha-5</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-archiver</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
 +         <version>1.0-alpha-9</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-container-default</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-source-plugin/src/test/projects/normal/pom.xml.withoutxslt	2006-09-21 \
                18:57:55.000000000 -0400
-+++ ./maven2-plugins/maven-source-plugin/src/test/projects/normal/pom.xml	2006-09-21 \
                18:57:58.000000000 -0400
-@@ -1,8 +1,10 @@
+--- ./maven2-plugins/maven-source-plugin/src/test/projects/normal/pom.xml.withoutxslt	2006-10-05 \
14:46:14.000000000 -0400 ++++ \
./maven2-plugins/maven-source-plugin/src/test/projects/normal/pom.xml	2006-10-05 \
14:46:17.000000000 -0400 +@@ -1,8 +1,9 @@
 -<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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -18540,17 +18347,16 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-sources-plugin-test-zip</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">mojo-test</groupId>  +   \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0</version> ++   <groupId \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">mojo-test</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-sources-plugin-test-zip</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-source-plugin/src/test/projects/source-plugin-test1/pom.xml.withoutxslt	2006-09-21 \
                18:57:58.000000000 -0400
-+++ ./maven2-plugins/maven-source-plugin/src/test/projects/source-plugin-test1/pom.xml	2006-09-21 \
18:58:01.000000000 -0400 +--- \
./maven2-plugins/maven-source-plugin/src/test/projects/source-plugin-test1/pom.xml.withoutxslt	2006-10-05 \
14:46:17.000000000 -0400 ++++ \
./maven2-plugins/maven-source-plugin/src/test/projects/source-plugin-test1/pom.xml	2006-10-05 \
14:46:19.000000000 -0400  @@ -1,52 +1,33 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -18606,9 +18412,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">source-plugin-test1</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.source.test1</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.source.test1</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">source-plugin-test1</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Source Plugin \
Test1</name> @@ -18629,18 +18435,18 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-jxr-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:58:01.000000000 -0400
-+++ ./maven2-plugins/maven-jxr-plugin/pom.xml	2006-09-21 18:58:03.000000000 -0400
-@@ -1,40 +1,43 @@
+--- ./maven2-plugins/maven-jxr-plugin/pom.xml.withoutxslt	2006-10-05 \
14:46:19.000000000 -0400 ++++ ./maven2-plugins/maven-jxr-plugin/pom.xml	2006-10-05 \
14:46:22.000000000 -0400 +@@ -1,40 +1,42 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -18682,14 +18488,13 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-jxr-plugin</artifactId>
 +   <version>2.0-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-jxr-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven JXR Plugin</name>
 +   <inceptionYear>2005</inceptionYear>
@@ -18706,27 +18511,27 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>reporting-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven.reporting</groupId>
++         <artifactId>maven-reporting-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>maven-jxr</artifactId>
 +         <version>1.0</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-jxr</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>reporting-impl</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven.reporting</groupId>
++         <artifactId>maven-reporting-impl</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-release-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:58:03.000000000 -0400
-+++ ./maven2-plugins/maven-release-plugin/pom.xml	2006-09-21 18:58:06.000000000 \
                -0400
-@@ -1,109 +1,109 @@
+--- ./maven2-plugins/maven-release-plugin/pom.xml.withoutxslt	2006-10-05 \
14:46:22.000000000 -0400 ++++ \
./maven2-plugins/maven-release-plugin/pom.xml	2006-10-05 14:51:48.000000000 -0400 +@@ \
                -1,109 +1,108 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<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"> @@ -18838,37 +18643,36 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-release-plugin</artifactId>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-release-plugin</artifactId>
  +   <version>2.0-beta-4-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugins</artifactId> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
  +   </parent>
 +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Release plugin</name>  +  \
<modelVersion>4.0.0</modelVersion>  +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-project</artifactId>  +   \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>mavencore</artifactId>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-core</artifactId>
 +         <version>2.0.4</version>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>interactivity-api</artifactId>
 +         <version>1.0-alpha-1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-interactivity-api</artifactId>
  +         <exclusions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +            <exclusion>
 +               <artifactId>plexus-container-default</artifactId>
@@ -18881,73 +18685,73 @@
 +         </exclusions>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-manager</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact-manager</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven-scm</groupId>
-+         <artifactId>api</artifactId>
 +         <version>1.0-beta-3-SNAPSHOT</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.scm</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-scm-api</artifactId>  +   \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven-scm</groupId>
-+         <artifactId>manager-plexus</artifactId>
 +         <version>1.0-beta-3-SNAPSHOT</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.scm</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-scm-manager-plexus</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-scm</groupId>
-+         <artifactId>provider-bazaar</artifactId>
 +         <version>1.0-beta-3-SNAPSHOT</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.scm</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-scm-provider-bazaar</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-scm</groupId>
-+         <artifactId>provider-clearcase</artifactId>
 +         <version>1.0-beta-3-SNAPSHOT</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.scm</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-scm-provider-clearcase</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-scm</groupId>
-+         <artifactId>provider-cvsexe</artifactId>
 +         <version>1.0-beta-3-SNAPSHOT</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.scm</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-scm-provider-cvsexe</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-scm</groupId>
-+         <artifactId>provider-perforce</artifactId>
 +         <version>1.0-beta-3-SNAPSHOT</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.scm</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-scm-provider-perforce</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-scm</groupId>
-+         <artifactId>provider-starteam</artifactId>
 +         <version>1.0-beta-3-SNAPSHOT</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.scm</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-scm-provider-starteam</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-scm</groupId>
-+         <artifactId>provider-svnexe</artifactId>
 +         <version>1.0-beta-3-SNAPSHOT</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.scm</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-scm-provider-svnexe</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>jmock-cglib</artifactId>
 +         <version>1.0.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jmock</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jmock-cglib</artifactId>  +     \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven-scm</groupId>
-+         <artifactId>test</artifactId>
 +         <version>1.0-beta-3-SNAPSHOT</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.scm</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-scm-test</artifactId>  +  \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-release-plugin/src/it/project/pom.xml.withoutxslt	2006-09-21 \
                18:58:06.000000000 -0400
-+++ ./maven2-plugins/maven-release-plugin/src/it/project/pom.xml	2006-09-21 \
18:58:09.000000000 -0400 +--- \
./maven2-plugins/maven-release-plugin/src/it/project/pom.xml.withoutxslt	2006-10-05 \
14:46:24.000000000 -0400 ++++ \
./maven2-plugins/maven-release-plugin/src/it/project/pom.xml	2006-10-05 \
14:46:27.000000000 -0400  @@ -1,41 +1,42 @@
 -<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"> @@ -18992,9 +18796,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test-project-one</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.release.it</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.release.it</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test-project-one</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Quick Start \
Archetype</name>  +   <url xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org</url> \
@@ -19024,18 +18828,18 @@  +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-surefire-report-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:58:09.000000000 -0400
-+++ ./maven2-plugins/maven-surefire-report-plugin/pom.xml	2006-09-21 \
                18:58:12.000000000 -0400
-@@ -1,34 +1,37 @@
+--- ./maven2-plugins/maven-surefire-report-plugin/pom.xml.withoutxslt	2006-10-05 \
14:46:27.000000000 -0400 ++++ \
./maven2-plugins/maven-surefire-report-plugin/pom.xml	2006-10-05 14:46:29.000000000 \
-0400 +@@ -1,34 +1,36 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -19071,14 +18875,13 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-surefire-report-plugin</artifactId>
 +   <version>2.0-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-surefire-report-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Surefire Report Plugin</name>
 +   <prerequisites>
@@ -19094,22 +18897,22 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>reporting-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven.reporting</groupId>
++         <artifactId>maven-reporting-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>reporting-impl</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven.reporting</groupId>
++         <artifactId>maven-reporting-impl</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-antrun-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:58:12.000000000 -0400
-+++ ./maven2-plugins/maven-antrun-plugin/pom.xml	2006-09-21 18:58:14.000000000 -0400
-@@ -1,46 +1,49 @@
+--- ./maven2-plugins/maven-antrun-plugin/pom.xml.withoutxslt	2006-10-05 \
14:46:29.000000000 -0400 ++++ ./maven2-plugins/maven-antrun-plugin/pom.xml	2006-10-05 \
14:46:32.000000000 -0400 +@@ -1,46 +1,48 @@
 -<?xml version="1.0" encoding="UTF-8"?><project>
 -  <parent>
 -    <artifactId>maven-plugins</artifactId>
@@ -19158,14 +18961,13 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-antrun-plugin</artifactId>
 +   <version>1.2-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-antrun-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven AntRun Plugin</name>
 +   <description>Runs ant scripts embedded in the POM</description>
@@ -19182,33 +18984,33 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>ant-launcher</artifactId>
 +         <version>1.6.5</version>
++         <groupId>ant</groupId>
++         <artifactId>ant-launcher</artifactId>
 +         <scope>runtime</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>ant</artifactId>
 +         <version>1.6.5</version>
++         <groupId>ant</groupId>
++         <artifactId>ant</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-antrun-plugin/src/it/test3/pom.xml.withoutxslt	2006-09-21 \
                18:58:14.000000000 -0400
-+++ ./maven2-plugins/maven-antrun-plugin/src/it/test3/pom.xml	2006-09-21 \
                18:58:17.000000000 -0400
-@@ -1,53 +1,50 @@
+--- ./maven2-plugins/maven-antrun-plugin/src/it/test3/pom.xml.withoutxslt	2006-10-05 \
14:46:32.000000000 -0400 ++++ \
./maven2-plugins/maven-antrun-plugin/src/it/test3/pom.xml	2006-10-05 \
14:46:34.000000000 -0400 +@@ -1,53 +1,49 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
 -    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -19264,18 +19066,17 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test3</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.antrun</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.antrun</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test3</artifactId>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test for MANTRUN-32</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">ant tasks don't use correct \
environment in antrun plugin</description>  +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-antrun-plugin</artifactId>
 +            <version>1.2-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-antrun-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <phase>test</phase>
@@ -19304,18 +19105,18 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-antrun-plugin/src/it/test4/pom.xml.withoutxslt	2006-09-21 \
                18:58:17.000000000 -0400
-+++ ./maven2-plugins/maven-antrun-plugin/src/it/test4/pom.xml	2006-09-21 \
                18:58:19.000000000 -0400
-@@ -1,74 +1,65 @@
+--- ./maven2-plugins/maven-antrun-plugin/src/it/test4/pom.xml.withoutxslt	2006-10-05 \
14:46:34.000000000 -0400 ++++ \
./maven2-plugins/maven-antrun-plugin/src/it/test4/pom.xml	2006-10-05 \
14:46:37.000000000 -0400 +@@ -1,74 +1,64 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
 -    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -19392,9 +19193,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test4</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.antrun</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.antrun</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test4</artifactId>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test for MANTRUN-36</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">properties not resolved in \
attributes</description>  +   <properties xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> @@ -19404,9 +19205,8 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-antrun-plugin</artifactId>
 +            <version>1.2-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-antrun-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <phase>test</phase>
@@ -19456,8 +19256,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-antrun-plugin/src/it/test1/pom.xml.withoutxslt	2006-09-21 \
                18:58:19.000000000 -0400
-+++ ./maven2-plugins/maven-antrun-plugin/src/it/test1/pom.xml	2006-09-21 \
18:58:22.000000000 -0400 +--- \
./maven2-plugins/maven-antrun-plugin/src/it/test1/pom.xml.withoutxslt	2006-10-05 \
14:46:37.000000000 -0400 ++++ \
./maven2-plugins/maven-antrun-plugin/src/it/test1/pom.xml	2006-10-05 \
14:46:39.000000000 -0400  @@ -1,60 +1,53 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19521,18 +19321,18 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test1</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.antrun</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.antrun</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test1</artifactId>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test for compile and plugin \
classpath references</name>  +   <description \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Ensure that \
maven.compile.classpath and maven.plugin.classpath referencies are set</description>  \
+   <modelVersion>4.0.0</modelVersion>  +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-antrun-plugin</artifactId>
 +            <version>1.2-SNAPSHOT</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-antrun-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <id>compile</id>
@@ -19565,16 +19365,16 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-antrun-plugin/src/it/pom.xml.withoutxslt	2006-09-21 \
                18:58:22.000000000 -0400
-+++ ./maven2-plugins/maven-antrun-plugin/src/it/pom.xml	2006-09-21 \
18:58:24.000000000 -0400 +--- \
./maven2-plugins/maven-antrun-plugin/src/it/pom.xml.withoutxslt	2006-10-05 \
14:46:39.000000000 -0400 ++++ \
./maven2-plugins/maven-antrun-plugin/src/it/pom.xml	2006-10-05 14:46:42.000000000 \
-0400  @@ -1,24 +1,18 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19602,9 +19402,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">tests</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.antrun</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.antrun</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">tests</artifactId>  +   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Tests for antrun plugin</name>  \
+   <modules xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> @@ -19619,9 +19419,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-antrun-plugin/src/it/test2/pom.xml.withoutxslt	2006-09-21 \
                18:58:24.000000000 -0400
-+++ ./maven2-plugins/maven-antrun-plugin/src/it/test2/pom.xml	2006-09-21 \
                18:58:27.000000000 -0400
-@@ -1,51 +1,48 @@
+--- ./maven2-plugins/maven-antrun-plugin/src/it/test2/pom.xml.withoutxslt	2006-10-05 \
14:46:42.000000000 -0400 ++++ \
./maven2-plugins/maven-antrun-plugin/src/it/test2/pom.xml	2006-10-05 \
14:46:45.000000000 -0400 +@@ -1,51 +1,47 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
 -    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -19675,18 +19475,17 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test2</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.antrun</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.antrun</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test2</artifactId>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test for MANTRUN-28</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven.test.classpath doesn't \
contain test scope dependancies</description>  +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-antrun-plugin</artifactId>
 +            <version>1.2-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-antrun-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <phase>test</phase>
@@ -19713,18 +19512,18 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-antrun-plugin/src/it/test5/pom.xml.withoutxslt	2006-09-21 \
                18:58:27.000000000 -0400
-+++ ./maven2-plugins/maven-antrun-plugin/src/it/test5/pom.xml	2006-09-21 \
                18:58:30.000000000 -0400
-@@ -1,52 +1,47 @@
+--- ./maven2-plugins/maven-antrun-plugin/src/it/test5/pom.xml.withoutxslt	2006-10-05 \
14:46:45.000000000 -0400 ++++ \
./maven2-plugins/maven-antrun-plugin/src/it/test5/pom.xml	2006-10-05 \
14:46:48.000000000 -0400 +@@ -1,52 +1,46 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
 -    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -19779,18 +19578,17 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test5</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.antrun</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.antrun</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test5</artifactId>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test for MANTRUN-34</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">StringIndexOutOfBoundsException \
in custom ant task referencing 'basedir'</description>  +   \
<modelVersion>4.0.0</modelVersion>  +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-antrun-plugin</artifactId>
 +            <version>1.2-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-antrun-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <phase>test</phase>
@@ -19817,16 +19615,16 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>ant</artifactId>
 +         <version>1.6.5</version>
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">ant</artifactId> ++         \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">ant</groupId>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-antrun-plugin/src/it/test6/pom.xml.withoutxslt	2006-09-21 \
                18:58:30.000000000 -0400
-+++ ./maven2-plugins/maven-antrun-plugin/src/it/test6/pom.xml	2006-09-21 \
18:58:32.000000000 -0400 +--- \
./maven2-plugins/maven-antrun-plugin/src/it/test6/pom.xml.withoutxslt	2006-10-05 \
14:46:48.000000000 -0400 ++++ \
./maven2-plugins/maven-antrun-plugin/src/it/test6/pom.xml	2006-10-05 \
14:46:50.000000000 -0400  @@ -1,53 +1,48 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19883,18 +19681,18 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test6</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.antrun</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.antrun</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test6</artifactId>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test for plugin classpath \
references and optional ant tasks</name>  +   <description \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Ensure that \
maven.plugin.classpath reference is set and optional tasks work</description>  +   \
<modelVersion>4.0.0</modelVersion>  +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-antrun-plugin</artifactId>
 +            <version>1.2-SNAPSHOT</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-antrun-plugin</artifactId>
  +            <executions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               <execution>
 +                  <id>compile</id>
@@ -19918,9 +19716,9 @@
 +                  <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.6.5</version>  +              \
</dependency>  +               <dependency>
-+                  <groupId>JPP</groupId>
-+                  <artifactId>antlr</artifactId>
 +                  <version>2.7.4</version>
++                  <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">antlr</groupId> ++              \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">antlrall</artifactId>  +        \
</dependency>  +            </dependencies>
 +         </plugin>
@@ -19930,9 +19728,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-antlr-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:58:32.000000000 -0400
-+++ ./maven2-plugins/maven-antlr-plugin/pom.xml	2006-09-21 18:58:35.000000000 -0400
-@@ -1,30 +1,33 @@
+--- ./maven2-plugins/maven-antlr-plugin/pom.xml.withoutxslt	2006-10-05 \
14:46:50.000000000 -0400 ++++ ./maven2-plugins/maven-antlr-plugin/pom.xml	2006-10-05 \
14:46:53.000000000 -0400 +@@ -1,30 +1,32 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -19964,41 +19762,40 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-antlr-plugin</artifactId>
 +   <version>2.0-beta-2-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-antlr-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven ANTLR Plugin</name>
 +   <inceptionYear>2001</inceptionYear>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>antlr</artifactId>
 +         <version>2.7.4</version>
++         <groupId>antlr</groupId>
++         <artifactId>antlrall</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-pmd-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:58:35.000000000 -0400
-+++ ./maven2-plugins/maven-pmd-plugin/pom.xml	2006-09-21 18:58:38.000000000 -0400
-@@ -1,41 +1,43 @@
+--- ./maven2-plugins/maven-pmd-plugin/pom.xml.withoutxslt	2006-10-05 \
14:46:53.000000000 -0400 ++++ ./maven2-plugins/maven-pmd-plugin/pom.xml	2006-10-05 \
14:46:57.000000000 -0400 +@@ -1,41 +1,42 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -20041,14 +19838,13 @@
 -    </contributor>
 -  </contributors>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-pmd-plugin</artifactId>
 +   <version>2.0-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-pmd-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven PMD Plugin</name>
 +   <inceptionYear>2005</inceptionYear>
@@ -20060,32 +19856,32 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>pmd</artifactId>
 +         <version>3.4</version>
++         <groupId>pmd</groupId>
++         <artifactId>pmd</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>reporting-impl</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven.reporting</groupId>
++         <artifactId>maven-reporting-impl</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-utils</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-jar-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:58:38.000000000 -0400
-+++ ./maven2-plugins/maven-jar-plugin/pom.xml	2006-09-21 18:58:40.000000000 -0400
-@@ -1,53 +1,55 @@
+--- ./maven2-plugins/maven-jar-plugin/pom.xml.withoutxslt	2006-10-05 \
14:46:57.000000000 -0400 ++++ ./maven2-plugins/maven-jar-plugin/pom.xml	2006-10-05 \
14:51:46.000000000 -0400 +@@ -1,53 +1,54 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -20140,13 +19936,12 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <artifactId>maven-jar-plugin</artifactId>
 +   <version>2.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Jar Plugin</name>
@@ -20165,38 +19960,38 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-archiver</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>commons-lang</artifactId>
 +         <version>2.1</version>
++         <groupId>commons-lang</groupId>
++         <artifactId>commons-lang</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-shared</groupId>
-+         <artifactId>plugin-testing-harness</artifactId>
 +         <version>1.0-SNAPSHOT</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-testing-harness</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-jar-plugin/src/test/resources/sign-0/pom.xml.withoutxslt	2006-09-21 \
                18:58:40.000000000 -0400
-+++ ./maven2-plugins/maven-jar-plugin/src/test/resources/sign-0/pom.xml	2006-09-21 \
                18:58:43.000000000 -0400
-@@ -1,31 +1,32 @@
+--- ./maven2-plugins/maven-jar-plugin/src/test/resources/sign-0/pom.xml.withoutxslt	2006-10-05 \
14:46:59.000000000 -0400 ++++ \
./maven2-plugins/maven-jar-plugin/src/test/resources/sign-0/pom.xml	2006-10-05 \
14:47:02.000000000 -0400 +@@ -1,31 +1,31 @@
 -<!-- Test project which creates and signs a jar artifact -->
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -20229,19 +20024,18 @@
 -    </plugins>
 -  </build>
 -</project>
++   <version>1.0</version>
 +   <artifactId>jar-mng-1130-0</artifactId>
 +   <groupId>org.apache.maven.plugins</groupId>
-+   <version>1.0</version>
 +   <packaging>jar</packaging>
 +   <name>Test Case for MNG-1130</name>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.1-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-jar-plugin</artifactId>
-+            <version>2.1-SNAPSHOT</version>
 +            <executions>
 +               <execution>
 +                  <goals>
@@ -20260,9 +20054,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-jar-plugin/src/test/resources/unit/jar-basic-test/pom.xml.withoutxslt	2006-09-21 \
                18:58:43.000000000 -0400
-+++ ./maven2-plugins/maven-jar-plugin/src/test/resources/unit/jar-basic-test/pom.xml	2006-09-21 \
                18:58:45.000000000 -0400
-@@ -1,15 +1,20 @@
+--- ./maven2-plugins/maven-jar-plugin/src/test/resources/unit/jar-basic-test/pom.xml.withoutxslt	2006-10-05 \
14:47:02.000000000 -0400 ++++ \
./maven2-plugins/maven-jar-plugin/src/test/resources/unit/jar-basic-test/pom.xml	2006-10-05 \
14:47:05.000000000 -0400 +@@ -1,15 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <build>
@@ -20279,13 +20073,11 @@
 -    </plugins>
 -  </build>
 -</project>
-+   <dependencies/>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-jar-plugin</artifactId>
 +            <version>2.1-SNAPSHOT</version>
++            <artifactId>maven-jar-plugin</artifactId>
 +            <configuration>
 +               <project \
implementation="org.apache.maven.plugin.testing.stubs.MavenProjectStub">  +           \
<groupId implementation="java.lang.String">foo</groupId> @@ -20298,9 +20090,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:58:45.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/pom.xml	2006-09-21 \
                18:58:48.000000000 -0400
-@@ -1,108 +1,115 @@
+--- ./maven2-plugins/maven-project-info-reports-plugin/pom.xml.withoutxslt	2006-10-05 \
14:47:05.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/pom.xml	2006-10-05 \
14:47:08.000000000 -0400 +@@ -1,108 +1,112 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -20410,14 +20202,13 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-project-info-reports-plugin</artifactId>
 +   <version>2.0-beta-4-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-project-info-reports-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Project Info Reports Plugin</name>
 +   <inceptionYear>2005</inceptionYear>
@@ -20434,14 +20225,12 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-site-plugin</artifactId>
 +            <version>2.0-SNAPSHOT</version>
++            <artifactId>maven-site-plugin</artifactId>
 +         </plugin>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-surefire-plugin</artifactId>
 +            <version>2.1.4-SNAPSHOT</version>
++            <artifactId>maven-surefire-plugin</artifactId>
 +            <configuration>
 +               <skip>true</skip>
 +            </configuration>
@@ -20450,82 +20239,82 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-scm</groupId>
-+         <artifactId>api</artifactId>
 +         <version>1.0-beta-3-SNAPSHOT</version>
++         <groupId>org.apache.maven.scm</groupId>
++         <artifactId>maven-scm-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>httpunit</artifactId>
 +         <version>1.6</version>
++         <groupId>httpunit</groupId>
++         <artifactId>httpunit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>commons-validator</artifactId>
 +         <version>1.1.4</version>
++         <groupId>commons-validator</groupId>
++         <artifactId>commons-validator</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-scm</groupId>
-+         <artifactId>provider-perforce</artifactId>
 +         <version>1.0-beta-3-SNAPSHOT</version>
++         <groupId>org.apache.maven.scm</groupId>
++         <artifactId>maven-scm-provider-perforce</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-model</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-scm</groupId>
-+         <artifactId>manager-plexus</artifactId>
 +         <version>1.0-beta-3-SNAPSHOT</version>
++         <groupId>org.apache.maven.scm</groupId>
++         <artifactId>maven-scm-manager-plexus</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>i18n</artifactId>
 +         <version>1.0-beta-5</version>
++         <groupId>plexus</groupId>
++         <artifactId>plexus-i18n</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>reporting-impl</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven.reporting</groupId>
++         <artifactId>maven-reporting-impl</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-scm</groupId>
-+         <artifactId>provider-clearcase</artifactId>
 +         <version>1.0-beta-3-SNAPSHOT</version>
++         <groupId>org.apache.maven.scm</groupId>
++         <artifactId>maven-scm-provider-clearcase</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-scm</groupId>
-+         <artifactId>provider-starteam</artifactId>
 +         <version>1.0-beta-3-SNAPSHOT</version>
++         <groupId>org.apache.maven.scm</groupId>
++         <artifactId>maven-scm-provider-starteam</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-scm</groupId>
-+         <artifactId>provider-svn-commons</artifactId>
 +         <version>1.0-beta-3-SNAPSHOT</version>
++         <groupId>org.apache.maven.scm</groupId>
++         <artifactId>maven-scm-provider-svn</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-scm</groupId>
-+         <artifactId>provider-cvs-commons</artifactId>
 +         <version>1.0-beta-3-SNAPSHOT</version>
++         <groupId>org.apache.maven.scm</groupId>
++         <artifactId>maven-scm-provider-cvs</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>settings</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-settings</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-Starteam/pom.xml.withoutxslt	2006-09-21 \
                18:58:48.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-Starteam/pom.xml	2006-09-21 \
18:58:51.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-Starteam/pom.xml.withoutxslt	2006-10-05 \
14:47:08.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-Starteam/pom.xml	2006-10-05 \
14:47:12.000000000 -0400  @@ -1,65 +1,46 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -20594,9 +20383,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">project-info-reports-plugin-scm-Starteam</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.report.projectinfo.scm-Starteam</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.report.projectinfo.scm-Starteam</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">project-info-reports-plugin-scm-Starteam</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven ProjectInfo Report \
Test</name> @@ -20630,17 +20419,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test7/pom.xml.withoutxslt	2006-09-21 \
                18:58:51.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test7/pom.xml	2006-09-21 \
18:58:54.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test7/pom.xml.withoutxslt	2006-10-05 \
14:47:12.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test7/pom.xml	2006-10-05 \
14:47:15.000000000 -0400  @@ -1,67 +1,49 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -20710,10 +20499,10 @@
 -    </plugins>
 -  </reporting>
 -</project>
-+   <artifactId>project-info-reports-plugin-test7</artifactId>
-+   <groupId>org.apache.maven.report.projectinfo.test7</groupId>
 +   <version>1.0-SNAPSHOT</version>
-+   <packaging>jar</packaging>
++   <groupId>org.apache.maven.report.projectinfo.test7</groupId>
++   <artifactId>project-info-reports-plugin-test7</artifactId>
++   <packaging>jar</packaging>
 +   <inceptionYear>2005</inceptionYear>
 +   <name>Maven ProjectInfo Report Test7</name>
 +   <description>Test the license report from an URL</description>
@@ -20749,17 +20538,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test6/pom.xml.withoutxslt	2006-09-21 \
                18:58:54.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test6/pom.xml	2006-09-21 \
18:58:56.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test6/pom.xml.withoutxslt	2006-10-05 \
14:47:15.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test6/pom.xml	2006-10-05 \
14:47:19.000000000 -0400  @@ -1,68 +1,50 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -20830,9 +20619,9 @@
 -    </plugins>
 -  </reporting>
 -</project>
-+   <artifactId>project-info-reports-plugin-test6</artifactId>
-+   <groupId>org.apache.maven.report.projectinfo.test6</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.report.projectinfo.test6</groupId>
++   <artifactId>project-info-reports-plugin-test6</artifactId>
 +   <packaging>jar</packaging>
 +   <inceptionYear>2005</inceptionYear>
 +   <name>Maven ProjectInfo Report Test6</name>
@@ -20870,17 +20659,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test12/pom.xml.withoutxslt	2006-09-21 \
                18:58:56.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test12/pom.xml	2006-09-21 \
18:58:59.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test12/pom.xml.withoutxslt	2006-10-05 \
14:47:19.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test12/pom.xml	2006-10-05 \
14:47:21.000000000 -0400  @@ -1,68 +1,47 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -20952,9 +20741,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">project-info-reports-plugin-test12</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.report.projectinfo.test12</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.report.projectinfo.test12</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">project-info-reports-plugin-test12</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven ProjectInfo Report \
Test12</name> @@ -20982,15 +20771,15 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>commons-cli</artifactId>
 +         <version>1.0</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">commons-cli</groupId> ++        \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">commons-cli</artifactId>  +     \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">system</scope>  +         \
<systemPath xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">${basedir}/commons-cli-1.0.jar</systemPath>
  +      </dependency>
@@ -20998,8 +20787,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/pom.xml.withoutxslt	2006-09-21 \
                18:58:59.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/pom.xml	2006-09-21 \
18:59:02.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/pom.xml.withoutxslt	2006-10-05 \
14:47:21.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/pom.xml	2006-10-05 \
14:47:25.000000000 -0400  @@ -1,64 +1,46 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -21066,9 +20855,9 @@
 -    </plugins>
 -  </reporting>
 -</project>
-+   <artifactId>project-info-reports-plugin-test1</artifactId>
-+   <groupId>org.apache.maven.report.projectinfo.test1</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.report.projectinfo.test1</groupId>
++   <artifactId>project-info-reports-plugin-test1</artifactId>
 +   <packaging>jar</packaging>
 +   <inceptionYear>2005</inceptionYear>
 +   <name>Maven ProjectInfo Report Test1</name>
@@ -21097,22 +20886,22 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>commons-cli</artifactId>
 +         <version>1.0</version>
++         <groupId>commons-cli</groupId>
++         <artifactId>commons-cli</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test10/pom.xml.withoutxslt	2006-09-21 \
                18:59:02.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test10/pom.xml	2006-09-21 \
18:59:04.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test10/pom.xml.withoutxslt	2006-10-05 \
14:47:25.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test10/pom.xml	2006-10-05 \
14:47:31.000000000 -0400  @@ -1,79 +1,61 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -21194,9 +20983,9 @@
 -    </plugins>
 -  </reporting>
 -</project>
-+   <artifactId>project-info-reports-plugin-test10</artifactId>
-+   <groupId>org.apache.maven.report.projectinfo.test10</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.report.projectinfo.test10</groupId>
++   <artifactId>project-info-reports-plugin-test10</artifactId>
 +   <packaging>jar</packaging>
 +   <inceptionYear>2005</inceptionYear>
 +   <name>Maven ProjectInfo Report Test10</name>
@@ -21245,17 +21034,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test4/pom.xml.withoutxslt	2006-09-21 \
                18:59:04.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test4/pom.xml	2006-09-21 \
18:59:07.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test4/pom.xml.withoutxslt	2006-10-05 \
14:47:31.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test4/pom.xml	2006-10-05 \
14:47:34.000000000 -0400  @@ -1,64 +1,46 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -21322,9 +21111,9 @@
 -    </plugins>
 -  </reporting>
 -</project>
-+   <artifactId>project-info-reports-plugin-test4</artifactId>
-+   <groupId>org.apache.maven.report.projectinfo.test4</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.report.projectinfo.test4</groupId>
++   <artifactId>project-info-reports-plugin-test4</artifactId>
 +   <packaging>jar</packaging>
 +   <inceptionYear>2005</inceptionYear>
 +   <name>Maven ProjectInfo Report Test4</name>
@@ -21358,17 +21147,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test8/pom.xml.withoutxslt	2006-09-21 \
                18:59:07.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test8/pom.xml	2006-09-21 \
18:59:10.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test8/pom.xml.withoutxslt	2006-10-05 \
14:47:34.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test8/pom.xml	2006-10-05 \
14:47:36.000000000 -0400  @@ -1,66 +1,48 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -21437,9 +21226,9 @@
 -    </plugins>
 -  </reporting>
 -</project>
-+   <artifactId>project-info-reports-plugin-test8</artifactId>
-+   <groupId>org.apache.maven.report.projectinfo.test8</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.report.projectinfo.test8</groupId>
++   <artifactId>project-info-reports-plugin-test8</artifactId>
 +   <packaging>jar</packaging>
 +   <inceptionYear>2005</inceptionYear>
 +   <name>Maven ProjectInfo Report Test8</name>
@@ -21475,17 +21264,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-CVS/pom.xml.withoutxslt	2006-09-21 \
                18:59:10.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-CVS/pom.xml	2006-09-21 \
18:59:12.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-CVS/pom.xml.withoutxslt	2006-10-05 \
14:47:36.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-CVS/pom.xml	2006-10-05 \
14:47:39.000000000 -0400  @@ -1,65 +1,46 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -21554,9 +21343,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">project-info-reports-plugin-scm-CVS</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.report.projectinfo.scm-CVS</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.report.projectinfo.scm-CVS</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">project-info-reports-plugin-scm-CVS</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven ProjectInfo Report \
Test</name> @@ -21590,17 +21379,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-SVN/pom.xml.withoutxslt	2006-09-21 \
                18:59:12.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-SVN/pom.xml	2006-09-21 \
18:59:15.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-SVN/pom.xml.withoutxslt	2006-10-05 \
14:47:39.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-SVN/pom.xml	2006-10-05 \
14:47:42.000000000 -0400  @@ -1,65 +1,46 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -21669,9 +21458,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">project-info-reports-plugin-scm-CVS</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.report.projectinfo.scm-CVS</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.report.projectinfo.scm-CVS</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">project-info-reports-plugin-scm-CVS</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven ProjectInfo Report \
Test</name> @@ -21705,17 +21494,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-unknown/pom.xml.withoutxslt	2006-09-21 \
                18:59:15.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-unknown/pom.xml	2006-09-21 \
18:59:18.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-unknown/pom.xml.withoutxslt	2006-10-05 \
14:47:42.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-unknown/pom.xml	2006-10-05 \
14:47:45.000000000 -0400  @@ -1,65 +1,46 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -21784,9 +21573,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">project-info-reports-plugin-scm-CVS</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.report.projectinfo.scm-CVS</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.report.projectinfo.scm-CVS</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">project-info-reports-plugin-scm-CVS</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven ProjectInfo Report \
Test</name> @@ -21820,18 +21609,18 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test11/pom.xml.withoutxslt	2006-09-21 \
                18:59:18.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test11/pom.xml	2006-09-21 \
                18:59:20.000000000 -0400
-@@ -1,56 +1,39 @@
+--- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test11/pom.xml.withoutxslt	2006-10-05 \
14:47:45.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test11/pom.xml	2006-10-05 \
14:47:48.000000000 -0400 +@@ -1,56 +1,38 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -21889,9 +21678,9 @@
 -    </plugins>
 -  </reporting>
 -</project>
-+   <artifactId>project-info-reports-plugin-test11</artifactId>
-+   <groupId>org.apache.maven.report.projectinfo.test11</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.report.projectinfo.test11</groupId>
++   <artifactId>project-info-reports-plugin-test11</artifactId>
 +   <packaging>jar</packaging>
 +   <inceptionYear>2005</inceptionYear>
 +   <name>Maven ProjectInfo Report Test11</name>
@@ -21922,13 +21711,12 @@
 +         </plugin>
 +      </plugins>
 +   </reporting>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test5/pom.xml.withoutxslt	2006-09-21 \
                18:59:20.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test5/pom.xml	2006-09-21 \
18:59:23.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test5/pom.xml.withoutxslt	2006-10-05 \
14:47:48.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test5/pom.xml	2006-10-05 \
14:47:50.000000000 -0400  @@ -1,63 +1,45 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -21994,9 +21782,9 @@
 -    </plugins>
 -  </reporting>
 -</project>
-+   <artifactId>project-info-reports-plugin-test5</artifactId>
-+   <groupId>org.apache.maven.report.projectinfo.test5</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.report.projectinfo.test5</groupId>
++   <artifactId>project-info-reports-plugin-test5</artifactId>
 +   <packaging>jar</packaging>
 +   <inceptionYear>2005</inceptionYear>
 +   <name>Maven ProjectInfo Report Test5</name>
@@ -22029,17 +21817,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-ClearCase/pom.xml.withoutxslt	2006-09-21 \
                18:59:23.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-ClearCase/pom.xml	2006-09-21 \
18:59:26.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-ClearCase/pom.xml.withoutxslt	2006-10-05 \
14:47:50.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-ClearCase/pom.xml	2006-10-05 \
14:47:53.000000000 -0400  @@ -1,65 +1,46 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -22108,9 +21896,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">project-info-reports-plugin-scm-ClearCase</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.report.projectinfo.scm-ClearCase</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.report.projectinfo.scm-ClearCase</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">project-info-reports-plugin-scm-ClearCase</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven ProjectInfo Report \
Test</name> @@ -22144,17 +21932,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test3/pom.xml.withoutxslt	2006-09-21 \
                18:59:26.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test3/pom.xml	2006-09-21 \
18:59:28.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test3/pom.xml.withoutxslt	2006-10-05 \
14:47:53.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test3/pom.xml	2006-10-05 \
14:47:55.000000000 -0400  @@ -1,64 +1,46 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -22221,9 +22009,9 @@
 -    </plugins>
 -  </reporting>
 -</project>
-+   <artifactId>project-info-reports-plugin-test3</artifactId>
-+   <groupId>org.apache.maven.report.projectinfo.test3</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.report.projectinfo.test3</groupId>
++   <artifactId>project-info-reports-plugin-test3</artifactId>
 +   <packaging>jar</packaging>
 +   <inceptionYear>2005</inceptionYear>
 +   <name>Maven ProjectInfo Report Test3</name>
@@ -22257,17 +22045,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-Perforce/pom.xml.withoutxslt	2006-09-21 \
                18:59:28.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-Perforce/pom.xml	2006-09-21 \
18:59:33.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-Perforce/pom.xml.withoutxslt	2006-10-05 \
14:47:55.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-scm-Perforce/pom.xml	2006-10-05 \
14:47:58.000000000 -0400  @@ -1,65 +1,46 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -22336,9 +22124,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">project-info-reports-plugin-scm-Perforce</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.report.projectinfo.scm-Perforce</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.report.projectinfo.scm-Perforce</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">project-info-reports-plugin-scm-Perforce</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven ProjectInfo Report \
Test</name> @@ -22372,17 +22160,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test9/pom.xml.withoutxslt	2006-09-21 \
                18:59:33.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test9/pom.xml	2006-09-21 \
18:59:41.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test9/pom.xml.withoutxslt	2006-10-05 \
14:47:58.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test9/pom.xml	2006-10-05 \
14:48:00.000000000 -0400  @@ -1,79 +1,61 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -22464,9 +22252,9 @@
 -    </plugins>
 -  </reporting>
 -</project>
-+   <artifactId>project-info-reports-plugin-test9</artifactId>
-+   <groupId>org.apache.maven.report.projectinfo.test9</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.report.projectinfo.test9</groupId>
++   <artifactId>project-info-reports-plugin-test9</artifactId>
 +   <packaging>jar</packaging>
 +   <inceptionYear>2005</inceptionYear>
 +   <name>Maven ProjectInfo Report Test9</name>
@@ -22515,17 +22303,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test2/pom.xml.withoutxslt	2006-09-21 \
                18:59:41.000000000 -0400
-+++ ./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test2/pom.xml	2006-09-21 \
18:59:50.000000000 -0400 +--- \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test2/pom.xml.withoutxslt	2006-10-05 \
14:48:00.000000000 -0400 ++++ \
./maven2-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test2/pom.xml	2006-10-05 \
14:48:03.000000000 -0400  @@ -1,64 +1,46 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -22592,9 +22380,9 @@
 -    </plugins>
 -  </reporting>
 -</project>
-+   <artifactId>project-info-reports-plugin-test2</artifactId>
-+   <groupId>org.apache.maven.report.projectinfo.test2</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.report.projectinfo.test2</groupId>
++   <artifactId>project-info-reports-plugin-test2</artifactId>
 +   <packaging>jar</packaging>
 +   <inceptionYear>2005</inceptionYear>
 +   <name>Maven ProjectInfo Report Test2</name>
@@ -22628,18 +22416,18 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-plugin-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:59:50.000000000 -0400
-+++ ./maven2-plugins/maven-plugin-plugin/pom.xml	2006-09-21 18:59:58.000000000 -0400
-@@ -1,67 +1,70 @@
+--- ./maven2-plugins/maven-plugin-plugin/pom.xml.withoutxslt	2006-10-05 \
14:48:03.000000000 -0400 ++++ ./maven2-plugins/maven-plugin-plugin/pom.xml	2006-10-05 \
14:48:06.000000000 -0400 +@@ -1,67 +1,69 @@
 -<?xml version="1.0" encoding="UTF-8"?><project>
 -  <parent>
 -    <artifactId>maven-plugins</artifactId>
@@ -22709,78 +22497,77 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-plugin-plugin</artifactId>
 +   <version>2.1.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-plugin-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven PLUGIN Plugin</name>
 +   <inceptionYear>2001</inceptionYear>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>repository-metadata</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-repository-metadata</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-registry</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-registry</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-tools-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-tools-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-descriptor</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-descriptor</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-tools-java</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-tools-java</artifactId>
 +         <scope>runtime</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-manager</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact-manager</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-tools-beanshell</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-tools-beanshell</artifactId>
 +         <scope>runtime</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>reporting-impl</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven.reporting</groupId>
++         <artifactId>maven-reporting-impl</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/pom.xml.withoutxslt	2006-09-21 19:01:38.000000000 -0400
-+++ ./maven2-plugins/pom.xml	2006-09-21 19:12:57.000000000 -0400
-@@ -1,93 +1,95 @@
+--- ./maven2-plugins/pom.xml.withoutxslt	2006-10-05 14:48:37.000000000 -0400
++++ ./maven2-plugins/pom.xml	2006-10-05 14:48:40.000000000 -0400
+@@ -1,93 +1,94 @@
 -<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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -22857,15 +22644,15 @@
 -    <pluginManagement>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>plugins</artifactId>
 +   <version>2-SNAPSHOT</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>parent</artifactId>
 +      <version>1.0</version>
++      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-parent</artifactId>  +    \
<relativePath xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">../pom/maven/pom.xml</relativePath>
  +   </parent>
++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugins</artifactId>  +   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Plugins</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Plugins</description> @@ \
-22893,7 +22680,7 @@  +      <module>maven-assembly-plugin</module>
 +      <module>maven-checkstyle-plugin</module>
 +      <module>maven-clean-plugin</module>
-+      
++      <module>maven-clover-plugin</module>
 +      <module>maven-compiler-plugin</module>
 +      <module>maven-dependency-plugin</module>
 +      <module>maven-deploy-plugin</module>
@@ -22951,7 +22738,6 @@
 -  </reporting>
 -</project>
 +   </reporting>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <pluginManagement xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> @@ -22968,9 +22754,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-surefire-plugin/pom.xml.withoutxslt	2006-09-21 \
                18:59:58.000000000 -0400
-+++ ./maven2-plugins/maven-surefire-plugin/pom.xml	2006-09-21 19:00:06.000000000 \
                -0400
-@@ -1,56 +1,59 @@
+--- ./maven2-plugins/maven-surefire-plugin/pom.xml.withoutxslt	2006-10-05 \
14:48:06.000000000 -0400 ++++ \
./maven2-plugins/maven-surefire-plugin/pom.xml	2006-10-05 14:48:08.000000000 -0400 \
                +@@ -1,56 +1,58 @@
 -<?xml version="1.0" encoding="UTF-8"?><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-plugins</artifactId>
@@ -23028,14 +22814,13 @@
 -  </properties>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-surefire-plugin</artifactId>
 +   <version>2.1.4-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugins</artifactId> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-surefire-plugin</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Surefire Plugin</name>  + \
<contributors xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> @@ -23050,44 +22835,44 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">runtime</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP/maven-surefire</groupId>
-+         <artifactId>booter</artifactId>
 +         <version>1.5.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.surefire</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">surefire-booter</artifactId>  + \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven-surefire</groupId>
-+         <artifactId>surefire</artifactId>
 +         <version>1.5.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.surefire</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">surefire</artifactId>  +        \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">runtime</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">runtime</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact</artifactId>  +  \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2-plugins/maven-surefire-plugin/src/it/test3/pom.xml.withoutxslt	2006-09-21 \
                19:00:06.000000000 -0400
-+++ ./maven2-plugins/maven-surefire-plugin/src/it/test3/pom.xml	2006-09-21 \
19:00:14.000000000 -0400 +--- \
./maven2-plugins/maven-surefire-plugin/src/it/test3/pom.xml.withoutxslt	2006-10-05 \
14:48:08.000000000 -0400 ++++ \
./maven2-plugins/maven-surefire-plugin/src/it/test3/pom.xml	2006-10-05 \
14:48:11.000000000 -0400  @@ -1,34 +1,30 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -23125,18 +22910,18 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test3</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.surefire</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.surefire</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test3</artifactId>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test for MSUREFIRE-54</name>  + \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">XML test reports are not \
well-formed when failure message contains quotes.</description>  +   \
<modelVersion>4.0.0</modelVersion>  +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-surefire-plugin</artifactId>
 +            <version>2.1.4-SNAPSHOT</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-surefire-plugin</artifactId>
  +            <configuration xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               \
<testFailureIgnore>true</testFailureIgnore>  +            </configuration>
@@ -23145,17 +22930,17 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-surefire-plugin/src/it/test1/pom.xml.withoutxslt	2006-09-21 \
                19:00:15.000000000 -0400
-+++ ./maven2-plugins/maven-surefire-plugin/src/it/test1/pom.xml	2006-09-21 \
19:00:23.000000000 -0400 +--- \
./maven2-plugins/maven-surefire-plugin/src/it/test1/pom.xml.withoutxslt	2006-10-05 \
14:48:11.000000000 -0400 ++++ \
./maven2-plugins/maven-surefire-plugin/src/it/test1/pom.xml	2006-10-05 \
14:48:13.000000000 -0400  @@ -1,22 +1,18 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -23181,26 +22966,26 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test1</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.surefire</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.surefire</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test1</artifactId>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test for default \
configuration</name>  +   <description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test for default surefire \
configuration</description>  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-surefire-plugin/src/it/pom.xml.withoutxslt	2006-09-21 \
                19:00:23.000000000 -0400
-+++ ./maven2-plugins/maven-surefire-plugin/src/it/pom.xml	2006-09-21 \
                19:00:32.000000000 -0400
-@@ -1,19 +1,16 @@
+--- ./maven2-plugins/maven-surefire-plugin/src/it/pom.xml.withoutxslt	2006-10-05 \
14:48:13.000000000 -0400 ++++ \
./maven2-plugins/maven-surefire-plugin/src/it/pom.xml	2006-10-05 14:48:15.000000000 \
-0400 +@@ -1,19 +1,15 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
 -    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -23222,9 +23007,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">it</artifactId>
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.surefire</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.surefire</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">it</artifactId>  +   <packaging \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Surefire plugin integration \
tests</name>  +   <modules xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> @@ -23232,13 +23017,12 @@
 +      <module>test2</module>
 +      <module>test3</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-surefire-plugin/src/it/test2/pom.xml.withoutxslt	2006-09-21 \
                19:00:32.000000000 -0400
-+++ ./maven2-plugins/maven-surefire-plugin/src/it/test2/pom.xml	2006-09-21 \
19:00:40.000000000 -0400 +--- \
./maven2-plugins/maven-surefire-plugin/src/it/test2/pom.xml.withoutxslt	2006-10-05 \
14:48:15.000000000 -0400 ++++ \
./maven2-plugins/maven-surefire-plugin/src/it/test2/pom.xml	2006-10-05 \
14:48:18.000000000 -0400  @@ -1,34 +1,30 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -23276,18 +23060,18 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test2</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.surefire</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.surefire</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test2</artifactId>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test for MSUREFIRE-20</name>  + \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">forkMode=pertest fails to call \
setUp</description>  +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-surefire-plugin</artifactId>
 +            <version>2.1.4-SNAPSHOT</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-surefire-plugin</artifactId>
  +            <configuration xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               \
<forkMode>pertest</forkMode>  +            </configuration>
@@ -23296,18 +23080,18 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-clover-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:00:40.000000000 -0400
-+++ ./maven2-plugins/maven-clover-plugin/pom.xml	2006-09-21 19:00:49.000000000 -0400
-@@ -1,104 +1,85 @@
+--- ./maven2-plugins/maven-clover-plugin/pom.xml.withoutxslt	2006-10-05 \
14:48:18.000000000 -0400 ++++ ./maven2-plugins/maven-clover-plugin/pom.xml	2006-10-05 \
14:48:20.000000000 -0400 +@@ -1,104 +1,84 @@
 -<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">
 -
@@ -23414,17 +23198,16 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-clover-plugin</artifactId>
 +   <version>2.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugins</artifactId> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
  +   </parent>
 +   <prerequisites xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      <maven>2.0.1</maven>
 +   </prerequisites>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-clover-plugin</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Clover Plugin</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven plugin for \
Clover</description> @@ -23448,58 +23231,58 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-project</artifactId>  +   \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>ant</artifactId>
 +         <version>1.6.5</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">ant</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">ant</artifactId>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>reporting-impl</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.reporting</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-reporting-impl</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>clover</artifactId>
 +         <version>1.3.12</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">com.cenqua.clover</groupId> ++  \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">clover</artifactId>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>compiler-api</artifactId>
 +         <version>1.6-SNAPSHOT</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-compiler-api</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>jmock</artifactId>
 +         <version>1.0.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jmock</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jmock</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-clover-plugin/src/it/simple/pom.xml.withoutxslt	2006-09-21 \
                19:00:49.000000000 -0400
-+++ ./maven2-plugins/maven-clover-plugin/src/it/simple/pom.xml	2006-09-21 \
19:00:57.000000000 -0400 +--- \
./maven2-plugins/maven-clover-plugin/src/it/simple/pom.xml.withoutxslt	2006-10-05 \
14:48:20.000000000 -0400 ++++ \
./maven2-plugins/maven-clover-plugin/src/it/simple/pom.xml	2006-10-05 \
14:48:23.000000000 -0400  @@ -1,85 +1,78 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -23527,9 +23310,9 @@
 -        <configuration>
 -
 -          <!-- Verify that we can modify the location of the Clover database and \
                that the directory is created if
-+   <artifactId>maven-clover-plugin-sample-simple</artifactId>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.plugins</groupId>
++   <artifactId>maven-clover-plugin-sample-simple</artifactId>
 +   <packaging>jar</packaging>
 +   <name>Maven Clover Plugin Simple Sample</name>
 +   <description>Maven Clover Plugin Simple Sample</description>
@@ -23612,18 +23395,18 @@
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.1-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-compiler-plugin</artifactId>
-+            <version>2.1-SNAPSHOT</version>
 +            <configuration>
 +               <source>1.4</source>
 +               <target>1.4</target>
 +            </configuration>
 +         </plugin>
 +         <plugin>
++            <version>2.1-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-clover-plugin</artifactId>
-+            <version>2.1-SNAPSHOT</version>
 +            <configuration>
 +               <targetPercentage>1%</targetPercentage><!-- Verify that we can \
specify the JDK version for Clover's instrumentation -->  +               \
<jdk>1.4</jdk><!-- Verify that we can exclude some files from the instrumentation --> \
@@ -23653,17 +23436,17 @@  +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-clover-plugin/src/it/multiproject/ear1/pom.xml.withoutxslt	2006-09-21 \
                19:00:58.000000000 -0400
-+++ ./maven2-plugins/maven-clover-plugin/src/it/multiproject/ear1/pom.xml	2006-09-21 \
19:01:06.000000000 -0400 +--- \
./maven2-plugins/maven-clover-plugin/src/it/multiproject/ear1/pom.xml.withoutxslt	2006-10-05 \
14:48:23.000000000 -0400 ++++ \
./maven2-plugins/maven-clover-plugin/src/it/multiproject/ear1/pom.xml	2006-10-05 \
14:48:25.000000000 -0400  @@ -1,21 +1,23 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -23680,7 +23463,6 @@
 -  <version>1.0-SNAPSHOT</version>
 -  <dependencies>
 -    <dependency>
-+   <artifactId>maven-clover-plugin-sample-multiproject-ear1</artifactId>
 +   <version>1.0-SNAPSHOT</version>
 +   <parent>
        <groupId>org.apache.maven.plugins</groupId>
@@ -23692,6 +23474,7 @@
 -  </dependencies>
 -</project>
 +   </parent>
++   <artifactId>maven-clover-plugin-sample-multiproject-ear1</artifactId>
 +   <packaging>ear</packaging>
 +   <name>Maven Clover Plugin Multiproject Sample - EAR 1</name>
 +   <description>Maven Clover Plugin Multiproject Sample - EAR 1</description>
@@ -23707,8 +23490,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-clover-plugin/src/it/multiproject/jar2/pom.xml.withoutxslt	2006-09-21 \
                19:01:06.000000000 -0400
-+++ ./maven2-plugins/maven-clover-plugin/src/it/multiproject/jar2/pom.xml	2006-09-21 \
19:01:14.000000000 -0400 +--- \
./maven2-plugins/maven-clover-plugin/src/it/multiproject/jar2/pom.xml.withoutxslt	2006-10-05 \
14:48:25.000000000 -0400 ++++ \
./maven2-plugins/maven-clover-plugin/src/it/multiproject/jar2/pom.xml	2006-10-05 \
14:48:28.000000000 -0400  @@ -1,20 +1,22 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -23725,7 +23508,6 @@
 -  <version>1.0-SNAPSHOT</version>
 -  <dependencies>
 -    <dependency>
-+   <artifactId>maven-clover-plugin-sample-multiproject-jar2</artifactId>
 +   <version>1.0-SNAPSHOT</version>
 +   <parent>
        <groupId>org.apache.maven.plugins</groupId>
@@ -23736,6 +23518,7 @@
 -  </dependencies>
 -</project>
 +   </parent>
++   <artifactId>maven-clover-plugin-sample-multiproject-jar2</artifactId>
 +   <packaging>jar</packaging>
 +   <name>Maven Clover Plugin Multiproject Sample - JAR 2</name>
 +   <description>Maven Clover Plugin Multiproject Sample - JAR 2</description>
@@ -23750,9 +23533,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-clover-plugin/src/it/multiproject/jar1/pom.xml.withoutxslt	2006-09-21 \
                19:01:14.000000000 -0400
-+++ ./maven2-plugins/maven-clover-plugin/src/it/multiproject/jar1/pom.xml	2006-09-21 \
                19:01:21.000000000 -0400
-@@ -1,13 +1,16 @@
+--- ./maven2-plugins/maven-clover-plugin/src/it/multiproject/jar1/pom.xml.withoutxslt	2006-10-05 \
14:48:28.000000000 -0400 ++++ \
./maven2-plugins/maven-clover-plugin/src/it/multiproject/jar1/pom.xml	2006-10-05 \
14:48:31.000000000 -0400 +@@ -1,13 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -23767,23 +23550,22 @@
 -  <description>Maven Clover Plugin Multiproject Sample - JAR 1</description>
 -  <version>1.0-SNAPSHOT</version>
 -</project>
-+   <artifactId>maven-clover-plugin-sample-multiproject-jar1</artifactId>
 +   <version>1.0-SNAPSHOT</version>
 +   <parent>
 +      <groupId>org.apache.maven.plugins</groupId>
 +      <artifactId>maven-clover-plugin-sample-multiproject</artifactId>
 +      <version>1.0-SNAPSHOT</version>
 +   </parent>
++   <artifactId>maven-clover-plugin-sample-multiproject-jar1</artifactId>
 +   <packaging>jar</packaging>
 +   <name>Maven Clover Plugin Multiproject Sample - JAR 1</name>
 +   <description>Maven Clover Plugin Multiproject Sample - JAR 1</description>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-clover-plugin/src/it/multiproject/war1/pom.xml.withoutxslt	2006-09-21 \
                19:01:22.000000000 -0400
-+++ ./maven2-plugins/maven-clover-plugin/src/it/multiproject/war1/pom.xml	2006-09-21 \
19:01:30.000000000 -0400 +--- \
./maven2-plugins/maven-clover-plugin/src/it/multiproject/war1/pom.xml.withoutxslt	2006-10-05 \
14:48:31.000000000 -0400 ++++ \
./maven2-plugins/maven-clover-plugin/src/it/multiproject/war1/pom.xml	2006-10-05 \
14:48:35.000000000 -0400  @@ -1,20 +1,22 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -23800,7 +23582,6 @@
 -  <version>1.0-SNAPSHOT</version>
 -  <dependencies>
 -    <dependency>
-+   <artifactId>maven-clover-plugin-sample-multiproject-war1</artifactId>
 +   <version>1.0-SNAPSHOT</version>
 +   <parent>
        <groupId>org.apache.maven.plugins</groupId>
@@ -23811,6 +23592,7 @@
 -  </dependencies>
 -</project>
 +   </parent>
++   <artifactId>maven-clover-plugin-sample-multiproject-war1</artifactId>
 +   <packaging>war</packaging>
 +   <name>Maven Clover Plugin Multiproject Sample - WAR 1</name>
 +   <description>Maven Clover Plugin Multiproject Sample - WAR 1</description>
@@ -23825,9 +23607,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-clover-plugin/src/it/multiproject/pom.xml.withoutxslt	2006-09-21 \
                19:01:30.000000000 -0400
-+++ ./maven2-plugins/maven-clover-plugin/src/it/multiproject/pom.xml	2006-09-21 \
                19:01:37.000000000 -0400
-@@ -1,51 +1,55 @@
+--- ./maven2-plugins/maven-clover-plugin/src/it/multiproject/pom.xml.withoutxslt	2006-10-05 \
14:48:35.000000000 -0400 ++++ \
./maven2-plugins/maven-clover-plugin/src/it/multiproject/pom.xml	2006-10-05 \
14:48:37.000000000 -0400 +@@ -1,51 +1,54 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -23880,9 +23662,9 @@
 -    <module>ear1</module>
 -  </modules>
 -</project>
-+   <artifactId>maven-clover-plugin-sample-multiproject</artifactId>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.plugins</groupId>
++   <artifactId>maven-clover-plugin-sample-multiproject</artifactId>
 +   <packaging>pom</packaging>
 +   <name>Maven Clover Plugin Multiproject Sample</name>
 +   <description>Maven Clover Plugin Multiproject Sample</description>
@@ -23904,9 +23686,8 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-clover-plugin</artifactId>
 +            <version>2.1-SNAPSHOT</version>
++            <artifactId>maven-clover-plugin</artifactId>
 +            <configuration>
 +               <flushPolicy>threaded</flushPolicy>
 +               <flushInterval>100</flushInterval>
@@ -23925,18 +23706,18 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-assembly-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:01:46.000000000 -0400
-+++ ./maven2-plugins/maven-assembly-plugin/pom.xml	2006-09-21 19:01:54.000000000 \
                -0400
-@@ -1,90 +1,94 @@
+--- ./maven2-plugins/maven-assembly-plugin/pom.xml.withoutxslt	2006-10-05 \
14:48:40.000000000 -0400 ++++ \
./maven2-plugins/maven-assembly-plugin/pom.xml	2006-10-05 14:51:33.000000000 -0400 \
+@@ -1,90 +1,93 @@  +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -24028,13 +23809,12 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <artifactId>maven-assembly-plugin</artifactId>
 +   <version>2.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Assembly Plugin</name>
@@ -24042,9 +23822,9 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
 +            <version>1.0-alpha-8</version>
++            <groupId>org.codehaus.modello</groupId>
++            <artifactId>modello-maven-plugin</artifactId>
 +            <executions>
 +               <execution>
 +                  <id>descriptor</id>
@@ -24078,52 +23858,52 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>mavencore</artifactId>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-core</artifactId>
 +         <version>2.0.4</version>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-archiver</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>1.0-alpha-5</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-archiver</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-utils</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-shared</groupId>
-+         <artifactId>file-management</artifactId>
 +         <version>1.0</version>
++         <groupId>org.apache.maven.shared</groupId>
++         <artifactId>file-management</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-assembly-plugin/src/it/repository-assembly/pom.xml.withoutxslt	2006-09-21 \
                19:01:54.000000000 -0400
-+++ ./maven2-plugins/maven-assembly-plugin/src/it/repository-assembly/pom.xml	2006-09-21 \
                19:02:02.000000000 -0400
-@@ -1,29 +1,32 @@
+--- ./maven2-plugins/maven-assembly-plugin/src/it/repository-assembly/pom.xml.withoutxslt	2006-10-05 \
14:48:43.000000000 -0400 ++++ \
./maven2-plugins/maven-assembly-plugin/src/it/repository-assembly/pom.xml	2006-10-05 \
14:48:45.000000000 -0400 +@@ -1,29 +1,31 @@
 -<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">
 -  <modelVersion>4.0.0</modelVersion>
@@ -24155,9 +23935,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">repository-assembly</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.assembly.test</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.assembly.test</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">repository-assembly</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Quick Start \
Archetype</name>  +   <url xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org</url> \
@@ -24165,9 +23945,8 @@  +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-assembly-plugin</artifactId>
 +            <version>2.1-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-assembly-plugin</artifactId>
  +            <configuration xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               \
<descriptor>src/assemble/bin.xml</descriptor>  +               \
<finalName>assembly</finalName> @@ -24177,18 +23956,18 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-ejb-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:02:02.000000000 -0400
-+++ ./maven2-plugins/maven-ejb-plugin/pom.xml	2006-09-21 19:02:10.000000000 -0400
-@@ -1,29 +1,32 @@
+--- ./maven2-plugins/maven-ejb-plugin/pom.xml.withoutxslt	2006-10-05 \
14:48:45.000000000 -0400 ++++ ./maven2-plugins/maven-ejb-plugin/pom.xml	2006-10-05 \
14:48:48.000000000 -0400 +@@ -1,29 +1,31 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -24219,40 +23998,39 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-ejb-plugin</artifactId>
 +   <version>2.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-ejb-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven EJB Plugin</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-archiver</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-verifier-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:02:10.000000000 -0400
-+++ ./maven2-plugins/maven-verifier-plugin/pom.xml	2006-09-21 19:02:18.000000000 \
                -0400
-@@ -1,51 +1,55 @@
+--- ./maven2-plugins/maven-verifier-plugin/pom.xml.withoutxslt	2006-10-05 \
14:48:48.000000000 -0400 ++++ \
./maven2-plugins/maven-verifier-plugin/pom.xml	2006-10-05 14:48:50.000000000 -0400 \
+@@ -1,51 +1,54 @@  +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -24305,23 +24083,22 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-verifier-plugin</artifactId>
 +   <version>1.0-beta-2-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-verifier-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Verifier Plugin</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
 +            <version>1.0-alpha-8</version>
++            <groupId>org.codehaus.modello</groupId>
++            <artifactId>modello-maven-plugin</artifactId>
 +            <executions>
 +               <execution>
 +                  <goals>
@@ -24340,28 +24117,28 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-utils</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-resources-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:02:18.000000000 -0400
-+++ ./maven2-plugins/maven-resources-plugin/pom.xml	2006-09-21 19:02:27.000000000 \
                -0400
-@@ -1,34 +1,37 @@
+--- ./maven2-plugins/maven-resources-plugin/pom.xml.withoutxslt	2006-10-05 \
14:48:50.000000000 -0400 ++++ \
./maven2-plugins/maven-resources-plugin/pom.xml	2006-10-05 14:48:53.000000000 -0400 \
+@@ -1,34 +1,36 @@  +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -24397,45 +24174,44 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-resources-plugin</artifactId>
 +   <version>2.2-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-resources-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Resources Plugin</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>commons-io</artifactId>
 +         <version>1.0</version>
++         <groupId>commons-io</groupId>
++         <artifactId>commons-io</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-model</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-war-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:02:27.000000000 -0400
-+++ ./maven2-plugins/maven-war-plugin/pom.xml	2006-09-21 19:02:35.000000000 -0400
-@@ -1,34 +1,37 @@
+--- ./maven2-plugins/maven-war-plugin/pom.xml.withoutxslt	2006-10-05 \
14:48:53.000000000 -0400 ++++ ./maven2-plugins/maven-war-plugin/pom.xml	2006-10-05 \
14:48:55.000000000 -0400 +@@ -1,34 +1,36 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -24471,45 +24247,44 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-war-plugin</artifactId>
 +   <version>2.0-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-war-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven War Plugin</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-archiver</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-utils</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-clean-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:02:35.000000000 -0400
-+++ ./maven2-plugins/maven-clean-plugin/pom.xml	2006-09-21 19:02:43.000000000 -0400
-@@ -1,43 +1,44 @@
+--- ./maven2-plugins/maven-clean-plugin/pom.xml.withoutxslt	2006-10-05 \
14:48:55.000000000 -0400 ++++ ./maven2-plugins/maven-clean-plugin/pom.xml	2006-10-05 \
14:48:58.000000000 -0400 +@@ -1,43 +1,43 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<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"> @@ -24555,14 +24330,13 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-clean-plugin</artifactId>
 +   <version>2.1.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugins</artifactId> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-clean-plugin</artifactId> \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Clean Plugin</name>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2001</inceptionYear> @@ \
-24574,33 +24348,33 @@  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP/maven-shared</groupId>
-+         <artifactId>file-management</artifactId>
 +         <version>1.0</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.shared</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">file-management</artifactId>  + \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-one-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:02:43.000000000 -0400
-+++ ./maven2-plugins/maven-one-plugin/pom.xml	2006-09-21 19:02:52.000000000 -0400
-@@ -1,60 +1,63 @@
+--- ./maven2-plugins/maven-one-plugin/pom.xml.withoutxslt	2006-10-05 \
14:48:58.000000000 -0400 ++++ ./maven2-plugins/maven-one-plugin/pom.xml	2006-10-05 \
14:49:00.000000000 -0400 +@@ -1,60 +1,62 @@
 -<?xml version="1.0" encoding="UTF-8"?><project>
 -  <parent>
 -    <artifactId>maven-plugins</artifactId>
@@ -24663,14 +24437,13 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-one-plugin</artifactId>
 +   <version>1.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-one-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven 1.x Plugin</name>
 +   <reporting>
@@ -24686,48 +24459,48 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>1.0-alpha-5</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-archiver</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-archiver</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-utils</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-javadoc-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:02:52.000000000 -0400
-+++ ./maven2-plugins/maven-javadoc-plugin/pom.xml	2006-09-21 19:03:00.000000000 \
                -0400
-@@ -1,65 +1,67 @@
+--- ./maven2-plugins/maven-javadoc-plugin/pom.xml.withoutxslt	2006-10-05 \
14:49:00.000000000 -0400 ++++ \
./maven2-plugins/maven-javadoc-plugin/pom.xml	2006-10-05 14:49:04.000000000 -0400 +@@ \
                -1,65 +1,66 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -24794,23 +24567,22 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-javadoc-plugin</artifactId>
 +   <version>2.0-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-javadoc-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Javadoc Plugin</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
 +            <version>1.0-alpha-8</version>
++            <groupId>org.codehaus.modello</groupId>
++            <artifactId>modello-maven-plugin</artifactId>
 +            <executions>
 +               <execution>
 +                  <goals>
@@ -24827,42 +24599,42 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>commons-lang</artifactId>
 +         <version>2.1</version>
++         <groupId>commons-lang</groupId>
++         <artifactId>commons-lang</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>1.0-alpha-5</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-archiver</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>reporting-impl</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven.reporting</groupId>
++         <artifactId>maven-reporting-impl</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/pom.xml.withoutxslt	2006-09-21 \
                19:03:00.000000000 -0400
-+++ ./maven2-plugins/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/pom.xml	2006-09-21 \
                19:03:08.000000000 -0400
-@@ -1,65 +1,49 @@
+--- ./maven2-plugins/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/pom.xml.withoutxslt	2006-10-05 \
14:49:04.000000000 -0400 ++++ \
./maven2-plugins/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/pom.xml	2006-10-05 \
14:49:06.000000000 -0400 +@@ -1,65 +1,48 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -24929,9 +24701,9 @@
 -    </plugins>
 -  </build>
 -</project>
-+   <artifactId>javadoc-plugin-test2</artifactId>
-+   <groupId>org.apache.maven.plugin.javadoc.test2</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.plugin.javadoc.test2</groupId>
++   <artifactId>javadoc-plugin-test2</artifactId>
 +   <packaging>jar</packaging>
 +   <inceptionYear>2006</inceptionYear>
 +   <name>Maven Javadoc Plugin Test2 for MJAVADOC-52</name>
@@ -24952,9 +24724,8 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-javadoc-plugin</artifactId>
 +            <version>2.0-SNAPSHOT</version>
++            <artifactId>maven-javadoc-plugin</artifactId>
 +            <configuration>
 +               <minmemory>128m</minmemory>
 +               <maxmemory>512</maxmemory>
@@ -24968,18 +24739,18 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test1/pom.xml.withoutxslt	2006-09-21 \
                19:03:08.000000000 -0400
-+++ ./maven2-plugins/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test1/pom.xml	2006-09-21 \
                19:03:16.000000000 -0400
-@@ -1,91 +1,75 @@
+--- ./maven2-plugins/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test1/pom.xml.withoutxslt	2006-10-05 \
14:49:06.000000000 -0400 ++++ \
./maven2-plugins/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test1/pom.xml	2006-10-05 \
14:49:09.000000000 -0400 +@@ -1,91 +1,74 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -25072,9 +24843,9 @@
 -    </plugins>
 -  </build>
 -</project>
-+   <artifactId>javadoc-plugin-test1</artifactId>
-+   <groupId>org.apache.maven.plugin.javadoc.test1</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.plugin.javadoc.test1</groupId>
++   <artifactId>javadoc-plugin-test1</artifactId>
 +   <packaging>jar</packaging>
 +   <inceptionYear>2005</inceptionYear>
 +   <name>Maven Javadoc Plugin Test1</name>
@@ -25095,9 +24866,8 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-javadoc-plugin</artifactId>
 +            <version>2.0-SNAPSHOT</version>
++            <artifactId>maven-javadoc-plugin</artifactId>
 +            <configuration>
 +               <minmemory>128m</minmemory>
 +               <maxmemory>512</maxmemory>
@@ -25137,17 +24907,17 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test3/pom.xml.withoutxslt	2006-09-21 \
                19:03:16.000000000 -0400
-+++ ./maven2-plugins/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test3/pom.xml	2006-09-21 \
19:03:24.000000000 -0400 +--- \
./maven2-plugins/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test3/pom.xml.withoutxslt	2006-10-05 \
14:49:09.000000000 -0400 ++++ \
./maven2-plugins/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test3/pom.xml	2006-10-05 \
14:49:11.000000000 -0400  @@ -1,65 +1,48 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -25215,9 +24985,9 @@
 -	  </plugins>
 -  </build>
 -</project>
-+   <artifactId>javadoc-plugin-test3</artifactId>
-+   <groupId>org.apache.maven.plugin.javadoc.test3</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.plugin.javadoc.test3</groupId>
++   <artifactId>javadoc-plugin-test3</artifactId>
 +   <packaging>jar</packaging>
 +   <inceptionYear>2006</inceptionYear>
 +   <name>Maven Javadoc Plugin Test3 for MJAVADOC-45</name>
@@ -25242,9 +25012,9 @@
 +   <build>
 +      <plugins>
 +         <plugin>
++            <version>2.0-SNAPSHOT</version>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-javadoc-plugin</artifactId>
-+            <version>2.0-SNAPSHOT</version>
 +            <configuration>
 +               <bottom>Copyright 2006 Brian S O'Neill. All Rights \
Reserved.</bottom>  +            </configuration>
@@ -25253,18 +25023,18 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-ear-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:03:24.000000000 -0400
-+++ ./maven2-plugins/maven-ear-plugin/pom.xml	2006-09-21 19:03:32.000000000 -0400
-@@ -1,34 +1,37 @@
+--- ./maven2-plugins/maven-ear-plugin/pom.xml.withoutxslt	2006-10-05 \
14:49:11.000000000 -0400 ++++ ./maven2-plugins/maven-ear-plugin/pom.xml	2006-10-05 \
14:49:14.000000000 -0400 +@@ -1,34 +1,36 @@
 -<?xml version="1.0" encoding="UTF-8"?><project>
 -  <parent>
 -    <artifactId>maven-plugins</artifactId>
@@ -25301,45 +25071,44 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-ear-plugin</artifactId>
 +   <version>2.2-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-ear-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Ear plugin</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-archiver</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-utils</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:03:32.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/pom.xml	2006-09-21 19:03:40.000000000 -0400
-@@ -1,93 +1,97 @@
+--- ./maven2-plugins/maven-site-plugin/pom.xml.withoutxslt	2006-10-05 \
14:49:14.000000000 -0400 ++++ ./maven2-plugins/maven-site-plugin/pom.xml	2006-10-05 \
14:49:16.000000000 -0400 +@@ -1,93 +1,96 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -25434,14 +25203,13 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-site-plugin</artifactId>
 +   <version>2.0-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>maven-plugin-parent</artifactId>
 +      <version>2.0</version>
++      <artifactId>maven-plugin-parent</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-site-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Site plugin</name>
 +   <prerequisites>
@@ -25496,19 +25264,19 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-doxia</groupId>
-+         <artifactId>site-renderer</artifactId>
 +         <version>1.0-alpha-7</version>
++         <groupId>org.apache.maven.doxia</groupId>
++         <artifactId>doxia-site-renderer</artifactId>
 +         <exclusions>
 +            <exclusion><!-- TODO: upgrade p-velo -->
 +               <groupId>plexus</groupId>
@@ -25517,22 +25285,22 @@
 +         </exclusions>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>reporting-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven.reporting</groupId>
++         <artifactId>maven-reporting-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-utils</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test9/pom.xml.withoutxslt	2006-09-21 \
                19:03:41.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test9/pom.xml	2006-09-21 \
                19:03:49.000000000 -0400
-@@ -1,70 +1,53 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test9/pom.xml.withoutxslt	2006-10-05 \
14:49:16.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test9/pom.xml	2006-10-05 \
14:49:19.000000000 -0400 +@@ -1,70 +1,52 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -25605,9 +25373,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test9</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test9</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test9</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test9</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Site Plugin Test9</name> \
@@ -25636,9 +25404,8 @@  +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-site-plugin</artifactId>
 +            <version>2.0-SNAPSHOT</version>
++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-site-plugin</artifactId>  \
+            <configuration xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               \
<outputEncoding>utf-8</outputEncoding>  +               \
<locales>en,FR_CA,DE_qq_qq_qq,de</locales> @@ -25648,17 +25415,17 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/pom.xml.withoutxslt	2006-09-21 \
                19:03:49.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/pom.xml	2006-09-21 \
19:03:57.000000000 -0400 +--- \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/pom.xml.withoutxslt	2006-10-05 \
14:49:19.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/pom.xml	2006-10-05 \
14:49:22.000000000 -0400  @@ -1,64 +1,45 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -25726,9 +25493,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test8</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test8</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test8</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test8</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Site Plugin Test8 MNG-661 \
issue</name> @@ -25761,17 +25528,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/pom.xml.withoutxslt	2006-09-21 \
                19:03:57.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/pom.xml	2006-09-21 \
19:04:05.000000000 -0400 +--- \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/pom.xml.withoutxslt	2006-10-05 \
14:49:22.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/pom.xml	2006-10-05 \
14:49:24.000000000 -0400  @@ -1,65 +1,46 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -25840,14 +25607,14 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">framework2</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test8</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test8</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test8</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test8</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">framework2</artifactId>  +   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework2 module for the Maven \
Site Plugin Test8 MNG-661 issue</name> @@ -25876,17 +25643,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/pom.xml.withoutxslt	2006-09-21 \
                19:04:05.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/pom.xml	2006-09-21 \
19:04:13.000000000 -0400 +--- \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/pom.xml.withoutxslt	2006-10-05 \
14:49:24.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/pom.xml	2006-10-05 \
14:49:27.000000000 -0400  @@ -1,65 +1,46 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -25955,14 +25722,14 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">framework</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test8</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test8</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test8</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test8</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">framework</artifactId>  +   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework module for the Maven \
Site Plugin Test8 MNG-661 issue</name> @@ -25991,17 +25758,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/pom.xml.withoutxslt	2006-09-21 \
                19:04:13.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/pom.xml	2006-09-21 \
19:04:21.000000000 -0400 +--- \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/pom.xml.withoutxslt	2006-10-05 \
14:49:27.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/pom.xml	2006-10-05 \
14:49:30.000000000 -0400  @@ -1,52 +1,33 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -26057,9 +25824,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test5</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test5</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test5</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test5</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Site Plugin Test5</name> \
@@ -26080,17 +25847,17 @@  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/pom.xml.withoutxslt	2006-09-21 \
                19:04:21.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/pom.xml	2006-09-21 \
19:04:29.000000000 -0400 +--- \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/pom.xml.withoutxslt	2006-10-05 \
14:49:30.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/pom.xml	2006-10-05 \
14:49:32.000000000 -0400  @@ -1,79 +1,55 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -26173,9 +25940,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-multiproject</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-multiproject</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Multiproject parent</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">MNG-661: In parent site, \
automatically create link to modules sites and vice-versa</description> @@ -26218,18 \
+25985,18 @@  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/pom.xml.withoutxslt	2006-09-21 \
                19:04:29.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/pom.xml	2006-09-21 \
                19:04:37.000000000 -0400
-@@ -1,43 +1,23 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/pom.xml.withoutxslt	2006-10-05 \
14:49:33.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/pom.xml	2006-10-05 \
14:49:35.000000000 -0400 +@@ -1,43 +1,22 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -26275,14 +26042,14 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework221</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework22</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework221</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework221</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description> @@ -26292,14 +26059,13 @@
 +      <module>framework2211</module>
 +      <module>framework2212</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2212/pom.xml.withoutxslt	2006-09-21 \
                19:04:38.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2212/pom.xml	2006-09-21 \
                19:04:45.000000000 -0400
-@@ -1,38 +1,19 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2212/pom.xml.withoutxslt	2006-10-05 \
14:49:35.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2212/pom.xml	2006-10-05 \
14:49:37.000000000 -0400 +@@ -1,38 +1,18 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -26340,27 +26106,26 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework2212</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework221</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework2212</artifactId> \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework2212</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description>  +   <inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <url \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org/framework2/framework22/framework221/framework2212</url>
                
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/pom.xml.withoutxslt	2006-09-21 \
                19:04:45.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/pom.xml	2006-09-21 \
                19:04:53.000000000 -0400
-@@ -1,42 +1,22 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/pom.xml.withoutxslt	2006-10-05 \
14:49:37.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/pom.xml	2006-10-05 \
14:49:40.000000000 -0400 +@@ -1,42 +1,21 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -26405,14 +26170,14 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework2211</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework221</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework2211</artifactId> \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework2211</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description> @@ -26421,14 +26186,13 @@
 +   <modules xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>framework22111</module>  +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/fra \
mework2/framework22/framework221/framework2211/framework22111/pom.xml.withoutxslt	2006-09-21 \
                19:04:53.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/framework22111/pom.xml	2006-09-21 \
                19:05:01.000000000 -0400
-@@ -1,38 +1,19 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/fra \
mework2/framework22/framework221/framework2211/framework22111/pom.xml.withoutxslt	2006-10-05 \
14:49:40.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/framework22111/pom.xml	2006-10-05 \
14:49:42.000000000 -0400 +@@ -1,38 +1,18 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -26469,27 +26233,26 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework22111</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework2211</artifactId> \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework22111</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework22111</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description>  +   <inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <url \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org/framework2/framework22/framework221/framework2211/framework22111</url>
                
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/pom.xml.withoutxslt	2006-09-21 \
                19:05:01.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/pom.xml	2006-09-21 \
                19:05:09.000000000 -0400
-@@ -1,43 +1,23 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/pom.xml.withoutxslt	2006-10-05 \
14:49:42.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/pom.xml	2006-10-05 \
14:49:45.000000000 -0400 +@@ -1,43 +1,22 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -26535,14 +26298,14 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework22</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework2</artifactId>  + \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework22</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework22</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description> @@ -26552,14 +26315,13 @@
 +      <module>framework221</module>
 +      <module>framework222</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/pom.xml.withoutxslt	2006-09-21 \
                19:05:09.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/pom.xml	2006-09-21 \
                19:05:16.000000000 -0400
-@@ -1,42 +1,22 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/pom.xml.withoutxslt	2006-10-05 \
14:49:45.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/pom.xml	2006-10-05 \
14:49:47.000000000 -0400 +@@ -1,42 +1,21 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -26604,14 +26366,14 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework2221</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework222</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework2221</artifactId> \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework2221</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description> @@ -26620,14 +26382,13 @@
 +   <modules xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>framework22211</module>  +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/fra \
mework2/framework22/framework222/framework2221/framework22211/pom.xml.withoutxslt	2006-09-21 \
                19:05:16.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/framework22211/pom.xml	2006-09-21 \
                19:05:24.000000000 -0400
-@@ -1,38 +1,19 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/fra \
mework2/framework22/framework222/framework2221/framework22211/pom.xml.withoutxslt	2006-10-05 \
14:49:47.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/framework22211/pom.xml	2006-10-05 \
14:49:50.000000000 -0400 +@@ -1,38 +1,18 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -26668,27 +26429,26 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework22211</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework2221</artifactId> \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework22211</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework22211</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description>  +   <inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <url \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org/framework2/framework22/framework222/framework2221/framework22211</url>
                
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/pom.xml.withoutxslt	2006-09-21 \
                19:05:24.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/pom.xml	2006-09-21 \
                19:05:32.000000000 -0400
-@@ -1,43 +1,23 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/pom.xml.withoutxslt	2006-10-05 \
14:49:50.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/pom.xml	2006-10-05 \
14:49:52.000000000 -0400 +@@ -1,43 +1,22 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -26734,14 +26494,14 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework222</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework22</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework222</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework222</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description> @@ -26751,14 +26511,13 @@
 +      <module>framework2221</module>
 +      <module>framework2222</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2222/pom.xml.withoutxslt	2006-09-21 \
                19:05:32.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2222/pom.xml	2006-09-21 \
                19:05:40.000000000 -0400
-@@ -1,38 +1,19 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2222/pom.xml.withoutxslt	2006-10-05 \
14:49:52.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2222/pom.xml	2006-10-05 \
14:49:55.000000000 -0400 +@@ -1,38 +1,18 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -26799,27 +26558,26 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework2222</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework222</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework2222</artifactId> \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework2222</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description>  +   <inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <url \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org/framework2/framework22/framework222/framework2222</url>
                
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/pom.xml.withoutxslt	2006-09-21 \
                19:05:40.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/pom.xml	2006-09-21 \
                19:05:48.000000000 -0400
-@@ -1,51 +1,30 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/pom.xml.withoutxslt	2006-10-05 \
14:49:55.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/pom.xml	2006-10-05 \
14:49:57.000000000 -0400 +@@ -1,51 +1,29 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -26873,14 +26631,14 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework2</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-multiproject</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework2</artifactId>  + \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework2</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description> @@ -26897,14 +26655,13 @@
 +      <module>framework22</module>
 +      <module>framework23</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework23/pom.xml.withoutxslt	2006-09-21 \
                19:05:48.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework23/pom.xml	2006-09-21 \
                19:05:56.000000000 -0400
-@@ -1,38 +1,19 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework23/pom.xml.withoutxslt	2006-10-05 \
14:49:57.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework23/pom.xml	2006-10-05 \
14:49:59.000000000 -0400 +@@ -1,38 +1,18 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -26945,27 +26702,26 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework23</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework2</artifactId>  + \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework23</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework23</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description>  +   <inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <url \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org/framework2/framework23</url>
                
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework21/pom.xml.withoutxslt	2006-09-21 \
                19:05:56.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework21/pom.xml	2006-09-21 \
                19:06:04.000000000 -0400
-@@ -1,38 +1,19 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework21/pom.xml.withoutxslt	2006-10-05 \
14:49:59.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework21/pom.xml	2006-10-05 \
14:50:02.000000000 -0400 +@@ -1,38 +1,18 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -27006,27 +26762,26 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework21</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework2</artifactId>  + \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework21</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework21</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description>  +   <inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <url \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org/framework2/framework21</url>
                
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework13/pom.xml.withoutxslt	2006-09-21 \
                19:06:04.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework13/pom.xml	2006-09-21 \
                19:06:12.000000000 -0400
-@@ -1,38 +1,19 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework13/pom.xml.withoutxslt	2006-10-05 \
14:50:02.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework13/pom.xml	2006-10-05 \
14:50:05.000000000 -0400 +@@ -1,38 +1,18 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -27067,27 +26822,26 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework13</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework1</artifactId>  + \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework13</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework13</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description>  +   <inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <url \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org/framework1/framework13</url>
                
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/pom.xml.withoutxslt	2006-09-21 \
                19:06:20.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/pom.xml	2006-09-21 \
                19:06:28.000000000 -0400
-@@ -1,52 +1,31 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/pom.xml.withoutxslt	2006-10-05 \
14:50:07.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/pom.xml	2006-10-05 \
14:50:09.000000000 -0400 +@@ -1,52 +1,30 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -27142,14 +26896,14 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework1</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-multiproject</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework1</artifactId>  + \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework1</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description> @@ -27167,14 +26921,13 @@
 +      <module>framework13</module>
 +      <module>framework14</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework12/pom.xml.withoutxslt	2006-09-21 \
                19:06:12.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework12/pom.xml	2006-09-21 \
                19:06:20.000000000 -0400
-@@ -1,38 +1,19 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework12/pom.xml.withoutxslt	2006-10-05 \
14:50:05.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework12/pom.xml	2006-10-05 \
14:50:07.000000000 -0400 +@@ -1,38 +1,18 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -27215,27 +26968,26 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework12</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework1</artifactId>  + \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework12</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework12</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description>  +   <inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <url \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org/framework1/framework12</url>
                
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework112/pom.xml.withoutxslt	2006-09-21 \
                19:06:28.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework112/pom.xml	2006-09-21 \
                19:06:36.000000000 -0400
-@@ -1,38 +1,19 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework112/pom.xml.withoutxslt	2006-10-05 \
14:50:09.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework112/pom.xml	2006-10-05 \
14:50:12.000000000 -0400 +@@ -1,38 +1,18 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -27276,27 +27028,26 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework112</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework11</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework112</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework112</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description>  +   <inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <url \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org/framework1/framework11/framework112</url>
                
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/framework1111/pom.xml.withoutxslt	2006-09-21 \
                19:06:36.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/framework1111/pom.xml	2006-09-21 \
                19:06:44.000000000 -0400
-@@ -1,38 +1,19 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/framework1111/pom.xml.withoutxslt	2006-10-05 \
14:50:12.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/framework1111/pom.xml	2006-10-05 \
14:50:14.000000000 -0400 +@@ -1,38 +1,18 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -27337,27 +27088,26 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework1111</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework111</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework1111</artifactId> \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework1111</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description>  +   <inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <url \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org/framework1/framework11/framework111/framework1111</url>
                
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/pom.xml.withoutxslt	2006-09-21 \
                19:06:44.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/pom.xml	2006-09-21 \
                19:06:52.000000000 -0400
-@@ -1,42 +1,22 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/pom.xml.withoutxslt	2006-10-05 \
14:50:14.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/pom.xml	2006-10-05 \
14:50:17.000000000 -0400 +@@ -1,42 +1,21 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -27402,14 +27152,14 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework111</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework11</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework111</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework111</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description> @@ -27418,14 +27168,13 @@
 +   <modules xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>framework1111</module>  +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/pom.xml.withoutxslt	2006-09-21 \
                19:06:52.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/pom.xml	2006-09-21 \
                19:07:00.000000000 -0400
-@@ -1,52 +1,31 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/pom.xml.withoutxslt	2006-10-05 \
14:50:17.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/pom.xml	2006-10-05 \
14:50:19.000000000 -0400 +@@ -1,52 +1,30 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -27480,14 +27229,14 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework11</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework1</artifactId>  + \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework11</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework11</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description> @@ -27505,14 +27254,13 @@
 +      <module>framework111</module>
 +      <module>framework112</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/pom.xml.withoutxslt	2006-09-21 \
                19:07:00.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/pom.xml	2006-09-21 \
                19:07:08.000000000 -0400
-@@ -1,42 +1,22 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/pom.xml.withoutxslt	2006-10-05 \
14:50:19.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/pom.xml	2006-10-05 \
14:50:22.000000000 -0400 +@@ -1,42 +1,21 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -27557,14 +27305,14 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework14</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework1</artifactId>  + \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework14</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework14</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description> @@ -27573,14 +27321,13 @@
 +   <modules xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>framework141</module>  +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/pom.xml.withoutxslt	2006-09-21 \
                19:07:08.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/pom.xml	2006-09-21 \
                19:07:16.000000000 -0400
-@@ -1,43 +1,23 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/pom.xml.withoutxslt	2006-10-05 \
14:50:22.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/pom.xml	2006-10-05 \
14:50:24.000000000 -0400 +@@ -1,43 +1,22 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -27626,14 +27373,14 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework141</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework14</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework141</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework141</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description> @@ -27643,14 +27390,13 @@
 +      <module>framework1411</module>
 +      <module>framework1412</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/pom.xml.withoutxslt	2006-09-21 \
                19:07:24.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/pom.xml	2006-09-21 \
                19:07:32.000000000 -0400
-@@ -1,43 +1,23 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/pom.xml.withoutxslt	2006-10-05 \
14:50:27.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/pom.xml	2006-10-05 \
14:50:29.000000000 -0400 +@@ -1,43 +1,22 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -27696,14 +27442,14 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework1411</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework141</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework1411</artifactId> \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework1411</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description> @@ -27713,14 +27459,13 @@
 +      <module>framework14111</module>
 +      <module>framework14112</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/fra \
mework1/framework14/framework141/framework1411/framework14112/pom.xml.withoutxslt	2006-09-21 \
                19:07:16.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/framework14112/pom.xml	2006-09-21 \
                19:07:24.000000000 -0400
-@@ -1,38 +1,19 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/fra \
mework1/framework14/framework141/framework1411/framework14112/pom.xml.withoutxslt	2006-10-05 \
14:50:24.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/framework14112/pom.xml	2006-10-05 \
14:50:27.000000000 -0400 +@@ -1,38 +1,18 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -27761,27 +27506,26 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework14112</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework1411</artifactId> \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework14112</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework14112</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description>  +   <inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <url \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org/framework1/framework14/framework141/framework1411/framework14112</url>
                
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/fra \
mework1/framework14/framework141/framework1411/framework14111/pom.xml.withoutxslt	2006-09-21 \
                19:07:32.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/framework14111/pom.xml	2006-09-21 \
                19:07:39.000000000 -0400
-@@ -1,38 +1,19 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/fra \
mework1/framework14/framework141/framework1411/framework14111/pom.xml.withoutxslt	2006-10-05 \
14:50:29.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/framework14111/pom.xml	2006-10-05 \
14:50:31.000000000 -0400 +@@ -1,38 +1,18 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -27822,27 +27566,26 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework14111</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework1411</artifactId> \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework14111</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework14111</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description>  +   <inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <url \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org/framework1/framework14/framework141/framework1411/framework14111</url>
                
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1412/pom.xml.withoutxslt	2006-09-21 \
                19:07:39.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1412/pom.xml	2006-09-21 \
                19:07:48.000000000 -0400
-@@ -1,38 +1,19 @@
+--- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1412/pom.xml.withoutxslt	2006-10-05 \
14:50:31.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1412/pom.xml	2006-10-05 \
14:50:34.000000000 -0400 +@@ -1,38 +1,18 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
 -<!--
@@ -27883,26 +27626,25 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework1412</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
  +      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework141</artifactId>  \
+      <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.multiproject</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-framework1412</artifactId> \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Framework1412</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test the MNG-661 \
issue</description>  +   <inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <url \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org/framework1/framework14/framework141/framework1412</url>
                
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/pom.xml.withoutxslt	2006-09-21 \
                19:07:48.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/pom.xml	2006-09-21 \
19:07:56.000000000 -0400 +--- \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/pom.xml.withoutxslt	2006-10-05 \
14:50:34.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/pom.xml	2006-10-05 \
14:50:36.000000000 -0400  @@ -1,52 +1,33 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -27958,9 +27700,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test4</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test4</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test4</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test4</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Site Plugin Test3</name> \
@@ -27981,17 +27723,17 @@  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/pom.xml.withoutxslt	2006-09-21 \
                19:07:56.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/pom.xml	2006-09-21 \
19:08:03.000000000 -0400 +--- \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/pom.xml.withoutxslt	2006-10-05 \
14:50:36.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/pom.xml	2006-10-05 \
14:50:39.000000000 -0400  @@ -1,52 +1,33 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -28047,9 +27789,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test6</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test6</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test6</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test6</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Site Plugin Test6 MNG-584 \
and MNG-585 issues</name> @@ -28070,17 +27812,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/pom.xml.withoutxslt	2006-09-21 \
                19:08:04.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/pom.xml	2006-09-21 \
19:08:12.000000000 -0400 +--- \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/pom.xml.withoutxslt	2006-10-05 \
14:50:39.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/pom.xml	2006-10-05 \
14:50:41.000000000 -0400  @@ -1,52 +1,32 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -28136,9 +27878,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test3</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test3</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test3</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test3</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Site Plugin Test3</name> \
@@ -28158,17 +27900,17 @@  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/pom.xml.withoutxslt	2006-09-21 \
                19:08:12.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/pom.xml	2006-09-21 \
19:08:20.000000000 -0400 +--- \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/pom.xml.withoutxslt	2006-10-05 \
14:50:41.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/pom.xml	2006-10-05 \
14:50:44.000000000 -0400  @@ -1,52 +1,33 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -28224,9 +27966,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test2</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test2</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test2</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test2</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Site Plugin Test2</name> \
@@ -28247,17 +27989,17 @@  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/pom.xml.withoutxslt	2006-09-21 \
                19:08:20.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/pom.xml	2006-09-21 \
19:08:28.000000000 -0400 +--- \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/pom.xml.withoutxslt	2006-10-05 \
14:50:44.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/pom.xml	2006-10-05 \
14:50:46.000000000 -0400  @@ -1,60 +1,41 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -28321,9 +28063,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test1</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test1</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test1</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test1</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Site Plugin Test1</name> \
@@ -28352,17 +28094,17 @@  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/pom.xml.withoutxslt	2006-09-21 \
                19:08:28.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/pom.xml	2006-09-21 \
19:08:36.000000000 -0400 +--- \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/pom.xml.withoutxslt	2006-10-05 \
14:50:46.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/pom.xml	2006-10-05 \
14:50:49.000000000 -0400  @@ -1,56 +1,37 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -28422,9 +28164,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test7</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test7</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test7</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test7</artifactId>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2003</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Site Plugin Test7 MNG-599 \
issue</name> @@ -28449,17 +28191,17 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test10/pom.xml.withoutxslt	2006-09-21 \
                19:08:36.000000000 -0400
-+++ ./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test10/pom.xml	2006-09-21 \
19:08:44.000000000 -0400 +--- \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test10/pom.xml.withoutxslt	2006-10-05 \
14:50:49.000000000 -0400 ++++ \
./maven2-plugins/maven-site-plugin/src/test/projects/site-plugin-test10/pom.xml	2006-10-05 \
14:50:51.000000000 -0400  @@ -1,66 +1,45 @@
 -<?xml version="1.0" encoding="ISO-8859-1"?>
 -
@@ -28529,9 +28271,9 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test10</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test10</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugin.site.test10</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">site-plugin-test10</artifactId> \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jar</packaging>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2005</inceptionYear>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Site Plugin Test10</name> \
@@ -28564,18 +28306,18 @@  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-checkstyle-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:08:44.000000000 -0400
-+++ ./maven2-plugins/maven-checkstyle-plugin/pom.xml	2006-09-21 19:08:52.000000000 \
                -0400
-@@ -1,64 +1,67 @@
+--- ./maven2-plugins/maven-checkstyle-plugin/pom.xml.withoutxslt	2006-10-05 \
14:50:51.000000000 -0400 ++++ \
./maven2-plugins/maven-checkstyle-plugin/pom.xml	2006-10-05 14:50:54.000000000 -0400 \
                +@@ -1,64 +1,66 @@
 -<?xml version="1.0" encoding="UTF-8"?><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-plugins</artifactId>
@@ -28642,17 +28384,16 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-checkstyle-plugin</artifactId>
 +   <version>2.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugins</artifactId> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
  +   </parent>
 +   <prerequisites xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      <maven>2.0.2</maven>
 +   </prerequisites>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-checkstyle-plugin</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Checkstyle Plugin</name>  \
+   <issueManagement xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> @@ -28669,24 +28410,24 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>checkstyle</artifactId>
 +         <version>4.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">checkstyle</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">checkstyle</artifactId>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>reporting-impl</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.reporting</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-reporting-impl</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>velocity</artifactId>
 +         <version>1.1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-velocity</artifactId>  + \
<exclusions xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +            <exclusion>
 +               <artifactId>plexus-utils</artifactId>
@@ -28695,22 +28436,22 @@
 +         </exclusions>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>checkstyle</artifactId>
 +         <version>1.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">checkstyle</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">checkstyle-optional</artifactId>
  +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-compiler-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:08:52.000000000 -0400
-+++ ./maven2-plugins/maven-compiler-plugin/pom.xml	2006-09-21 19:09:00.000000000 \
                -0400
-@@ -1,52 +1,55 @@
+--- ./maven2-plugins/maven-compiler-plugin/pom.xml.withoutxslt	2006-10-05 \
14:50:54.000000000 -0400 ++++ \
./maven2-plugins/maven-compiler-plugin/pom.xml	2006-10-05 14:51:35.000000000 -0400 \
+@@ -1,52 +1,54 @@  +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -28764,13 +28505,12 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <artifactId>maven-compiler-plugin</artifactId>
 +   <version>2.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Compiler Plugin</name>
@@ -28778,48 +28518,48 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-utils</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>compiler-api</artifactId>
 +         <version>1.6-SNAPSHOT</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-compiler-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>compiler-manager</artifactId>
 +         <version>1.6-SNAPSHOT</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-compiler-manager</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>compiler-javac</artifactId>
 +         <version>1.6-SNAPSHOT</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-compiler-javac</artifactId>
 +         <scope>runtime</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-shared</groupId>
-+         <artifactId>plugin-testing-harness</artifactId>
 +         <version>1.0-SNAPSHOT</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-testing-harness</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-compiler-plugin/src/it/test1/pom.xml.withoutxslt	2006-09-21 \
                19:09:00.000000000 -0400
-+++ ./maven2-plugins/maven-compiler-plugin/src/it/test1/pom.xml	2006-09-21 \
19:09:08.000000000 -0400 +--- \
./maven2-plugins/maven-compiler-plugin/src/it/test1/pom.xml.withoutxslt	2006-10-05 \
14:50:56.000000000 -0400 ++++ \
./maven2-plugins/maven-compiler-plugin/src/it/test1/pom.xml	2006-10-05 \
14:50:59.000000000 -0400  @@ -1,28 +1,23 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -28851,18 +28591,18 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test1</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.compiler</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.compiler</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test1</artifactId>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test for fork \
configuration</name>  +   <description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Test for forking compiler \
configuration</description>  +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-compiler-plugin</artifactId>
 +            <version>2.1-SNAPSHOT</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-compiler-plugin</artifactId>
  +            <configuration xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +               \
<fork>true</fork>  +            </configuration>
@@ -28873,9 +28613,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-compiler-plugin/src/it/pom.xml.withoutxslt	2006-09-21 \
                19:09:08.000000000 -0400
-+++ ./maven2-plugins/maven-compiler-plugin/src/it/pom.xml	2006-09-21 \
                19:09:15.000000000 -0400
-@@ -1,17 +1,14 @@
+--- ./maven2-plugins/maven-compiler-plugin/src/it/pom.xml.withoutxslt	2006-10-05 \
14:50:59.000000000 -0400 ++++ \
./maven2-plugins/maven-compiler-plugin/src/it/pom.xml	2006-10-05 14:51:01.000000000 \
-0400 +@@ -1,17 +1,13 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
 -    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -28895,22 +28635,21 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">it</artifactId>
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.compiler</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">1.0-SNAPSHOT</version> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins.compiler</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">it</artifactId>  +   <packaging \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Compiler plugin integration \
tests</name>  +   <modules xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      <module>test1</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-dependency-plugin/pom-it.xml.withoutxslt	2006-09-21 \
                19:09:15.000000000 -0400
-+++ ./maven2-plugins/maven-dependency-plugin/pom-it.xml	2006-09-21 \
                19:09:23.000000000 -0400
-@@ -1,27 +1,25 @@
+--- ./maven2-plugins/maven-dependency-plugin/pom-it.xml.withoutxslt	2006-10-05 \
14:51:01.000000000 -0400 ++++ \
./maven2-plugins/maven-dependency-plugin/pom-it.xml	2006-10-05 14:51:04.000000000 \
-0400 +@@ -1,27 +1,24 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
 -    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -28940,14 +28679,14 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-dependency-plugin-it-launcher</artifactId>
                
-+   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2.0-SNAPSHOT</version>  +   \
                <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugins</artifactId> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
  +   </parent>
++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-dependency-plugin-it-launcher</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Dependency Maven Plugin</name>  \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging> @@ -28955,7 \
+28694,6 @@  +   <modules xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>/src/it</module>  +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
@@ -28964,9 +28702,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-dependency-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:09:23.000000000 -0400
-+++ ./maven2-plugins/maven-dependency-plugin/pom.xml	2006-09-21 19:09:30.000000000 \
                -0400
-@@ -1,88 +1,92 @@
+--- ./maven2-plugins/maven-dependency-plugin/pom.xml.withoutxslt	2006-10-05 \
14:51:04.000000000 -0400 ++++ \
./maven2-plugins/maven-dependency-plugin/pom.xml	2006-10-05 14:51:37.000000000 -0400 \
                +@@ -1,88 +1,91 @@
 -<?xml version="1.0"?><project>
 -    <parent>
 -       <artifactId>maven-plugins</artifactId>
@@ -29056,13 +28794,13 @@
 -  </reporting>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <artifactId>maven-dependency-plugin</artifactId>
++   <groupId>org.apache.maven.plugins</groupId>
 +   <version>2.0-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
 +   <packaging>maven-plugin</packaging>
 +   <name>Dependency Maven Plugin</name>
@@ -29107,9 +28845,8 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-javadoc-plugin</artifactId>
 +            <version>2.0-SNAPSHOT</version>
++            <artifactId>maven-javadoc-plugin</artifactId>
 +            <configuration>
 +               <source>1.4</source>
 +               <destDir>${project.build.directory}/site/javadoc</destDir>
@@ -29119,37 +28856,37 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>1.0-alpha-5</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-archiver</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-utils</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./maven2-plugins/maven-dependency-plugin/src/it/pom.xml.withoutxslt	2006-09-21 \
                19:09:30.000000000 -0400
-+++ ./maven2-plugins/maven-dependency-plugin/src/it/pom.xml	2006-09-21 \
                19:09:33.000000000 -0400
-@@ -1,21 +1,18 @@
+--- ./maven2-plugins/maven-dependency-plugin/src/it/pom.xml.withoutxslt	2006-10-05 \
14:51:06.000000000 -0400 ++++ \
./maven2-plugins/maven-dependency-plugin/src/it/pom.xml	2006-10-05 14:51:09.000000000 \
-0400 +@@ -1,21 +1,17 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
 -    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -29173,26 +28910,25 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">dependency-maven-plugin-it</artifactId>
  +   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2.0-SNAPSHOT</version>  +   \
<parent>  +      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.mojo</groupId>  +    \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">mojo</artifactId>  +      \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">6</version>  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">dependency-maven-plugin-it</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Dependency Plugin - \
Integration tests</name>  +   <modules xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>it0100</module>  +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-dependency-plugin/src/it/it0100/pom.xml.withoutxslt	2006-09-21 \
                19:09:33.000000000 -0400
-+++ ./maven2-plugins/maven-dependency-plugin/src/it/it0100/pom.xml	2006-09-21 \
                19:09:35.000000000 -0400
-@@ -1,14 +1,16 @@
+--- ./maven2-plugins/maven-dependency-plugin/src/it/it0100/pom.xml.withoutxslt	2006-10-05 \
14:51:09.000000000 -0400 ++++ \
./maven2-plugins/maven-dependency-plugin/src/it/it0100/pom.xml	2006-10-05 \
14:51:11.000000000 -0400 +@@ -1,14 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -29208,9 +28944,9 @@
 -    <module>test-mojo</module>
 -  </modules>
 -</project>
-+   <artifactId>test-classloader</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
++   <groupId>test</groupId>
++   <artifactId>test-classloader</artifactId>
 +   <name>Test Mojo ClassLoader</name>
 +   <description/>
 +   <packaging>pom</packaging>
@@ -29218,14 +28954,13 @@
 +      <module>test-project</module>
 +      <module>test-mojo</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-dependency-plugin/src/it/it0100/test-project/pom.xml.withoutxslt	2006-09-21 \
                19:09:35.000000000 -0400
-+++ ./maven2-plugins/maven-dependency-plugin/src/it/it0100/test-project/pom.xml	2006-09-21 \
                19:09:38.000000000 -0400
-@@ -1,30 +1,31 @@
+--- ./maven2-plugins/maven-dependency-plugin/src/it/it0100/test-project/pom.xml.withoutxslt	2006-10-05 \
14:51:11.000000000 -0400 ++++ \
./maven2-plugins/maven-dependency-plugin/src/it/it0100/test-project/pom.xml	2006-10-05 \
14:51:13.000000000 -0400 +@@ -1,30 +1,30 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -29257,16 +28992,15 @@
 -    </plugins>
 -  </build>
 -</project>
-+   <artifactId>test-project</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-classloader</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-project</artifactId>
 +   <name>Test Project</name>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
@@ -29287,8 +29021,8 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-dependency-plugin/src/it/it0100/test-mojo/pom.xml.withoutxslt	2006-09-21 \
                19:09:38.000000000 -0400
-+++ ./maven2-plugins/maven-dependency-plugin/src/it/it0100/test-mojo/pom.xml	2006-09-21 \
19:09:40.000000000 -0400 +--- \
./maven2-plugins/maven-dependency-plugin/src/it/it0100/test-mojo/pom.xml.withoutxslt	2006-10-05 \
14:51:13.000000000 -0400 ++++ \
./maven2-plugins/maven-dependency-plugin/src/it/it0100/test-mojo/pom.xml	2006-10-05 \
14:51:16.000000000 -0400  @@ -1,26 +1,27 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -29306,8 +29040,6 @@
 -  <name>Test Mojo</name>
 -  <dependencies>
 -    <dependency>
-+   <artifactId>test-mojo</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-classloader</artifactId>
@@ -29323,6 +29055,8 @@
 -  </dependencies>
 -</project>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-mojo</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Test Mojo</name>
 +   <modelVersion>4.0.0</modelVersion>
@@ -29333,17 +29067,17 @@
 +         <version>0.1</version>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-dependency-plugin/src/it/it0100/test-dep/pom.xml.withoutxslt	2006-09-21 \
                19:09:40.000000000 -0400
-+++ ./maven2-plugins/maven-dependency-plugin/src/it/it0100/test-dep/pom.xml	2006-09-21 \
                19:09:42.000000000 -0400
-@@ -1,15 +1,16 @@
+--- ./maven2-plugins/maven-dependency-plugin/src/it/it0100/test-dep/pom.xml.withoutxslt	2006-10-05 \
14:51:16.000000000 -0400 ++++ \
./maven2-plugins/maven-dependency-plugin/src/it/it0100/test-dep/pom.xml	2006-10-05 \
14:51:18.000000000 -0400 +@@ -1,15 +1,15 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -29360,24 +29094,23 @@
 -  <name>Test Dependency</name>
 -
 -</project>
-+   <artifactId>test-dep</artifactId>
-+   <groupId>test</groupId>
 +   <version>0.1</version>
 +   <parent>
 +      <artifactId>test-classloader</artifactId>
 +      <groupId>test</groupId>
 +      <version>0.1</version>
 +   </parent>
++   <groupId>test</groupId>
++   <artifactId>test-dep</artifactId>
 +   <packaging>jar</packaging>
 +   <name>Test Dependency</name>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-install-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:09:42.000000000 -0400
-+++ ./maven2-plugins/maven-install-plugin/pom.xml	2006-09-21 19:09:45.000000000 \
                -0400
-@@ -1,41 +1,44 @@
+--- ./maven2-plugins/maven-install-plugin/pom.xml.withoutxslt	2006-10-05 \
14:51:18.000000000 -0400 ++++ \
./maven2-plugins/maven-install-plugin/pom.xml	2006-10-05 14:51:44.000000000 -0400 +@@ \
                -1,41 +1,43 @@
 -<?xml version="1.0" encoding="UTF-8"?><project>
 -  <parent>
 -    <artifactId>maven-plugins</artifactId>
@@ -29421,13 +29154,12 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <artifactId>maven-install-plugin</artifactId>
 +   <version>2.2-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Install Plugin</name>
@@ -29435,38 +29167,38 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-manager</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact-manager</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-shared</groupId>
-+         <artifactId>plugin-testing-harness</artifactId>
 +         <version>1.0-SNAPSHOT</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-testing-harness</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-ant-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:09:45.000000000 -0400
-+++ ./maven2-plugins/maven-ant-plugin/pom.xml	2006-09-21 19:09:48.000000000 -0400
-@@ -1,24 +1,27 @@
+--- ./maven2-plugins/maven-ant-plugin/pom.xml.withoutxslt	2006-10-05 \
14:51:21.000000000 -0400 ++++ ./maven2-plugins/maven-ant-plugin/pom.xml	2006-10-05 \
14:51:23.000000000 -0400 +@@ -1,24 +1,26 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -29492,35 +29224,34 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-ant-plugin</artifactId>
 +   <version>2.0-beta-2-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-ant-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Ant Plugin</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-deploy-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:09:48.000000000 -0400
-+++ ./maven2-plugins/maven-deploy-plugin/pom.xml	2006-09-21 19:09:50.000000000 -0400
-@@ -1,35 +1,38 @@
+--- ./maven2-plugins/maven-deploy-plugin/pom.xml.withoutxslt	2006-10-05 \
14:51:23.000000000 -0400 ++++ ./maven2-plugins/maven-deploy-plugin/pom.xml	2006-10-05 \
14:51:26.000000000 -0400 +@@ -1,35 +1,37 @@
 -<?xml version="1.0" encoding="UTF-8"?><project>
 -  <parent>
 -    <artifactId>maven-plugins</artifactId>
@@ -29558,46 +29289,45 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-deploy-plugin</artifactId>
 +   <version>2.2.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-deploy-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Deploy Plugin</name>
 +   <inceptionYear>2004</inceptionYear>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-manager</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact-manager</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./maven2-plugins/maven-help-plugin/pom.xml.withoutxslt	2006-09-21 \
                19:09:50.000000000 -0400
-+++ ./maven2-plugins/maven-help-plugin/pom.xml	2006-09-21 19:09:53.000000000 -0400
-@@ -1,48 +1,49 @@
+--- ./maven2-plugins/maven-help-plugin/pom.xml.withoutxslt	2006-10-05 \
14:51:26.000000000 -0400 ++++ ./maven2-plugins/maven-help-plugin/pom.xml	2006-10-05 \
14:51:40.000000000 -0400 +@@ -1,48 +1,48 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<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"> @@ -29614,13 +29344,12 @@
 -  <description>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-help-plugin</artifactId>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-help-plugin</artifactId>  \
+   <version>2.0.1-SNAPSHOT</version>  +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugins</artifactId> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
  +   </parent>
 +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Help Plugin</name> @@ \
-29663,37 +29392,37 @@  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>settings</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-settings</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>mavencore</artifactId>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-core</artifactId>
 +         <version>2.0.4</version>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-tools-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools-api</artifactId>
  +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-descriptor</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-descriptor</artifactId>
  +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-clean-plugin.pom.withoutxslt	2006-09-21 \
                18:39:44.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-clean-plugin.pom	2006-09-21 \
                18:39:47.000000000 -0400
-@@ -1,43 +1,44 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-clean-plugin.pom.withoutxslt	2006-10-05 \
14:30:51.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-clean-plugin.pom	2006-10-05 \
14:30:55.000000000 -0400 +@@ -1,43 +1,43 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<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"> @@ -29739,14 +29468,13 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-clean-plugin</artifactId>
 +   <version>2.1.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugins</artifactId> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-clean-plugin</artifactId> \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Clean Plugin</name>  +   \
<inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2001</inceptionYear> @@ \
-29758,47 +29486,43 @@  +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP/maven-shared</groupId>
-+         <artifactId>file-management</artifactId>
 +         <version>1.0</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.shared</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">file-management</artifactId>  + \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools-pluggy.pom.withoutxslt	2006-09-21 \
                18:42:34.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools-pluggy.pom	2006-09-21 \
                18:42:38.000000000 -0400
-@@ -1,32 +1,33 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools-pluggy.pom.withoutxslt	2006-10-05 \
14:33:06.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools-pluggy.pom	2006-10-05 \
14:33:09.000000000 -0400 +@@ -1,32 +1,32 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-tools-pluggy</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
--      <artifactId>maven-plugin-tools</artifactId>
--      <version>2.0.2</version>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>plugin-tools</artifactId>
 +      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-plugin-tools</artifactId>
+-      <version>2.0.2</version>
     </parent>
--   <artifactId>maven-plugin-tools-pluggy</artifactId>
+    <artifactId>maven-plugin-tools-pluggy</artifactId>
     <name>Maven Pluggy Simplistic Plugin Generator</name>
 -   <version>2.0.2</version>
     <distributionManagement>
@@ -29807,34 +29531,28 @@
     <modelVersion>4.0.0</modelVersion>
     <dependencies>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-plugin-tools-api</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-tools-api</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-tools-api</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-model</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-model</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-plugin-tools-java</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-tools-java</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-tools-java</artifactId>
+-         <version>2.0.2</version>
        </dependency>
     </dependencies>
     <dependencyManagement/>
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-install-plugin.pom.withoutxslt	2006-09-21 \
                18:39:29.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-install-plugin.pom	2006-09-21 \
                18:39:33.000000000 -0400
-@@ -1,41 +1,44 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-install-plugin.pom.withoutxslt	2006-10-05 \
14:30:39.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-install-plugin.pom	2006-10-05 \
14:30:42.000000000 -0400 +@@ -1,41 +1,43 @@
 -<?xml version="1.0" encoding="UTF-8"?><project>
 -  <parent>
 -    <artifactId>maven-plugins</artifactId>
@@ -29878,112 +29596,104 @@
 -</project>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-install-plugin</artifactId>
 +   <version>2.2-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-install-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Install Plugin</name>
 +   <inceptionYear>2004</inceptionYear>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-manager</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact-manager</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-shared</groupId>
-+         <artifactId>plugin-testing-harness</artifactId>
 +         <version>1.0-SNAPSHOT</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-testing-harness</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools-model.pom.withoutxslt	2006-09-21 \
                18:40:28.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools-model.pom	2006-09-21 \
18:40:32.000000000 -0400 +--- \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools-model.pom.withoutxslt	2006-10-05 \
14:31:31.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools-model.pom	2006-10-05 \
14:31:34.000000000 -0400  @@ -1,14 +1,14 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-tools-model</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
--      <artifactId>maven-plugin-tools</artifactId>
--      <version>2.0.2</version>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>plugin-tools</artifactId>
 +      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-plugin-tools</artifactId>
+-      <version>2.0.2</version>
     </parent>
--   <groupId>org.apache.maven</groupId>
--   <artifactId>maven-plugin-tools-model</artifactId>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-plugin-tools-model</artifactId>
     <name>Maven Plugin Metadata Model</name>
 -   <version>2.0.2</version>
     <distributionManagement>
        <status>deployed</status>
     </distributionManagement>
-@@ -16,8 +16,8 @@
+@@ -16,9 +16,9 @@
     <build>
        <plugins>
           <plugin>
--            <groupId>org.codehaus.modello</groupId>
--            <artifactId>modello-maven-plugin</artifactId>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
-             <version>1.0-alpha-8</version>
++            <version>1.0-alpha-8</version>
+             <groupId>org.codehaus.modello</groupId>
+             <artifactId>modello-maven-plugin</artifactId>
+-            <version>1.0-alpha-8</version>
              <executions>
                 <execution>
-@@ -38,18 +38,18 @@
+                   <goals>
+@@ -38,19 +38,19 @@
     </build>
     <dependencies>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-plugin-descriptor</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-descriptor</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-descriptor</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-utils</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-          <version>1.1</version>
++         <version>1.2</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-utils</artifactId>
+-         <version>1.1</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-container-default</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
-          <version>1.0-alpha-9</version>
++         <version>1.0-alpha-9</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+-         <version>1.0-alpha-9</version>
        </dependency>
     </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-core-it-plugin.pom.withoutxslt	2006-09-21 \
                18:42:52.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-core-it-plugin.pom	2006-09-21 \
                18:42:56.000000000 -0400
-@@ -1,46 +1,48 @@
+    <dependencyManagement/>
+--- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-core-it-plugin.pom.withoutxslt	2006-10-05 \
14:33:19.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-core-it-plugin.pom	2006-10-05 \
14:33:21.000000000 -0400 +@@ -1,46 +1,47 @@
 -<model 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>
@@ -30003,12 +29713,8 @@
 -      <artifactId>maven-project</artifactId>
 +<?xml version="1.0" encoding="utf-8"?>
 +<model>
-+   <artifactId>maven-core-it-plugin</artifactId>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <version>2.0.4-JPP</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>maven-plugin-parent</artifactId>
        <version>2.0</version>
 -    </dependency>
 -    <dependency>
@@ -30038,49 +29744,52 @@
 -    </dependency>
 -  </dependencies>
 -</model>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-parent</artifactId>
 ++      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-core-it-plugin</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Core Integration Test \
Plugin</name>  +   <inceptionYear xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2001</inceptionYear>  +   \
<modelVersion>4.0.0</modelVersion>  +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-project</artifactId>  +   \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-archiver</artifactId>  +  \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>jline</artifactId>
 +         <version>1.0.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jline</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">jline</artifactId>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>bsh</artifactId>
 +         <version>1.3.0</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">bsh</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">bsh</artifactId>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>xalan-j2</artifactId>
 +         <version>1.0.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">xalan</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">xalan</artifactId>  +      \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it1007-plugin.pom.withoutxslt	2006-09-21 \
                18:39:33.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it1007-plugin.pom	2006-09-21 \
                18:39:36.000000000 -0400
-@@ -1,9 +1,12 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it1007-plugin.pom.withoutxslt	2006-10-05 \
14:30:42.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it1007-plugin.pom	2006-10-05 \
14:30:44.000000000 -0400 +@@ -1,9 +1,11 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <model>
 -  <modelVersion>4.0.0</modelVersion>
@@ -30091,19 +29800,18 @@
 -    <maven>2005</maven>
 -  </prerequesites>
 -</model>
-+   <artifactId>maven-it1007-plugin</artifactId>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <version>2.0.4-JPP</version>
++   <groupId>org.apache.maven.plugins</groupId>
++   <artifactId>maven-it1007-plugin</artifactId>
 +   <prerequesites>
 +      <maven>2005</maven>
 +   </prerequesites>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</model>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0096-plugin.pom.withoutxslt	2006-09-21 \
                18:41:30.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0096-plugin.pom	2006-09-21 \
18:41:34.000000000 -0400 +--- \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0096-plugin.pom.withoutxslt	2006-10-05 \
14:32:20.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0096-plugin.pom	2006-10-05 \
14:32:22.000000000 -0400  @@ -1,19 +1,19 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -30125,117 +29833,102 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <artifactId>maven-it0096-plugin</artifactId>
 +   <parent>
 +      <groupId>org.apache.maven.it0096</groupId>
 +      <artifactId>maven-it0096-root</artifactId>
 +      <version>1</version>
 +   </parent>
++   <artifactId>maven-it0096-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-reporting-impl.pom.withoutxslt	2006-09-21 \
                18:42:30.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-reporting-impl.pom	2006-09-21 \
                18:42:34.000000000 -0400
-@@ -1,13 +1,14 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-reporting-impl.pom.withoutxslt	2006-10-05 \
14:33:04.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-reporting-impl.pom	2006-10-05 \
14:33:06.000000000 -0400 +@@ -1,13 +1,13 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>reporting-impl</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven.reporting</groupId>
--      <artifactId>maven-reporting</artifactId>
--      <version>2.0.2</version>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>reporting</artifactId>
 +      <version>2.0.4</version>
+       <groupId>org.apache.maven.reporting</groupId>
+       <artifactId>maven-reporting</artifactId>
+-      <version>2.0.2</version>
     </parent>
--   <artifactId>maven-reporting-impl</artifactId>
+    <artifactId>maven-reporting-impl</artifactId>
     <name>Maven Reporting</name>
 -   <version>2.0.2</version>
     <developers>
        <developer>
           <id>vsiveton</id>
-@@ -25,38 +26,38 @@
+@@ -25,39 +25,39 @@
     <modelVersion>4.0.0</modelVersion>
     <dependencies>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-project</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-project</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>commons-validator</groupId>
-+         <groupId>JPP</groupId>
++         <version>1.1.4</version>
+          <groupId>commons-validator</groupId>
           <artifactId>commons-validator</artifactId>
-          <version>1.1.4</version>
+-         <version>1.1.4</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven.doxia</groupId>
--         <artifactId>doxia-core</artifactId>
-+         <groupId>JPP/maven-doxia</groupId>
-+         <artifactId>core</artifactId>
-          <version>1.0-alpha-7</version>
++         <version>1.0-alpha-7</version>
+          <groupId>org.apache.maven.doxia</groupId>
+          <artifactId>doxia-core</artifactId>
+-         <version>1.0-alpha-7</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-plugin-api</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-api</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>oro</groupId>
-+         <groupId>JPP</groupId>
++         <version>2.0.7</version>
+          <groupId>oro</groupId>
           <artifactId>oro</artifactId>
-          <version>2.0.7</version>
+-         <version>2.0.7</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven.reporting</groupId>
--         <artifactId>maven-reporting-api</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>reporting-api</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven.reporting</groupId>
+          <artifactId>maven-reporting-api</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven.doxia</groupId>
--         <artifactId>doxia-site-renderer</artifactId>
-+         <groupId>JPP/maven-doxia</groupId>
-+         <artifactId>site-renderer</artifactId>
-          <version>1.0-alpha-7</version>
++         <version>1.0-alpha-7</version>
+          <groupId>org.apache.maven.doxia</groupId>
+          <artifactId>doxia-site-renderer</artifactId>
+-         <version>1.0-alpha-7</version>
        </dependency>
     </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools-api.pom.withoutxslt	2006-09-21 \
                18:39:51.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools-api.pom	2006-09-21 \
                18:39:55.000000000 -0400
-@@ -1,31 +1,32 @@
+    <dependencyManagement/>
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools-api.pom.withoutxslt	2006-10-05 \
14:30:58.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools-api.pom	2006-10-05 \
14:31:01.000000000 -0400 +@@ -1,32 +1,32 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-tools-api</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
--      <artifactId>maven-plugin-tools</artifactId>
--      <version>2.0.2</version>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>plugin-tools</artifactId>
 +      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-plugin-tools</artifactId>
+-      <version>2.0.2</version>
     </parent>
--   <artifactId>maven-plugin-tools-api</artifactId>
+    <artifactId>maven-plugin-tools-api</artifactId>
     <name>Maven Plugin Tools APIs</name>
 -   <version>2.0.2</version>
     <distributionManagement>
@@ -30244,31 +29937,27 @@
     <modelVersion>4.0.0</modelVersion>
     <dependencies>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-project</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-project</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-plugin-descriptor</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-descriptor</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-descriptor</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-utils</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-          <version>1.1</version>
++         <version>1.2</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-utils</artifactId>
+-         <version>1.1</version>
        </dependency>
     </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0097-plugin.pom.withoutxslt	2006-09-21 \
                18:39:58.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0097-plugin.pom	2006-09-21 \
18:40:02.000000000 -0400 +    <dependencyManagement/>
+--- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0097-plugin.pom.withoutxslt	2006-10-05 \
14:31:05.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0097-plugin.pom	2006-10-05 \
14:31:08.000000000 -0400  @@ -1,15 +1,16 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -30286,24 +29975,24 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <artifactId>maven-it0097-plugin</artifactId>
-+   <groupId>org.apache.maven.it0097</groupId>
 +   <version>1</version>
++   <groupId>org.apache.maven.it0097</groupId>
++   <artifactId>maven-it0097-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-reporting.pom.withoutxslt	2006-09-21 \
                18:41:53.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-reporting.pom	2006-09-21 \
                18:41:57.000000000 -0400
-@@ -1,17 +1,20 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-reporting.pom.withoutxslt	2006-10-05 \
14:32:37.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-reporting.pom	2006-10-05 \
14:32:40.000000000 -0400 +@@ -1,17 +1,19 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -30322,42 +30011,38 @@
 -  </modules>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>reporting</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.reporting</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-reporting</artifactId>  + \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Reporting</name>  +   \
<modules xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>maven-reporting-api</module>  +      <module>maven-reporting-impl</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-artifact-test.pom.withoutxslt	2006-09-21 \
                18:42:04.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-artifact-test.pom	2006-09-21 \
                18:42:08.000000000 -0400
-@@ -1,43 +1,43 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-artifact-test.pom.withoutxslt	2006-10-05 \
14:32:45.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-artifact-test.pom	2006-10-05 \
14:32:48.000000000 -0400 +@@ -1,44 +1,44 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>artifact-test</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
-+      <groupId>JPP/maven2</groupId>
++      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
        <artifactId>maven</artifactId>
 -      <version>2.0.2</version>
-+      <version>2.0.4</version>
     </parent>
--   <groupId>org.apache.maven</groupId>
--   <artifactId>maven-artifact-test</artifactId>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-artifact-test</artifactId>
     <name>Maven Artifact Test Helper Library</name>
 -   <version>2.0.2</version>
     <distributionManagement>
@@ -30366,47 +30051,41 @@
     <modelVersion>4.0.0</modelVersion>
     <dependencies>
        <dependency>
--         <groupId>junit</groupId>
-+         <groupId>JPP</groupId>
++         <version>3.8.1</version>
+          <groupId>junit</groupId>
           <artifactId>junit</artifactId>
-          <version>3.8.1</version>
+-         <version>3.8.1</version>
           <scope>compile</scope>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-settings</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>settings</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-settings</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-artifact-manager</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-manager</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-artifact-manager</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-artifact</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-artifact</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-container-default</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
-          <version>1.0-alpha-9</version>
++         <version>1.0-alpha-9</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+-         <version>1.0-alpha-9</version>
        </dependency>
     </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools.pom.withoutxslt	2006-09-21 \
                18:42:08.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools.pom	2006-09-21 \
                18:42:12.000000000 -0400
-@@ -1,21 +1,24 @@
+    <dependencyManagement/>
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools.pom.withoutxslt	2006-10-05 \
14:32:48.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools.pom	2006-10-05 \
14:32:51.000000000 -0400 +@@ -1,21 +1,23 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -30429,14 +30108,14 @@
 -  </modules>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-tools</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-tools</artifactId> \
+   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Plugin Tools Base \
POM</name>  +   <modules xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> @@ -30447,236 +30126,208 @@
 +      <module>maven-plugin-tools-model</module>
 +      <module>maven-plugin-tools-ant</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-settings.pom.withoutxslt	2006-09-21 \
                18:41:57.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-settings.pom	2006-09-21 \
                18:42:01.000000000 -0400
-@@ -1,13 +1,14 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-settings.pom.withoutxslt	2006-10-05 \
14:32:40.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-settings.pom	2006-10-05 \
14:32:43.000000000 -0400 +@@ -1,13 +1,13 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>settings</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
-+      <groupId>JPP/maven2</groupId>
++      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
        <artifactId>maven</artifactId>
 -      <version>2.0.2</version>
-+      <version>2.0.4</version>
     </parent>
--   <artifactId>maven-settings</artifactId>
+    <artifactId>maven-settings</artifactId>
     <name>Maven Local Settings Model</name>
 -   <version>2.0.2</version>
     <distributionManagement>
        <status>deployed</status>
     </distributionManagement>
-@@ -15,8 +16,8 @@
+@@ -15,9 +15,9 @@
     <build>
        <plugins>
           <plugin>
--            <groupId>org.codehaus.modello</groupId>
--            <artifactId>modello-maven-plugin</artifactId>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
-             <version>1.0-alpha-8</version>
++            <version>1.0-alpha-8</version>
+             <groupId>org.codehaus.modello</groupId>
+             <artifactId>modello-maven-plugin</artifactId>
+-            <version>1.0-alpha-8</version>
              <executions>
                 <execution>
-@@ -36,18 +37,18 @@
+                   <goals>
+@@ -36,19 +36,19 @@
     </build>
     <dependencies>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-model</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-model</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-utils</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-          <version>1.1</version>
++         <version>1.2</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-utils</artifactId>
+-         <version>1.1</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-container-default</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
-          <version>1.0-alpha-9</version>
++         <version>1.0-alpha-9</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+-         <version>1.0-alpha-9</version>
        </dependency>
     </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-embedder.pom.withoutxslt	2006-09-21 \
                18:42:23.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-embedder.pom	2006-09-21 \
18:42:27.000000000 -0400 +    <dependencyManagement/>
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-embedder.pom.withoutxslt	2006-10-05 \
14:32:59.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-embedder.pom	2006-10-05 \
14:33:01.000000000 -0400  @@ -1,14 +1,14 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>embedder</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
-+      <groupId>JPP/maven2</groupId>
++      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
        <artifactId>maven</artifactId>
 -      <version>2.0.2</version>
-+      <version>2.0.4</version>
     </parent>
--   <groupId>org.apache.maven</groupId>
--   <artifactId>maven-embedder</artifactId>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-embedder</artifactId>
     <name>Maven Embedder</name>
 -   <version>2.0</version>
     <reporting>
        <plugins>
           <plugin>
-@@ -35,7 +35,9 @@
+@@ -35,6 +35,7 @@
     <build>
        <plugins>
           <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-             <artifactId>maven-assembly-plugin</artifactId>
 +            <version>2.1-SNAPSHOT</version>
+             <artifactId>maven-assembly-plugin</artifactId>
              <configuration>
                 <descriptor>src/main/assembly/dep.xml</descriptor>
-             </configuration>
-@@ -44,9 +46,9 @@
+@@ -44,9 +45,9 @@
     </build>
     <dependencies>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-core</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>mavencore</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-core</artifactId>
+-         <version>2.0.2</version>
        </dependency>
     </dependencies>
     <dependencyManagement/>
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-descriptor.pom.withoutxslt	2006-09-21 \
                18:40:09.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-descriptor.pom	2006-09-21 \
18:40:13.000000000 -0400 +--- \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-descriptor.pom.withoutxslt	2006-10-05 \
14:31:15.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-descriptor.pom	2006-10-05 \
14:31:18.000000000 -0400  @@ -1,14 +1,14 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-descriptor</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
-+      <groupId>JPP/maven2</groupId>
++      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
        <artifactId>maven</artifactId>
 -      <version>2.0.2</version>
-+      <version>2.0.4</version>
     </parent>
--   <groupId>org.apache.maven</groupId>
--   <artifactId>maven-plugin-descriptor</artifactId>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-plugin-descriptor</artifactId>
     <name>Maven Plugin Descriptor Model</name>
 -   <version>2.0.2</version>
     <distributionManagement>
        <status>deployed</status>
     </distributionManagement>
-@@ -16,8 +16,8 @@
+@@ -16,9 +16,9 @@
     <build>
        <plugins>
           <plugin>
--            <groupId>org.codehaus.modello</groupId>
--            <artifactId>modello-maven-plugin</artifactId>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
-             <version>1.0-alpha-8</version>
++            <version>1.0-alpha-8</version>
+             <groupId>org.codehaus.modello</groupId>
+             <artifactId>modello-maven-plugin</artifactId>
+-            <version>1.0-alpha-8</version>
              <executions>
                 <execution>
-@@ -37,18 +37,18 @@
+                   <goals>
+@@ -37,19 +37,19 @@
     </build>
     <dependencies>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-plugin-api</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-api</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-artifact</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-artifact</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-container-default</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
-          <version>1.0-alpha-9</version>
++         <version>1.0-alpha-9</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+-         <version>1.0-alpha-9</version>
        </dependency>
     </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-repository-metadata.pom.withoutxslt	2006-09-21 \
                18:40:54.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-repository-metadata.pom	2006-09-21 \
18:40:58.000000000 -0400 +    <dependencyManagement/>
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-repository-metadata.pom.withoutxslt	2006-10-05 \
14:31:53.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-repository-metadata.pom	2006-10-05 \
14:31:56.000000000 -0400  @@ -1,14 +1,14 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>repository-metadata</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
-+      <groupId>JPP/maven2</groupId>
++      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
        <artifactId>maven</artifactId>
 -      <version>2.0.2</version>
-+      <version>2.0.4</version>
     </parent>
--   <groupId>org.apache.maven</groupId>
--   <artifactId>maven-repository-metadata</artifactId>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-repository-metadata</artifactId>
     <name>Maven Repository Metadata Model</name>
 -   <version>2.0.2</version>
     <description>Maven Plugin Mapping</description>
     <distributionManagement>
        <status>deployed</status>
-@@ -17,8 +17,8 @@
+@@ -17,9 +17,9 @@
     <build>
        <plugins>
           <plugin>
--            <groupId>org.codehaus.modello</groupId>
--            <artifactId>modello-maven-plugin</artifactId>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
-             <version>1.0-alpha-8</version>
++            <version>1.0-alpha-8</version>
+             <groupId>org.codehaus.modello</groupId>
+             <artifactId>modello-maven-plugin</artifactId>
+-            <version>1.0-alpha-8</version>
              <executions>
                 <execution>
-@@ -39,8 +39,8 @@
+                   <goals>
+@@ -39,9 +39,9 @@
     </build>
     <dependencies>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-utils</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-          <version>1.1</version>
++         <version>1.2</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-utils</artifactId>
+-         <version>1.1</version>
        </dependency>
     </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools-ant.pom.withoutxslt	2006-09-21 \
                18:40:02.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools-ant.pom	2006-09-21 \
                18:40:06.000000000 -0400
-@@ -1,37 +1,37 @@
+    <dependencyManagement/>
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools-ant.pom.withoutxslt	2006-10-05 \
14:31:08.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-tools-ant.pom	2006-10-05 \
14:31:11.000000000 -0400 +@@ -1,38 +1,38 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-tools-ant</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
--      <artifactId>maven-plugin-tools</artifactId>
--      <version>2.0.2</version>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>plugin-tools</artifactId>
 +      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-plugin-tools</artifactId>
+-      <version>2.0.2</version>
     </parent>
--   <groupId>org.apache.maven</groupId>
--   <artifactId>maven-plugin-tools-ant</artifactId>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-plugin-tools-ant</artifactId>
     <name>Maven Ant Plugin Tools</name>
 -   <version>2.0.2</version>
     <distributionManagement>
@@ -30685,40 +30336,34 @@
     <modelVersion>4.0.0</modelVersion>
     <dependencies>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-plugin-tools-api</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-tools-api</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-tools-api</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-plugin-descriptor</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-descriptor</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-descriptor</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-plugin-tools-model</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-tools-model</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-tools-model</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-utils</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-          <version>1.1</version>
++         <version>1.2</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-utils</artifactId>
+-         <version>1.1</version>
        </dependency>
     </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-war-plugin.pom.withoutxslt	2006-09-21 \
                18:40:43.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-war-plugin.pom	2006-09-21 \
                18:40:47.000000000 -0400
-@@ -1,34 +1,37 @@
+    <dependencyManagement/>
+--- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-war-plugin.pom.withoutxslt	2006-10-05 \
14:31:43.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-war-plugin.pom	2006-10-05 \
14:31:46.000000000 -0400 +@@ -1,34 +1,36 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -30754,104 +30399,262 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-war-plugin</artifactId>
 +   <version>2.0-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-war-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven War Plugin</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-archiver</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-utils</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-plugins.pom.withoutxslt	2006-09-21 \
                18:40:06.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-plugins.pom	2006-09-21 \
                18:40:09.000000000 -0400
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="utf-8"?>
- <project>
--   <groupId>JPP/maven2/plugins</groupId>
-    <artifactId>plugins</artifactId>
-+   <groupId>JPP/maven2/plugins</groupId>
-    <version>2.0.4-JPP</version>
-    <parent>
-       <groupId>JPP/maven2</groupId>
-@@ -74,7 +74,6 @@
-          </plugin>
+--- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-plugins.pom.withoutxslt	2006-10-05 \
14:31:11.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-plugins.pom	2006-10-05 \
14:31:15.000000000 -0400 +@@ -1,93 +1,94 @@
+-<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"> +-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.maven</groupId>
+-    <artifactId>maven-parent</artifactId>
+-    <version>1</version>
+-    <relativePath>../pom/maven/pom.xml</relativePath>
+-  </parent>
+-  <groupId>org.apache.maven.plugins</groupId>
+-  <artifactId>maven-plugins</artifactId>
+-  <packaging>pom</packaging>
+-  <version>2-SNAPSHOT</version>
+-  <name>Maven Plugins</name>
+-  <description>Maven Plugins</description>
+-  <url>http://maven.apache.org/plugins/</url>
+-  <distributionManagement>
+-    <site>
+-      <id>apache.website</id>
+-      <url>scp://minotaur.apache.org/www/maven.apache.org/plugins/</url>
+-    </site>
+-  </distributionManagement>
+-  <repositories>
+-    <repository>
+-      <id>snapshots</id>
+-      <name>Maven Central Development Repository</name>
+-      <url>http://snapshots.maven.codehaus.org/maven2</url>
+-      <releases>
+-        <enabled>false</enabled>
+-      </releases>
+-    </repository>
+-  </repositories>
+-  <modules>
+-    <module>maven-ant-plugin</module>
+-    <module>maven-antlr-plugin</module>
+-    <module>maven-antrun-plugin</module>
+-    <module>maven-assembly-plugin</module>
+-    <module>maven-checkstyle-plugin</module>
+-    <module>maven-clean-plugin</module>
+-    <module>maven-clover-plugin</module>
+-    <module>maven-compiler-plugin</module>
+-    <module>maven-dependency-plugin</module>
+-    <module>maven-deploy-plugin</module>
+-    <module>maven-eclipse-plugin</module>
+-    <module>maven-ear-plugin</module>
+-    <module>maven-ejb-plugin</module>
+-    <module>maven-help-plugin</module>
+-    <module>maven-idea-plugin</module>
+-    <module>maven-install-plugin</module>
+-    <module>maven-jar-plugin</module>
+-    <module>maven-javadoc-plugin</module>
+-    <module>maven-jxr-plugin</module>
+-    <module>maven-one-plugin</module>
+-    <module>maven-plugin-plugin</module>
+-    <module>maven-pmd-plugin</module>
+-    <module>maven-project-info-reports-plugin</module>
+-    <module>maven-rar-plugin</module>
+-    <module>maven-release-plugin</module>
+-    <module>maven-repository-plugin</module>    
+-    <module>maven-resources-plugin</module>
+-    <module>maven-site-plugin</module>
+-    <module>maven-source-plugin</module>
+-    <module>maven-surefire-plugin</module>
+-    <module>maven-surefire-report-plugin</module>
+-    <module>maven-war-plugin</module>
+-    <module>maven-verifier-plugin</module>
+-  </modules>
+-  <scm>
+-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/</connection>
 +-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/</developerConnection>
 +-    <url>http://svn.apache.org/viewcvs.cgi/maven/plugins/trunk/</url>
+-  </scm>
+-  <build>
+-    <pluginManagement>
++<?xml version="1.0" encoding="utf-8"?>
++<project>
++   <version>2-SNAPSHOT</version>
++   <parent>
++      <version>1.0</version>
++      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-parent</artifactId> ++    \
<relativePath xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">../pom/maven/pom.xml</relativePath>
 ++   </parent>
++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 ++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugins</artifactId> ++   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging> ++   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Plugins</name> ++   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Plugins</description> ++  \
<url xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org/plugins/</url>
 ++   <distributionManagement xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ++      <site>
++         <id>apache.website</id>
++         <url>scp://minotaur.apache.org/www/maven.apache.org/plugins/</url>
++      </site>
++   </distributionManagement>
++   <repositories xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ++      <repository>
++         <id>snapshots</id>
++         <name>Maven Central Development Repository</name>
++         <url>http://snapshots.maven.codehaus.org/maven2</url>
++         <releases>
++            <enabled>false</enabled>
++         </releases>
++      </repository>
++   </repositories>
++   <modules xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ++      \
<module>maven-ant-plugin</module> ++      <module>maven-antlr-plugin</module>
++      <module>maven-antrun-plugin</module>
++      <module>maven-assembly-plugin</module>
++      <module>maven-checkstyle-plugin</module>
++      <module>maven-clean-plugin</module>
++      <module>maven-clover-plugin</module>
++      <module>maven-compiler-plugin</module>
++      <module>maven-dependency-plugin</module>
++      <module>maven-deploy-plugin</module>
++      <module>maven-eclipse-plugin</module>
++      <module>maven-ear-plugin</module>
++      <module>maven-ejb-plugin</module>
++      <module>maven-help-plugin</module>
++      <module>maven-idea-plugin</module>
++      <module>maven-install-plugin</module>
++      <module>maven-jar-plugin</module>
++      <module>maven-javadoc-plugin</module>
++      <module>maven-jxr-plugin</module>
++      <module>maven-one-plugin</module>
++      <module>maven-plugin-plugin</module>
++      <module>maven-pmd-plugin</module>
++      <module>maven-project-info-reports-plugin</module>
++      <module>maven-rar-plugin</module>
++      <module>maven-release-plugin</module>
++      <module>maven-repository-plugin</module>
++      <module>maven-resources-plugin</module>
++      <module>maven-site-plugin</module>
++      <module>maven-source-plugin</module>
++      <module>maven-surefire-plugin</module>
++      <module>maven-surefire-report-plugin</module>
++      <module>maven-war-plugin</module>
++      <module>maven-verifier-plugin</module>
++   </modules>
++   <scm xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ++      \
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/</connection> \
++      <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/</developerConnection>
 ++      <url>http://svn.apache.org/viewcvs.cgi/maven/plugins/trunk/</url>
++   </scm>
++   <reporting xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +       <plugins>
+-        <plugin>
+-          <artifactId>maven-release-plugin</artifactId>
+-          <configuration>
+-            <tagBase>https://svn.apache.org/repos/asf/maven/plugins/tags</tagBase>
+-          </configuration>
+-        </plugin>
++         <plugin>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-plugin-plugin</artifactId>
++         </plugin>
        </plugins>
-    </reporting>
--   <dependencies/>
-    <modelVersion>4.0.0</modelVersion>
-    <build>
-       <pluginManagement xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-@@ -88,5 +87,6 @@
-          </plugins>
-       </pluginManagement>
-    </build>
-+   <dependencies/>
-    <dependencyManagement/>
- </project>
+-    </pluginManagement>
+-  </build>
+-  <reporting>
+-    <plugins>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-plugin-plugin</artifactId>
+-      </plugin>
+-    </plugins>
+-  </reporting>
+-</project>
++   </reporting>
++   <modelVersion>4.0.0</modelVersion>
++   <build>
++      <pluginManagement xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ++         <plugins>
++            <plugin>
++               <artifactId>maven-release-plugin</artifactId>
++               <configuration>
++                  <tagBase>https://svn.apache.org/repos/asf/maven/plugins/tags</tagBase>
 ++               </configuration>
++            </plugin>
++         </plugins>
++      </pluginManagement>
++   </build>
++   <dependencyManagement/>
++</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-error-diagnostics.pom.withoutxslt	2006-09-21 \
                18:40:58.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-error-diagnostics.pom	2006-09-21 \
                18:41:01.000000000 -0400
-@@ -1,13 +1,14 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-error-diagnostics.pom.withoutxslt	2006-10-05 \
14:31:56.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-error-diagnostics.pom	2006-10-05 \
14:31:59.000000000 -0400 +@@ -1,13 +1,13 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>error-diagnostics</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
-+      <groupId>JPP/maven2</groupId>
++      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
        <artifactId>maven</artifactId>
 -      <version>2.0.2</version>
-+      <version>2.0.4</version>
     </parent>
--   <artifactId>maven-error-diagnostics</artifactId>
+    <artifactId>maven-error-diagnostics</artifactId>
     <name>Maven Error Diagnostics</name>
 -   <version>2.0.2</version>
     <description>Provides a manager component which will process a given Throwable \
                instance through a set of diagnostic
      sub-components, and return a String message with user-friendly information \
about the error and possibly  how to fix it.</description>
-@@ -17,8 +18,8 @@
+@@ -17,9 +17,9 @@
     <modelVersion>4.0.0</modelVersion>
     <dependencies>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-container-default</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
-          <version>1.0-alpha-9</version>
++         <version>1.0-alpha-9</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+-         <version>1.0-alpha-9</version>
        </dependency>
     </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-surefire-plugin.pom.withoutxslt	2006-09-21 \
                18:40:36.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-surefire-plugin.pom	2006-09-21 \
                18:40:40.000000000 -0400
-@@ -1,56 +1,59 @@
+    <dependencyManagement/>
+--- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-surefire-plugin.pom.withoutxslt	2006-10-05 \
14:31:37.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-surefire-plugin.pom	2006-10-05 \
14:31:40.000000000 -0400 +@@ -1,56 +1,58 @@
 -<?xml version="1.0" encoding="UTF-8"?><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-plugins</artifactId>
@@ -30909,14 +30712,13 @@
 -  </properties>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-surefire-plugin</artifactId>
 +   <version>2.1.4-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugins</artifactId> ++   \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
  +   </parent>
++   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-surefire-plugin</artifactId>
  +   <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin</packaging>  +   \
<name xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Surefire Plugin</name>  + \
<contributors xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> @@ -30931,45 +30733,45 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> ++         \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>  +         \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">runtime</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-api</artifactId>  \
+      </dependency>  +      <dependency>
-+         <groupId>JPP/maven-surefire</groupId>
-+         <artifactId>booter</artifactId>
 +         <version>1.5.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.surefire</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">surefire-booter</artifactId>  + \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven-surefire</groupId>
-+         <artifactId>surefire</artifactId>
 +         <version>1.5.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.surefire</groupId>
 ++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">surefire</artifactId>  +        \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">runtime</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.codehaus.plexus</groupId> \
++         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">plexus-utils</artifactId>  +    \
<scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">runtime</scope>  +      \
</dependency>  +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-artifact</artifactId>  +  \
</dependency>  +   </dependencies>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-jar-plugin.pom.withoutxslt	2006-09-21 \
                18:42:12.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-jar-plugin.pom	2006-09-21 \
                18:42:15.000000000 -0400
-@@ -1,53 +1,55 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-jar-plugin.pom.withoutxslt	2006-10-05 \
14:32:51.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-jar-plugin.pom	2006-10-05 \
14:32:54.000000000 -0400 +@@ -1,53 +1,54 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -31024,14 +30826,13 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-jar-plugin</artifactId>
 +   <version>2.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-jar-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Jar Plugin</name>
 +   <contributors>
@@ -31049,37 +30850,37 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-archiver</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>commons-lang</artifactId>
 +         <version>2.1</version>
++         <groupId>commons-lang</groupId>
++         <artifactId>commons-lang</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-shared</groupId>
-+         <artifactId>plugin-testing-harness</artifactId>
 +         <version>1.0-SNAPSHOT</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-testing-harness</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0089-plugin.pom.withoutxslt	2006-09-21 \
                18:41:23.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0089-plugin.pom	2006-09-21 \
18:41:26.000000000 -0400 +--- \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0089-plugin.pom.withoutxslt	2006-10-05 \
14:32:15.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0089-plugin.pom	2006-10-05 \
14:32:17.000000000 -0400  @@ -1,26 +1,26 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -31108,34 +30909,34 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <artifactId>maven-it0089-plugin</artifactId>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <version>2.0.4-JPP</version>
 +   <parent>
 +      <groupId>org.apache.maven.it</groupId>
 +      <version>1.0</version>
 +      <artifactId>it0089-root</artifactId>
 +   </parent>
++   <groupId>org.apache.maven.plugins</groupId>
++   <artifactId>maven-it0089-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>checkstyle</artifactId>
 +         <version>4.1</version>
++         <groupId>checkstyle</groupId>
++         <artifactId>checkstyle</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-site-plugin.pom.withoutxslt	2006-09-21 \
                18:40:21.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-site-plugin.pom	2006-09-21 \
                18:40:24.000000000 -0400
-@@ -1,91 +1,89 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-site-plugin.pom.withoutxslt	2006-10-05 \
14:31:25.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-site-plugin.pom	2006-10-05 \
14:31:27.000000000 -0400 +@@ -1,91 +1,88 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -31228,14 +31029,13 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-site-plugin</artifactId>
 +   <version>2.0-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-site-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Site plugin</name>
 +   <prerequisites>
@@ -31278,47 +31078,47 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>settings</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-settings</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-doxia</groupId>
-+         <artifactId>site-renderer</artifactId>
 +         <version>1.0-alpha-7</version>
++         <groupId>org.apache.maven.doxia</groupId>
++         <artifactId>doxia-site-renderer</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>reporting-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven.reporting</groupId>
++         <artifactId>maven-reporting-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-utils</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-compiler-plugin.pom.withoutxslt	2006-09-21 \
                18:42:42.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-compiler-plugin.pom	2006-09-21 \
                18:42:45.000000000 -0400
-@@ -1,52 +1,55 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-compiler-plugin.pom.withoutxslt	2006-10-05 \
14:33:11.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-compiler-plugin.pom	2006-10-05 \
14:33:14.000000000 -0400 +@@ -1,52 +1,54 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -31372,76 +31172,73 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-compiler-plugin</artifactId>
 +   <version>2.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-compiler-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Compiler Plugin</name>
 +   <inceptionYear>2001</inceptionYear>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-utils</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>compiler-api</artifactId>
 +         <version>1.6-SNAPSHOT</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-compiler-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>compiler-manager</artifactId>
 +         <version>1.6-SNAPSHOT</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-compiler-manager</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>compiler-javac</artifactId>
 +         <version>1.6-SNAPSHOT</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-compiler-javac</artifactId>
 +         <scope>runtime</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-shared</groupId>
-+         <artifactId>plugin-testing-harness</artifactId>
 +         <version>1.0-SNAPSHOT</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-testing-harness</artifactId>
 +         <scope>test</scope>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-plugin-parent.pom.withoutxslt	2006-09-21 \
                18:40:13.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-plugin-parent.pom	2006-09-21 \
18:40:17.000000000 -0400 +--- \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-plugin-parent.pom.withoutxslt	2006-10-05 \
14:31:18.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-plugin-parent.pom	2006-10-05 \
14:31:22.000000000 -0400  @@ -1,9 +1,9 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
--   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
                
--   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-parent</artifactId>
                
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-plugin-parent</artifactId>
 +   <version>2.0</version>
+    <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.plugins</groupId>
 +    <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-plugin-parent</artifactId>
                
     <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>
 -   <version xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2.0.1</version>
     <name xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven \
                Plugins</name>
     <description xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven \
                Plugins</description>
     <url xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org/plugins/</url>
                
-@@ -206,42 +206,42 @@
+@@ -206,43 +206,43 @@
              </plugin>
           </plugins>
        </pluginManagement>
@@ -31451,59 +31248,52 @@
 -            <groupId>org.apache.maven.wagon</groupId>
 -            <artifactId>wagon-ssh-external</artifactId>
 -            <version>1.0-alpha-5</version>
-+            <groupId>JPP/maven-wagon</groupId>
-+            <artifactId>ssh-external</artifactId>
 +            <version>1.0-alpha-6</version>
++            <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven.wagon</groupId>
 ++            <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">wagon-ssh-external</artifactId> \
</extension>  </extensions>
     </build>
     <dependencies>
        <dependency>
--         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId>
--         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>
                
--         <version xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">3.8.1</version>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
+          <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> +          \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId> +-         \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">3.8.1</version>
           <scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-plugin-api</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-api</artifactId>
+-         <version>2.0.2</version>
        </dependency>
     </dependencies>
     <dependencyManagement>
        <dependencies>
           <dependency>
--            <groupId>org.apache.maven</groupId>
--            <artifactId>maven-project</artifactId>
--            <version>2.0.2</version>
-+            <groupId>JPP/maven2</groupId>
-+            <artifactId>project</artifactId>
 +            <version>2.0.4</version>
+             <groupId>org.apache.maven</groupId>
+             <artifactId>maven-project</artifactId>
+-            <version>2.0.2</version>
           </dependency>
           <dependency>
--            <groupId>org.codehaus.plexus</groupId>
--            <artifactId>plexus-container-default</artifactId>
-+            <groupId>JPP/plexus</groupId>
-+            <artifactId>container-default</artifactId>
-             <version>1.0-alpha-9</version>
++            <version>1.0-alpha-9</version>
+             <groupId>org.codehaus.plexus</groupId>
+             <artifactId>plexus-container-default</artifactId>
+-            <version>1.0-alpha-9</version>
           </dependency>
           <dependency>
--            <groupId>org.codehaus.plexus</groupId>
--            <artifactId>plexus-utils</artifactId>
-+            <groupId>JPP/plexus</groupId>
-+            <artifactId>utils</artifactId>
-             <version>1.1</version>
++            <version>1.2</version>
+             <groupId>org.codehaus.plexus</groupId>
+             <artifactId>plexus-utils</artifactId>
+-            <version>1.1</version>
           </dependency>
        </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-assembly-plugin.pom.withoutxslt	2006-09-21 \
                18:39:36.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-assembly-plugin.pom	2006-09-21 \
                18:39:40.000000000 -0400
-@@ -1,90 +1,94 @@
+    </dependencyManagement>
+--- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-assembly-plugin.pom.withoutxslt	2006-10-05 \
14:30:44.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-assembly-plugin.pom	2006-10-05 \
14:30:47.000000000 -0400 +@@ -1,90 +1,93 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -31595,23 +31385,22 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-assembly-plugin</artifactId>
 +   <version>2.1-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-assembly-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Assembly Plugin</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
 +            <version>1.0-alpha-8</version>
++            <groupId>org.codehaus.modello</groupId>
++            <artifactId>modello-maven-plugin</artifactId>
 +            <executions>
 +               <execution>
 +                  <id>descriptor</id>
@@ -31645,51 +31434,51 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>mavencore</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-core</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-archiver</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>archiver</artifactId>
 +         <version>1.0-alpha-5</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-archiver</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-+         <version>1.1</version>
++         <version>1.2</version>
++         <groupId>org.codehaus.plexus</groupId>
++         <artifactId>plexus-utils</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-artifact</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven-shared</groupId>
-+         <artifactId>file-management</artifactId>
 +         <version>1.0</version>
++         <groupId>org.apache.maven.shared</groupId>
++         <artifactId>file-management</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it2000-plugin.pom.withoutxslt	2006-09-21 \
                18:41:01.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it2000-plugin.pom	2006-09-21 \
18:41:05.000000000 -0400 +--- \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it2000-plugin.pom.withoutxslt	2006-10-05 \
14:31:59.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it2000-plugin.pom	2006-10-05 \
14:32:02.000000000 -0400  @@ -1,22 +1,22 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -31714,9 +31503,9 @@
 -    </snapshotRepository>
 -  </distributionManagement>
 -</project>
-+   <artifactId>maven-it2000-plugin</artifactId>
-+   <groupId>org.apache.maven.plugins.it2000</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.plugins.it2000</groupId>
++   <artifactId>maven-it2000-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <distributionManagement>
 +      <snapshotRepository>
@@ -31727,97 +31516,83 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-project.pom.withoutxslt	2006-09-21 \
                18:41:45.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-project.pom	2006-09-21 \
                18:41:49.000000000 -0400
-@@ -1,13 +1,14 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-project.pom.withoutxslt	2006-10-05 \
14:32:31.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-project.pom	2006-10-05 \
14:32:34.000000000 -0400 +@@ -1,13 +1,13 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>project</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
-+      <groupId>JPP/maven2</groupId>
++      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
        <artifactId>maven</artifactId>
 -      <version>2.0.2</version>
-+      <version>2.0.4</version>
     </parent>
--   <artifactId>maven-project</artifactId>
+    <artifactId>maven-project</artifactId>
     <name>Maven Project Builder</name>
 -   <version>2.0.2</version>
     <description>This library is used to not only read Maven project object model \
files, but to assemble inheritence  and to retrieve remote models as \
required.</description>  <distributionManagement>
-@@ -16,39 +17,39 @@
+@@ -16,40 +16,40 @@
     <modelVersion>4.0.0</modelVersion>
     <dependencies>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-artifact-test</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-test</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-artifact-test</artifactId>
+-         <version>2.0.2</version>
           <scope>test</scope>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-profile</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>profile</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-profile</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-model</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-model</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-artifact-manager</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-manager</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-artifact-manager</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-utils</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-          <version>1.1</version>
++         <version>1.2</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-utils</artifactId>
+-         <version>1.1</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-artifact</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-artifact</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-container-default</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
-          <version>1.0-alpha-9</version>
++         <version>1.0-alpha-9</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+-         <version>1.0-alpha-9</version>
        </dependency>
     </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-script.pom.withoutxslt	2006-09-21 \
                18:41:12.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-script.pom	2006-09-21 \
                18:41:16.000000000 -0400
-@@ -1,17 +1,20 @@
+    <dependencyManagement/>
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-script.pom.withoutxslt	2006-10-05 \
14:32:07.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-script.pom	2006-10-05 \
14:32:10.000000000 -0400 +@@ -1,17 +1,19 @@
 -<?xml version="1.0" encoding="UTF-8"?><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>
@@ -31836,28 +31611,27 @@
 -  </modules>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>script</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId> ++      \
<groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>  +   \
</parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-script</artifactId>  +   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven Script Support \
Root</name>  +   <modules xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  +      \
<module>maven-script-ant</module>  +      <module>maven-script-beanshell</module>
 +   </modules>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-parent.pom.withoutxslt	2006-09-21 \
                18:41:16.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-parent.pom	2006-09-21 \
                18:41:19.000000000 -0400
-@@ -1,200 +1,182 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-parent.pom.withoutxslt	2006-10-05 \
14:32:10.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-parent.pom	2006-10-05 \
14:32:12.000000000 -0400 +@@ -1,200 +1,181 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -
 -<!--
@@ -32060,15 +31834,15 @@
 -
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>parent</artifactId>
 +   <version>1.0</version>
 +   <parent>
-+      <groupId>JPP</groupId>
-+      <artifactId>apache</artifactId>
 +      <version>1.0</version>
++      <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache</groupId> ++      \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">apache</artifactId>  +      \
<relativePath xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">../asf/pom.xml</relativePath>  \
+   </parent> ++   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> ++   \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven-parent</artifactId>  +   \
<packaging xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>  +   <name \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Apache Maven</name>  +   \
<description xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> @@ -32236,72 +32010,65 @@
 +         <timezone>-5</timezone>
 +      </developer>
 +   </developers>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-profile.pom.withoutxslt	2006-09-21 \
                18:42:15.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-profile.pom	2006-09-21 \
                18:42:19.000000000 -0400
-@@ -1,13 +1,14 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-profile.pom.withoutxslt	2006-10-05 \
14:32:54.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-profile.pom	2006-10-05 \
14:32:56.000000000 -0400 +@@ -1,13 +1,13 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>profile</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
-+      <groupId>JPP/maven2</groupId>
++      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
        <artifactId>maven</artifactId>
 -      <version>2.0.2</version>
-+      <version>2.0.4</version>
     </parent>
--   <artifactId>maven-profile</artifactId>
+    <artifactId>maven-profile</artifactId>
     <name>Maven Profile Model</name>
 -   <version>2.0.2</version>
     <distributionManagement>
        <status>deployed</status>
     </distributionManagement>
-@@ -15,8 +16,8 @@
+@@ -15,9 +15,9 @@
     <build>
        <plugins>
           <plugin>
--            <groupId>org.codehaus.modello</groupId>
--            <artifactId>modello-maven-plugin</artifactId>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
-             <version>1.0-alpha-8</version>
++            <version>1.0-alpha-8</version>
+             <groupId>org.codehaus.modello</groupId>
+             <artifactId>modello-maven-plugin</artifactId>
+-            <version>1.0-alpha-8</version>
              <executions>
                 <execution>
-@@ -36,18 +37,18 @@
+                   <goals>
+@@ -36,19 +36,19 @@
     </build>
     <dependencies>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-model</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-model</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-utils</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-          <version>1.1</version>
++         <version>1.2</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-utils</artifactId>
+-         <version>1.1</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-container-default</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
-          <version>1.0-alpha-9</version>
++         <version>1.0-alpha-9</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+-         <version>1.0-alpha-9</version>
        </dependency>
     </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-monitor.pom.withoutxslt	2006-09-21 \
                18:41:05.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-monitor.pom	2006-09-21 \
                18:41:09.000000000 -0400
-@@ -1,15 +1,18 @@
+    <dependencyManagement/>
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-monitor.pom.withoutxslt	2006-10-05 \
14:32:02.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-monitor.pom	2006-10-05 \
14:32:04.000000000 -0400 +@@ -1,15 +1,17 @@
 -<?xml version="1.0" encoding="UTF-8"?><project>
 -  <parent>
 -    <artifactId>maven</artifactId>
@@ -32318,252 +32085,210 @@
 -  </distributionManagement>
 +<?xml version="1.0" encoding="utf-8"?>
 +<project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>monitor</artifactId>
 +   <version>2.0.4</version>
 +   <parent>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>maven</artifactId>
 +      <version>2.0.4</version>
++      <artifactId>maven</artifactId>
++      <groupId>org.apache.maven</groupId>
 +   </parent>
++   <groupId>org.apache.maven</groupId>
++   <artifactId>maven-monitor</artifactId>
 +   <name>Maven Monitor</name>
 +   <distributionManagement>
 +      <status>deployed</status>
 +   </distributionManagement>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencyManagement/>
  </project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-core.pom.withoutxslt	2006-09-21 \
                18:42:38.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-core.pom	2006-09-21 \
18:42:42.000000000 -0400 +--- \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-core.pom.withoutxslt	2006-10-05 \
14:33:09.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-core.pom	2006-10-05 \
14:33:11.000000000 -0400  @@ -1,14 +1,14 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>mavencore</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
-+      <groupId>JPP/maven2</groupId>
++      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
        <artifactId>maven</artifactId>
 -      <version>2.0.2</version>
-+      <version>2.0.4</version>
     </parent>
--   <groupId>org.apache.maven</groupId>
--   <artifactId>maven-core</artifactId>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-core</artifactId>
     <name>Maven Core</name>
 -   <version>2.0.2</version>
     <distributionManagement>
        <site>
           <id>website</id>
-@@ -20,7 +20,9 @@
+@@ -20,6 +20,7 @@
     <build>
        <plugins>
           <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-             <artifactId>maven-assembly-plugin</artifactId>
 +            <version>2.1-SNAPSHOT</version>
+             <artifactId>maven-assembly-plugin</artifactId>
              <configuration>
                 <descriptor>src/assemble/bin.xml</descriptor>
-                <finalName>maven-2.0.2</finalName>
-@@ -30,77 +32,77 @@
+@@ -30,79 +31,79 @@
     </build>
     <dependencies>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-settings</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>settings</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-settings</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven.wagon</groupId>
--         <artifactId>wagon-file</artifactId>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>file</artifactId>
-          <version>1.0-alpha-6</version>
++         <version>1.0-alpha-6</version>
+          <groupId>org.apache.maven.wagon</groupId>
+          <artifactId>wagon-file</artifactId>
+-         <version>1.0-alpha-6</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-plugin-parameter-documenter</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-parameter-documenter</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-parameter-documenter</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven.wagon</groupId>
--         <artifactId>wagon-http-lightweight</artifactId>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>http-lightweight</artifactId>
-          <version>1.0-alpha-6</version>
++         <version>1.0-alpha-6</version>
+          <groupId>org.apache.maven.wagon</groupId>
+          <artifactId>wagon-http-lightweight</artifactId>
+-         <version>1.0-alpha-6</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven.reporting</groupId>
--         <artifactId>maven-reporting-api</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>reporting-api</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven.reporting</groupId>
+          <artifactId>maven-reporting-api</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-profile</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>profile</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-profile</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-model</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-model</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-artifact</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-artifact</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven.wagon</groupId>
--         <artifactId>wagon-provider-api</artifactId>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>provider-api</artifactId>
-          <version>1.0-alpha-6</version>
++         <version>1.0-alpha-6</version>
+          <groupId>org.apache.maven.wagon</groupId>
+          <artifactId>wagon-provider-api</artifactId>
+-         <version>1.0-alpha-6</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-container-default</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
-          <version>1.0-alpha-9</version>
++         <version>1.0-alpha-9</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+-         <version>1.0-alpha-9</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-repository-metadata</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>repository-metadata</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-repository-metadata</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-error-diagnostics</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>error-diagnostics</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-error-diagnostics</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-project</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-project</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-plugin-registry</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-registry</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-registry</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>commons-cli</groupId>
-+         <groupId>JPP</groupId>
++         <version>1.0</version>
+          <groupId>commons-cli</groupId>
           <artifactId>commons-cli</artifactId>
-          <version>1.0</version>
+-         <version>1.0</version>
           <exclusions>
-@@ -115,24 +117,24 @@
+             <exclusion>
+                <artifactId>commons-lang</artifactId>
+@@ -115,24 +116,24 @@
           </exclusions>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-plugin-api</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-api</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven.wagon</groupId>
--         <artifactId>wagon-ssh-external</artifactId>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>ssh-external</artifactId>
-          <version>1.0-alpha-6</version>
++         <version>1.0-alpha-6</version>
+          <groupId>org.apache.maven.wagon</groupId>
+          <artifactId>wagon-ssh-external</artifactId>
+-         <version>1.0-alpha-6</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-plugin-descriptor</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-descriptor</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-descriptor</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-interactivity-api</artifactId>
--         <version>1.0-alpha-4</version>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>interactivity-api</artifactId>
 +         <version>1.0-alpha-1</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-interactivity-api</artifactId>
+-         <version>1.0-alpha-4</version>
           <exclusions>
              <exclusion>
                 <artifactId>plexus-utils</artifactId>
-@@ -145,29 +147,29 @@
+@@ -145,29 +146,29 @@
           </exclusions>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-artifact-manager</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact-manager</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-artifact-manager</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-monitor</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>monitor</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-monitor</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven.wagon</groupId>
--         <artifactId>wagon-ssh</artifactId>
-+         <groupId>JPP/maven-wagon</groupId>
-+         <artifactId>ssh</artifactId>
-          <version>1.0-alpha-6</version>
++         <version>1.0-alpha-6</version>
+          <groupId>org.apache.maven.wagon</groupId>
+          <artifactId>wagon-ssh</artifactId>
+-         <version>1.0-alpha-6</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-utils</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-          <version>1.1</version>
++         <version>1.2</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-utils</artifactId>
+-         <version>1.1</version>
        </dependency>
        <dependency>
--         <groupId>classworlds</groupId>
-+         <groupId>JPP</groupId>
++         <version>1.4</version>
+          <groupId>classworlds</groupId>
           <artifactId>classworlds</artifactId>
 -         <version>1.1</version>
-+         <version>1.4</version>
        </dependency>
     </dependencies>
     <dependencyManagement/>
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.it-maven-it0065-plugin.pom.withoutxslt	2006-09-21 \
                18:42:56.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.it-maven-it0065-plugin.pom	2006-09-21 \
18:43:00.000000000 -0400 +--- \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.it-maven-it0065-plugin.pom.withoutxslt	2006-10-05 \
14:33:21.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.it-maven-it0065-plugin.pom	2006-10-05 \
14:33:24.000000000 -0400  @@ -1,34 +1,36 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
@@ -32600,13 +32325,13 @@
 -    </repository>
 -  </distributionManagement>
 -</project>
-+   <artifactId>maven-it0065-plugin</artifactId>
 +   <version>1.0-SNAPSHOT</version>
 +   <parent>
 +      <groupId>org.apache.maven.it</groupId>
 +      <artifactId>maven-core-it0065</artifactId>
 +      <version>1.0</version>
 +   </parent>
++   <artifactId>maven-it0065-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <distributionManagement>
 +      <repository>
@@ -32618,16 +32343,16 @@
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +         <type>jar</type>
 +         <scope>compile</scope>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
++         <groupId>junit</groupId>
++         <artifactId>junit</artifactId>
 +         <type>jar</type>
 +         <scope>test</scope>
 +      </dependency>
@@ -32635,23 +32360,19 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-script-ant.pom.withoutxslt	2006-09-21 \
                18:42:19.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-script-ant.pom	2006-09-21 \
                18:42:23.000000000 -0400
-@@ -1,31 +1,32 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-script-ant.pom.withoutxslt	2006-10-05 \
14:32:56.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-script-ant.pom	2006-10-05 \
14:32:59.000000000 -0400 +@@ -1,32 +1,32 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>script-ant</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
--      <artifactId>maven-script</artifactId>
--      <version>2.0.2</version>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>script</artifactId>
 +      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-script</artifactId>
+-      <version>2.0.2</version>
     </parent>
--   <artifactId>maven-script-ant</artifactId>
+    <artifactId>maven-script-ant</artifactId>
     <name>Maven Ant Mojo Support</name>
 -   <version>2.0.2</version>
     <distributionManagement>
@@ -32660,44 +32381,38 @@
     <modelVersion>4.0.0</modelVersion>
     <dependencies>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-plugin-api</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-api</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-ant-factory</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>ant-factory</artifactId>
-          <version>1.0-alpha-1</version>
++         <version>1.0-alpha-1</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-ant-factory</artifactId>
+-         <version>1.0-alpha-1</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-container-default</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
-          <version>1.0-alpha-9</version>
++         <version>1.0-alpha-9</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+-         <version>1.0-alpha-9</version>
        </dependency>
     </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-archiver.pom.withoutxslt	2006-09-21 \
                18:40:32.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-archiver.pom	2006-09-21 \
                18:40:36.000000000 -0400
-@@ -1,32 +1,33 @@
+    <dependencyManagement/>
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-archiver.pom.withoutxslt	2006-10-05 \
14:31:34.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-archiver.pom	2006-10-05 \
14:31:37.000000000 -0400 +@@ -1,32 +1,32 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>archiver</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
-+      <groupId>JPP/maven2</groupId>
++      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
        <artifactId>maven</artifactId>
 -      <version>2.0.2</version>
-+      <version>2.0.4</version>
     </parent>
--   <artifactId>maven-archiver</artifactId>
+    <artifactId>maven-archiver</artifactId>
     <name>Maven Archiver</name>
 -   <version>2.0.2</version>
     <distributionManagement>
@@ -32706,33 +32421,28 @@
     <modelVersion>4.0.0</modelVersion>
     <dependencies>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-project</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-project</artifactId>
+-         <version>2.0.2</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-archiver</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>archiver</artifactId>
-          <version>1.0-alpha-5</version>
++         <version>1.0-alpha-5</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-archiver</artifactId>
+-         <version>1.0-alpha-5</version>
        </dependency>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-artifact</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>artifact</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-artifact</artifactId>
+-         <version>2.0.2</version>
        </dependency>
     </dependencies>
     <dependencyManagement/>
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-resources-plugin.pom.withoutxslt	2006-09-21 \
                18:41:49.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-resources-plugin.pom	2006-09-21 \
                18:41:53.000000000 -0400
-@@ -1,34 +1,37 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-resources-plugin.pom.withoutxslt	2006-10-05 \
14:32:34.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-resources-plugin.pom	2006-10-05 \
14:32:37.000000000 -0400 +@@ -1,34 +1,36 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <parent>
@@ -32768,128 +32478,119 @@
 -    </dependency>
 -  </dependencies>
 -</project>
-+   <groupId>org.apache.maven.plugins</groupId>
-+   <artifactId>maven-resources-plugin</artifactId>
 +   <version>2.2-SNAPSHOT</version>
 +   <parent>
-+      <groupId>org.apache.maven.plugins</groupId>
-+      <artifactId>plugins</artifactId>
 +      <version>2-SNAPSHOT</version>
++      <artifactId>maven-plugins</artifactId>
++      <groupId>org.apache.maven.plugins</groupId>
 +   </parent>
++   <artifactId>maven-resources-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <name>Maven Resources Plugin</name>
 +   <modelVersion>4.0.0</modelVersion>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>plugin-api</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-plugin-api</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>project</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-project</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP</groupId>
-+         <artifactId>commons-io</artifactId>
 +         <version>1.0</version>
++         <groupId>commons-io</groupId>
++         <artifactId>commons-io</artifactId>
 +      </dependency>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>model</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-model</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-reporting-api.pom.withoutxslt	2006-09-21 \
                18:39:47.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-reporting-api.pom	2006-09-21 \
                18:39:51.000000000 -0400
-@@ -1,13 +1,14 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-reporting-api.pom.withoutxslt	2006-10-05 \
14:30:55.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-reporting-api.pom	2006-10-05 \
14:30:58.000000000 -0400 +@@ -1,13 +1,13 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>reporting-api</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven.reporting</groupId>
--      <artifactId>maven-reporting</artifactId>
--      <version>2.0.2</version>
-+      <groupId>JPP/maven2</groupId>
-+      <artifactId>reporting</artifactId>
 +      <version>2.0.4</version>
+       <groupId>org.apache.maven.reporting</groupId>
+       <artifactId>maven-reporting</artifactId>
+-      <version>2.0.2</version>
     </parent>
--   <artifactId>maven-reporting-api</artifactId>
+    <artifactId>maven-reporting-api</artifactId>
     <name>Maven Reporting API</name>
 -   <version>2.0.2</version>
     <developers>
        <developer>
           <id>vsiveton</id>
-@@ -25,8 +26,8 @@
+@@ -25,9 +25,9 @@
     <modelVersion>4.0.0</modelVersion>
     <dependencies>
        <dependency>
--         <groupId>org.apache.maven.doxia</groupId>
--         <artifactId>doxia-sink-api</artifactId>
-+         <groupId>JPP/maven-doxia</groupId>
-+         <artifactId>sink-api</artifactId>
-          <version>1.0-alpha-7</version>
++         <version>1.0-alpha-7</version>
+          <groupId>org.apache.maven.doxia</groupId>
+          <artifactId>doxia-sink-api</artifactId>
+-         <version>1.0-alpha-7</version>
        </dependency>
     </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-parameter-documenter.pom.withoutxslt	2006-09-21 \
                18:40:51.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-parameter-documenter.pom	2006-09-21 \
                18:40:54.000000000 -0400
-@@ -1,13 +1,14 @@
+    <dependencyManagement/>
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-parameter-documenter.pom.withoutxslt	2006-10-05 \
14:31:49.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-parameter-documenter.pom	2006-10-05 \
14:31:53.000000000 -0400 +@@ -1,13 +1,13 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-parameter-documenter</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
-+      <groupId>JPP/maven2</groupId>
++      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
        <artifactId>maven</artifactId>
 -      <version>2.0.2</version>
-+      <version>2.0.4</version>
     </parent>
--   <artifactId>maven-plugin-parameter-documenter</artifactId>
+    <artifactId>maven-plugin-parameter-documenter</artifactId>
     <name>Maven Plugin Parameter Documenter API</name>
 -   <version>2.0.2</version>
     <distributionManagement>
        <status>deployed</status>
     </distributionManagement>
-@@ -15,8 +16,8 @@
+@@ -15,9 +15,9 @@
     <build>
        <plugins>
           <plugin>
--            <groupId>org.codehaus.modello</groupId>
--            <artifactId>modello-maven-plugin</artifactId>
-+            <groupId>JPP/modello</groupId>
-+            <artifactId>maven-plugin</artifactId>
-             <version>1.0-alpha-8</version>
++            <version>1.0-alpha-8</version>
+             <groupId>org.codehaus.modello</groupId>
+             <artifactId>modello-maven-plugin</artifactId>
+-            <version>1.0-alpha-8</version>
              <executions>
                 <execution>
-@@ -45,13 +46,13 @@
+                   <id>base</id>
+@@ -45,14 +45,14 @@
     </build>
     <dependencies>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-utils</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-          <version>1.1</version>
++         <version>1.2</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-utils</artifactId>
+-         <version>1.1</version>
        </dependency>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-container-default</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>container-default</artifactId>
-          <version>1.0-alpha-9</version>
++         <version>1.0-alpha-9</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+-         <version>1.0-alpha-9</version>
        </dependency>
     </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0067-plugin.pom.withoutxslt	2006-09-21 \
                18:42:45.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0067-plugin.pom	2006-09-21 \
                18:42:49.000000000 -0400
-@@ -1,21 +1,22 @@
+    <dependencyManagement/>
+--- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0067-plugin.pom.withoutxslt	2006-10-05 \
14:33:14.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0067-plugin.pom	2006-10-05 \
14:33:16.000000000 -0400 +@@ -1,21 +1,21 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -32912,20 +32613,19 @@
 -    </profile>
 -  </profiles>
 -</project>
-+   <artifactId>maven-it0067-plugin</artifactId>
-+   <groupId>org.apache.maven.plugins.it</groupId>
 +   <version>1.0-SNAPSHOT</version>
++   <groupId>org.apache.maven.plugins.it</groupId>
++   <artifactId>maven-it0067-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
-+   <dependencies/>
 +   <modelVersion>4.0.0</modelVersion>
 +   <profiles>
 +      <profile>
 +         <id>test-profile</id>
 +         <dependencies>
 +            <dependency>
-+               <groupId>JPP</groupId>
-+               <artifactId>junit</artifactId>
 +               <version>3.8.1</version>
++               <groupId>junit</groupId>
++               <artifactId>junit</artifactId>
 +            </dependency>
 +         </dependencies>
 +      </profile>
@@ -32933,9 +32633,9 @@
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0020-plugin.pom.withoutxslt	2006-09-21 \
                18:40:17.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0020-plugin.pom	2006-09-21 \
                18:40:21.000000000 -0400
-@@ -1,43 +1,47 @@
+--- ./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0020-plugin.pom.withoutxslt	2006-10-05 \
14:31:22.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/org.apache.maven.plugins-maven-it0020-plugin.pom	2006-10-05 \
14:31:25.000000000 -0400 +@@ -1,43 +1,46 @@
 +<?xml version="1.0" encoding="utf-8"?>
  <project>
 -  <modelVersion>4.0.0</modelVersion>
@@ -32980,9 +32680,9 @@
 -    </repository>
 -  </distributionManagement>
 -</project>
-+   <artifactId>maven-it0020-plugin</artifactId>
-+   <groupId>org.apache.maven.plugins</groupId>
 +   <version>2.0.4-JPP</version>
++   <groupId>org.apache.maven.plugins</groupId>
++   <artifactId>maven-it0020-plugin</artifactId>
 +   <packaging>maven-plugin</packaging>
 +   <distributionManagement>
 +      <repository>
@@ -32995,14 +32695,13 @@
 +   <build>
 +      <plugins>
 +         <plugin>
-+            <groupId>org.apache.maven.plugins</groupId>
-+            <artifactId>maven-plugin-plugin</artifactId>
 +            <version>2.1.1-SNAPSHOT</version>
++            <artifactId>maven-plugin-plugin</artifactId>
 +            <dependencies>
 +               <dependency>
-+                  <groupId>JPP/maven2</groupId>
-+                  <artifactId>plugin-tools-beanshell</artifactId>
 +                  <version>2.0.4</version>
++                  <groupId>org.apache.maven</groupId>
++                  <artifactId>maven-plugin-tools-beanshell</artifactId>
 +               </dependency>
 +            </dependencies>
 +         </plugin>
@@ -33018,112 +32717,99 @@
 +   </build>
 +   <dependencies>
 +      <dependency>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>script-beanshell</artifactId>
 +         <version>2.0.4</version>
++         <groupId>org.apache.maven</groupId>
++         <artifactId>maven-script-beanshell</artifactId>
 +      </dependency>
 +   </dependencies>
 +   <dependencyManagement/>
 +</project>
 \ No newline at end of file
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-maven.pom.withoutxslt	2006-09-21 \
                18:41:38.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-maven.pom	2006-09-21 \
18:41:41.000000000 -0400 +--- \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-maven.pom.withoutxslt	2006-10-05 \
14:32:25.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-maven.pom	2006-10-05 \
14:32:28.000000000 -0400  @@ -1,10 +1,10 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
--   <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId>
                
--   <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId>
                
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>maven</artifactId>
 +   <version>2.0.4</version>
+    <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">org.apache.maven</groupId> +    \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">maven</artifactId>
                
     <packaging xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">pom</packaging>
     <name xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven</name>
 -   <version xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">2.0.2</version>  <description \
xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Maven is a project development \
management and comprehension tool. Based on the concept of a project object model: \
builds, dependency management, documentation creation, site publication, and \
distribution publication are all controlled from the declarative file. Maven can be \
extended by plugins to utilise a number of other development tools for reporting or \
                the build process.</description>
     <url xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://maven.apache.org/</url>
                
     <issueManagement xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-@@ -330,47 +330,47 @@
+@@ -330,48 +330,48 @@
     </build>
     <dependencies>
        <dependency>
--         <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId>
--         <artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId>
                
--         <version xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">3.8.1</version>
-+         <groupId>JPP</groupId>
-+         <artifactId>junit</artifactId>
 +         <version>3.8.1</version>
+          <groupId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</groupId> +          \
<artifactId xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">junit</artifactId> +-         \
<version xmlns="http://maven.apache.org/POM/4.0.0" \
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">3.8.1</version>
           <scope xmlns="http://maven.apache.org/POM/4.0.0" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test</scope>  </dependency>
     </dependencies>
     <dependencyManagement>
        <dependencies>
           <dependency>
--            <groupId>org.codehaus.plexus</groupId>
--            <artifactId>plexus-container-default</artifactId>
-+            <groupId>JPP/plexus</groupId>
-+            <artifactId>container-default</artifactId>
-             <version>1.0-alpha-9</version>
++            <version>1.0-alpha-9</version>
+             <groupId>org.codehaus.plexus</groupId>
+             <artifactId>plexus-container-default</artifactId>
+-            <version>1.0-alpha-9</version>
           </dependency>
           <dependency>
--            <groupId>org.codehaus.plexus</groupId>
--            <artifactId>plexus-utils</artifactId>
-+            <groupId>JPP/plexus</groupId>
-+            <artifactId>utils</artifactId>
-             <version>1.1</version>
++            <version>1.2</version>
+             <groupId>org.codehaus.plexus</groupId>
+             <artifactId>plexus-utils</artifactId>
+-            <version>1.1</version>
           </dependency>
           <dependency>
--            <groupId>org.apache.maven.wagon</groupId>
--            <artifactId>wagon-provider-api</artifactId>
-+            <groupId>JPP/maven-wagon</groupId>
-+            <artifactId>provider-api</artifactId>
-             <version>1.0-alpha-6</version>
++            <version>1.0-alpha-6</version>
+             <groupId>org.apache.maven.wagon</groupId>
+             <artifactId>wagon-provider-api</artifactId>
+-            <version>1.0-alpha-6</version>
           </dependency>
           <dependency>
--            <groupId>org.apache.maven.wagon</groupId>
--            <artifactId>wagon-ssh</artifactId>
-+            <groupId>JPP/maven-wagon</groupId>
-+            <artifactId>ssh</artifactId>
-             <version>1.0-alpha-6</version>
++            <version>1.0-alpha-6</version>
+             <groupId>org.apache.maven.wagon</groupId>
+             <artifactId>wagon-ssh</artifactId>
+-            <version>1.0-alpha-6</version>
           </dependency>
           <dependency>
--            <groupId>org.apache.maven.wagon</groupId>
--            <artifactId>wagon-ssh-external</artifactId>
-+            <groupId>JPP/maven-wagon</groupId>
-+            <artifactId>ssh-external</artifactId>
-             <version>1.0-alpha-6</version>
++            <version>1.0-alpha-6</version>
+             <groupId>org.apache.maven.wagon</groupId>
+             <artifactId>wagon-ssh-external</artifactId>
+-            <version>1.0-alpha-6</version>
           </dependency>
           <dependency>
--            <groupId>org.apache.maven.wagon</groupId>
--            <artifactId>wagon-file</artifactId>
-+            <groupId>JPP/maven-wagon</groupId>
-+            <artifactId>file</artifactId>
-             <version>1.0-alpha-6</version>
++            <version>1.0-alpha-6</version>
+             <groupId>org.apache.maven.wagon</groupId>
+             <artifactId>wagon-file</artifactId>
+-            <version>1.0-alpha-6</version>
           </dependency>
           <dependency>
--            <groupId>org.apache.maven.wagon</groupId>
--            <artifactId>wagon-http-lightweight</artifactId>
-+            <groupId>JPP/maven-wagon</groupId>
-+            <artifactId>http-lightweight</artifactId>
-             <version>1.0-alpha-6</version>
++            <version>1.0-alpha-6</version>
+             <groupId>org.apache.maven.wagon</groupId>
+             <artifactId>wagon-http-lightweight</artifactId>
+-            <version>1.0-alpha-6</version>
           </dependency>
        </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-api.pom.withoutxslt	2006-09-21 \
                18:41:26.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-api.pom	2006-09-21 \
                18:41:30.000000000 -0400
-@@ -1,21 +1,21 @@
+    </dependencyManagement>
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-api.pom.withoutxslt	2006-10-05 \
14:32:17.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-plugin-api.pom	2006-10-05 \
14:32:20.000000000 -0400 +@@ -1,23 +1,23 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>plugin-api</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
-+      <groupId>JPP/maven2</groupId>
++      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
        <artifactId>maven</artifactId>
 -      <version>2.0.2</version>
-+      <version>2.0.4</version>
     </parent>
--   <groupId>org.apache.maven</groupId>
--   <artifactId>maven-plugin-api</artifactId>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-plugin-api</artifactId>
     <name>Maven Plugin API</name>
 -   <version>2.0.2</version>
     <distributionManagement>
@@ -33132,121 +32818,108 @@
     <modelVersion>4.0.0</modelVersion>
     <dependencies>
        <dependency>
--         <groupId>junit</groupId>
-+         <groupId>JPP</groupId>
++         <version>3.8.1</version>
+          <groupId>junit</groupId>
           <artifactId>junit</artifactId>
-          <version>3.8.1</version>
+-         <version>3.8.1</version>
           <scope>test</scope>
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-model-v3.pom.withoutxslt	2006-09-21 \
                18:42:27.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-model-v3.pom	2006-09-21 \
                18:42:30.000000000 -0400
-@@ -1,15 +1,15 @@
+       </dependency>
+    </dependencies>
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-model-v3.pom.withoutxslt	2006-10-05 \
14:33:01.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-model-v3.pom	2006-10-05 \
14:33:04.000000000 -0400 +@@ -1,16 +1,16 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
--   <groupId>org.apache.maven</groupId>
--   <artifactId>maven-model-v3</artifactId>
--   <name>Maven Model v3</name>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>model-v3</artifactId>
-    <version>2.0</version>
-+   <name>Maven Model v3</name>
++   <version>2.0</version>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-model-v3</artifactId>
+    <name>Maven Model v3</name>
+-   <version>2.0</version>
     <description>Maven Model v3</description>
     <modelVersion>4.0.0</modelVersion>
     <dependencies>
        <dependency>
--         <groupId>org.codehaus.plexus</groupId>
--         <artifactId>plexus-utils</artifactId>
-+         <groupId>JPP/plexus</groupId>
-+         <artifactId>utils</artifactId>
-          <version>1.1</version>
++         <version>1.2</version>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-utils</artifactId>
+-         <version>1.1</version>
        </dependency>
     </dependencies>
---- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-artifact-manager.pom.withoutxslt	2006-09-21 \
                18:39:24.000000000 -0400
-+++ ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-artifact-manager.pom	2006-09-21 \
18:39:26.000000000 -0400 +    <dependencyManagement/>
+--- ./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-artifact-manager.pom.withoutxslt	2006-10-05 \
14:30:32.000000000 -0400 ++++ \
./m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-artifact-manager.pom	2006-10-05 \
14:30:36.000000000 -0400  @@ -1,14 +1,14 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project>
-+   <groupId>JPP/maven2</groupId>
-+   <artifactId>artifact-manager</artifactId>
 +   <version>2.0.4</version>
     <parent>
--      <groupId>org.apache.maven</groupId>
-+      <groupId>JPP/maven2</groupId>
++      <version>2.0.4</version>
+       <groupId>org.apache.maven</groupId>
        <artifactId>maven</artifactId>
 -      <version>2.0.2</version>
-+      <version>2.0.4</version>
     </parent>
--   <groupId>org.apache.maven</groupId>
--   <artifactId>maven-artifact-manager</artifactId>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-artifact-manager</artifactId>
     <name>Maven Artifact Manager</name>
 -   <version>2.0.2</version>
     <url>http://maven.apache.org</url>
     <distributionManagement>
        <status>deployed</status>
-@@ -16,33 +16,33 @@
+@@ -16,34 +16,34 @@
     <modelVersion>4.0.0</modelVersion>
     <dependencies>
        <dependency>
--         <groupId>org.apache.maven</groupId>
--         <artifactId>maven-repository-metadata</artifactId>
--         <version>2.0.2</version>
-+         <groupId>JPP/maven2</groupId>
-+         <artifactId>repository-metadata</artifactId>
 +         <version>2.0.4</version>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-repository-metadata</artifactId>
+-         <vers


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic