Author: jvanzyl
Date: Wed Apr 29 04:45:20 2009
New Revision: 769652
URL: http://svn.apache.org/viewvc?rev=769652&view=rev
Log:
o collapsing maven-project into the core, it is now useless to anyone except
maven, the maven-model-builder is now something that can be consumed by the
outside world
Added:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/
(props changed)
- copied from r769578,
maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/profiles/
(props changed)
- copied from r769578,
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/profiles/
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
(props changed)
- copied unchanged from r769578,
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
(props changed)
- copied unchanged from r769578,
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
(props changed)
- copied unchanged from r769578,
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ModelUtilsTest.java
(props changed)
- copied unchanged from r769578,
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
(props changed)
- copied unchanged from r769578,
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java
(props changed)
- copied unchanged from r769578,
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
(props changed)
- copied unchanged from r769578,
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
(props changed)
- copied unchanged from r769578,
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java
(props changed)
- copied unchanged from r769578,
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/
(props changed)
- copied from r769578,
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/artifact/
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/canonical/
(props changed)
- copied from r769578,
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/canonical/
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/
(props changed)
- copied from r769578,
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/inheritance/
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/validation/
(props changed)
- copied from r769578,
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/validation/
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/projectp
(props changed)
- copied unchanged from r769578,
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java
Removed:
maven/components/branches/MNG-2766/maven-project/
Modified:
maven/components/branches/MNG-2766/apache-maven/pom.xml
maven/components/branches/MNG-2766/maven-core/pom.xml
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
maven/components/branches/MNG-2766/maven-embedder/pom.xml
maven/components/branches/MNG-2766/pom.xml
Modified: maven/components/branches/MNG-2766/apache-maven/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/apache-maven/pom.xml?rev=769652&r1=769651&r2=769652&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/apache-maven/pom.xml (original)
+++ maven/components/branches/MNG-2766/apache-maven/pom.xml Wed Apr 29 04:45:20
2009
@@ -39,10 +39,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-toolchain</artifactId>
</dependency>
<dependency>
Modified: maven/components/branches/MNG-2766/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/pom.xml?rev=769652&r1=769651&r2=769652&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/pom.xml (original)
+++ maven/components/branches/MNG-2766/maven-core/pom.xml Wed Apr 29 04:45:20
2009
@@ -32,11 +32,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- </dependency>
+ <artifactId>maven-repository</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Propchange:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 29 04:45:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/main/java/org/apache/maven/project:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project:738757-738972
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project:751453-767358,767708-768832
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/profiles/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 29 04:45:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/java/org/apache/maven/profiles:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/profiles:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/profiles:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/profiles:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/profiles:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/profiles:738757-738972
+/maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles:751453-767358,767708-768832
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.21
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 29 04:45:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:738757-738972
+/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:751453-767358,767708-768832
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 29 04:45:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:738757-738972
+/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:751453-767358,767708-768832
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 29 04:45:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:738757-738972
+/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:751453-767358,767708-768832
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ModelUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ModelUtilsTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ModelUtilsTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 29 04:45:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java:738757-738972
+/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java:751453-767358,767708-768832
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 29 04:45:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:738757-738972
+/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:751453-767358,767708-768832
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 29 04:45:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:738757-738972
+/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:751453-767358,767708-768832
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.9
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 29 04:45:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:738757-738972
+/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:751453-767358,767708-768832
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 29 04:45:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:738757-738972
+/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:751453-767358,767708-768832
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 29 04:45:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java:738757-738972
+/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java:751453-767358,767708-768832
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 29 04:45:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/java/org/apache/maven/project/artifact:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/artifact:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/artifact:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/artifact:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/artifact:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/artifact:738757-738972
+/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact:751453-767358,767708-768832
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/canonical/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 29 04:45:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/java/org/apache/maven/project/canonical:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/canonical:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/canonical:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/canonical:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/canonical:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/canonical:738757-738972
+/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical:751453-767358,767708-768832
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java?rev=769652&r1=769651&r2=769652&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
Wed Apr 29 04:45:20 2009
@@ -26,12 +26,11 @@
import org.apache.commons.jxpath.JXPathNotFoundException;
import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
import org.apache.maven.model.PomClassicDomainModel;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
public class PomTestWrapper
{
+
private PomClassicDomainModel domainModel;
private File pomFile;
@@ -60,11 +59,7 @@
}
this.domainModel = domainModel;
this.pomFile = pomFile;
- try {
- context = JXPathContext.newContext( new
MavenXpp3Reader().read(domainModel.getInputStream()));
- } catch (XmlPullParserException e) {
- throw new IOException(e.getMessage());
- }
+ context = JXPathContext.newContext( domainModel.getModel());
}
public PomTestWrapper( File pomFile, MavenProject mavenProject )
@@ -99,11 +94,7 @@
}
this.domainModel = new PomClassicDomainModel( file );
- try {
- context = JXPathContext.newContext( new
MavenXpp3Reader().read(domainModel.getInputStream()));
- } catch (XmlPullParserException e) {
- throw new IOException(e.getMessage());
- }
+ context = JXPathContext.newContext( domainModel.getModel() );
}
public MavenProject getMavenProject()
@@ -112,11 +103,9 @@
}
public PomClassicDomainModel getDomainModel()
- {
+ throws IOException {
if ( domainModel == null && mavenProject != null )
{
- try
- {
domainModel = new PomClassicDomainModel(
mavenProject.getModel() );
int lineageCount = 1;
for ( MavenProject parent = mavenProject.getParent(); parent
!= null; parent = parent.getParent() )
@@ -124,11 +113,6 @@
lineageCount++;
}
domainModel.setLineageCount( lineageCount );
- }
- catch ( IOException e )
- {
-
- }
}
return this.domainModel;
@@ -144,6 +128,20 @@
context.setValue( expression, value );
}
+ /*
+ public int containerCountForUri( String uri )
+ throws IOException
+ {
+ if ( uri == null || uri.trim().equals( "" ) )
+ {
+ throw new IllegalArgumentException( "uri: null or empty" );
+ }
+ ModelDataSource source = new DefaultModelDataSource();
+ source.init( domainModel.getModelProperties(), null );
+ return source.queryFor( uri ).size();
+ }
+ */
+
public Iterator<?> getIteratorForXPathExpression( String expression )
{
return context.iterate( expression );
@@ -170,4 +168,5 @@
{
return context.getValue( expression ) != null && context.getValue(
expression ).equals( value );
}
+
}
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 29 04:45:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/java/org/apache/maven/project/inheritance:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/inheritance:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/inheritance:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/inheritance:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/inheritance:738757-738972
+/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance:751453-767358,767708-768832
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/validation/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 29 04:45:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/java/org/apache/maven/project/validation:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/validation:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/validation:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/validation:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/validation:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/validation:738757-738972
+/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation:751453-767358,767708-768832
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/projectp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/projectp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/projectp
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 29 04:45:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:738757-738972
+/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:751453-767358,767708-768832
Modified: maven/components/branches/MNG-2766/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/pom.xml?rev=769652&r1=769651&r2=769652&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/pom.xml (original)
+++ maven/components/branches/MNG-2766/maven-embedder/pom.xml Wed Apr 29
04:45:20 2009
@@ -30,10 +30,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-toolchain</artifactId>
</dependency>
<dependency>
Modified: maven/components/branches/MNG-2766/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/pom.xml?rev=769652&r1=769651&r2=769652&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/pom.xml (original)
+++ maven/components/branches/MNG-2766/pom.xml Wed Apr 29 04:45:20 2009
@@ -155,7 +155,6 @@
<module>apache-maven</module>
<module>maven-model</module>
<module>maven-plugin-api</module>
- <module>maven-project</module>
<module>maven-model-builder</module>
<module>maven-embedder</module>
<module>maven-toolchain</module>
@@ -207,11 +206,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${project.version}</version>
</dependency>
