Author: sisbell
Date: Mon Apr 13 19:41:38 2009
New Revision: 764582
URL: http://svn.apache.org/viewvc?rev=764582&view=rev
Log:
Removed model-builder dependency.
Added:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java
Modified:
maven/components/trunk/maven-project-builder/pom.xml
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BuildProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java
maven/components/trunk/pom.xml
Modified: maven/components/trunk/maven-project-builder/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/pom.xml?rev=764582&r1=764581&r2=764582&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/pom.xml (original)
+++ maven/components/trunk/maven-project-builder/pom.xml Mon Apr 13 19:41:38
2009
@@ -23,10 +23,6 @@
<name>Maven Project Builder</name>
<dependencies>
<dependency>
- <groupId>org.sonatype.spice</groupId>
- <artifactId>model-builder</artifactId>
- </dependency>
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
@@ -35,6 +31,14 @@
<artifactId>maven-model</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BuildProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BuildProcessor.java?rev=764582&r1=764581&r2=764582&view=diff
==============================================================================
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BuildProcessor.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BuildProcessor.java
Mon Apr 13 19:41:38 2009
@@ -30,7 +30,6 @@
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.Resource;
-import org.apache.maven.shared.model.ModelEventListener;
public class BuildProcessor
extends BaseProcessor
Added:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java?rev=764582&view=auto
==============================================================================
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java
(added)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java
Mon Apr 13 19:41:38 2009
@@ -0,0 +1,11 @@
+package org.apache.maven.project.builder;
+
+import java.util.List;
+import java.util.Collection;
+
+public interface ModelEventListener {
+
+ List<String> getUris();
+
+}
+
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java?rev=764582&r1=764581&r2=764582&view=diff
==============================================================================
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java
Mon Apr 13 19:41:38 2009
@@ -20,11 +20,8 @@
*/
import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.Writer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -45,18 +42,13 @@
import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.Profile;
import org.apache.maven.model.Resource;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.project.builder.PomClassicDomainModel;
import org.apache.maven.project.builder.ProjectUri;
import org.apache.maven.project.builder.interpolator.DomainModel;
import org.apache.maven.project.builder.interpolator.InterpolatorProperty;
import org.apache.maven.project.builder.interpolator.ModelProperty;
import org.apache.maven.project.builder.interpolator.PomInterpolatorTag;
-import org.apache.maven.shared.model.ModelEventListener;
-import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
public class ProcessorContext
{
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=764582&r1=764581&r2=764582&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Mon Apr 13 19:41:38 2009
@@ -69,6 +69,7 @@
<woodstoxVersion>3.2.6</woodstoxVersion>
<modelloVersion>1.0.1</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
+ <staxVersion>1.0.1</staxVersion>
</properties>
<issueManagement>
<system>jira</system>
@@ -424,6 +425,11 @@
<artifactId>wstx-asl</artifactId>
<version>${woodstoxVersion}</version>
</dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${staxVersion}</version>
+ </dependency>
<!-- Commons -->
<dependency>
<groupId>commons-cli</groupId>
