From e96229a165da69015e77cb6997d3f051349d046f Mon Sep 17 00:00:00 2001
From: Britton Isbell <sisbell@apache.org>
Date: Mon, 20 Oct 2008 11:06:03 +0000
Subject: [PATCH] Reverting back changes. It's building locally but breaking on
 Hudson.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@706231 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-core/pom.xml                            |  4 --
 maven-project-builder/pom.xml                 | 41 -------------------
 maven-project/pom.xml                         |  4 --
 .../ArtifactModelContainerFactory.java        |  0
 .../builder/IdModelContainerFactory.java      |  0
 .../project/builder/PomInterpolatorTag.java   |  0
 .../maven/project/builder/ProjectUri.java     |  0
 pom.xml                                       |  6 ---
 8 files changed, 55 deletions(-)
 delete mode 100644 maven-project-builder/pom.xml
 rename {maven-project-builder => maven-project}/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java (100%)
 rename {maven-project-builder => maven-project}/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java (100%)
 rename {maven-project-builder => maven-project}/src/main/java/org/apache/maven/project/builder/PomInterpolatorTag.java (100%)
 rename {maven-project-builder => maven-project}/src/main/java/org/apache/maven/project/builder/ProjectUri.java (100%)

diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index b10781d134..8856256ddc 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -31,10 +31,6 @@ under the License.
   <artifactId>maven-core</artifactId>
   <name>Maven Core</name>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project-builder</artifactId>
-    </dependency>      
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-lifecycle</artifactId>
diff --git a/maven-project-builder/pom.xml b/maven-project-builder/pom.xml
deleted file mode 100644
index 8c5d478076..0000000000
--- a/maven-project-builder/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>3.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.maven</groupId>    
-  <artifactId>maven-project-builder</artifactId>
-  <version>3.0-SNAPSHOT</version>
-  <name>Maven Project Builder</name>
-  <dependencies>
-  	<dependency>
-  		<groupId>org.apache.maven.shared</groupId>
-  		<artifactId>maven-shared-model</artifactId>
-  		<version>1.0-SNAPSHOT</version>
-  	</dependency>
-  </dependencies>
-</project>
diff --git a/maven-project/pom.xml b/maven-project/pom.xml
index 1b43b10a9e..f13a39f4c1 100644
--- a/maven-project/pom.xml
+++ b/maven-project/pom.xml
@@ -36,10 +36,6 @@ under the License.
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project-builder</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
diff --git a/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java b/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
similarity index 100%
rename from maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
rename to maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
diff --git a/maven-project-builder/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java b/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
similarity index 100%
rename from maven-project-builder/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
rename to maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
diff --git a/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomInterpolatorTag.java b/maven-project/src/main/java/org/apache/maven/project/builder/PomInterpolatorTag.java
similarity index 100%
rename from maven-project-builder/src/main/java/org/apache/maven/project/builder/PomInterpolatorTag.java
rename to maven-project/src/main/java/org/apache/maven/project/builder/PomInterpolatorTag.java
diff --git a/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java b/maven-project/src/main/java/org/apache/maven/project/builder/ProjectUri.java
similarity index 100%
rename from maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
rename to maven-project/src/main/java/org/apache/maven/project/builder/ProjectUri.java
diff --git a/pom.xml b/pom.xml
index 68a28d1b10..103ef69e30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -266,7 +266,6 @@
     <module>maven-model</module>
     <module>maven-plugin-api</module>
     <module>maven-project</module>
-    <module>maven-project-builder</module>      
     <module>maven-reporting-api</module>
     <module>maven-embedder</module>
     <module>maven-shared-model</module>
@@ -329,11 +328,6 @@
         <artifactId>maven-project</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-project-builder</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-api</artifactId>