You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/07/16 09:11:13 UTC
svn commit: r677178 [3/3] - in /maven/sandbox/branches/SI_MAVEN_2_1_A: ./
maven-project/ maven-project/src/main/java/org/apache/maven/project/
maven-project/src/main/java/org/apache/maven/project/builder/
maven-project/src/main/java/org/apache/maven/pr...
Modified: maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?rev=677178&r1=677177&r2=677178&view=diff
==============================================================================
--- maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml (original)
+++ maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml Wed Jul 16 00:11:12 2008
@@ -76,11 +76,24 @@
</requirements>
</component>
<component>
+ <role>org.apache.maven.project.builder.ProjectBuilder</role>
+ <role-hint>default</role-hint>
+ <implementation>org.apache.maven.project.builder.impl.DefaultProjectBuilder</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
<role>org.apache.maven.project.MavenProjectBuilder</role>
<role-hint>test</role-hint>
<implementation>org.apache.maven.project.TestProjectBuilder</implementation>
<requirements>
<requirement>
+ <role>org.apache.maven.project.builder.ProjectBuilder</role>
+ </requirement>
+ <requirement>
<role>org.apache.maven.project.workspace.ProjectWorkspace</role>
</requirement>
<requirement>
Modified: maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml?rev=677178&r1=677177&r2=677178&view=diff
==============================================================================
--- maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml (original)
+++ maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml Wed Jul 16 00:11:12 2008
@@ -74,11 +74,24 @@
</requirements>
</component>
<component>
+ <role>org.apache.maven.project.builder.ProjectBuilder</role>
+ <role-hint>default</role-hint>
+ <implementation>org.apache.maven.project.builder.impl.DefaultProjectBuilder</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
<role>org.apache.maven.project.MavenProjectBuilder</role>
<role-hint>test</role-hint>
<implementation>org.apache.maven.project.TestProjectBuilder</implementation>
<requirements>
<requirement>
+ <role>org.apache.maven.project.builder.ProjectBuilder</role>
+ </requirement>
+ <requirement>
<role>org.apache.maven.project.workspace.ProjectWorkspace</role>
</requirement>
<requirement>
Modified: maven/sandbox/branches/SI_MAVEN_2_1_A/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1_A/pom.xml?rev=677178&r1=677177&r2=677178&view=diff
==============================================================================
--- maven/sandbox/branches/SI_MAVEN_2_1_A/pom.xml (original)
+++ maven/sandbox/branches/SI_MAVEN_2_1_A/pom.xml Wed Jul 16 00:11:12 2008
@@ -255,6 +255,8 @@
<plexusInterpolationVersion>1.0</plexusInterpolationVersion>
<plexusUtilsVersion>1.5.4</plexusUtilsVersion>
<wagonVersion>1.0-beta-3</wagonVersion>
+ <mavenSharedModelVersion>1.0-SNAPSHOT</mavenSharedModelVersion>
+ <woodstoxVersion>3.2.6</woodstoxVersion>
</properties>
<!--start-->
@@ -409,6 +411,17 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- New Model Parser -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>${woodstoxVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-model</artifactId>
+ <version>${mavenSharedModelVersion}</version>
+ </dependency>
<!-- Needed for backward compat aspect. -->
<dependency>
<groupId>aspectj</groupId>