Author: brett
Date: Wed Jun 18 09:56:56 2008
New Revision: 669222
URL: http://svn.apache.org/viewvc?rev=669222&view=rev
Log:
adjust the embedder tests:
- remove a number of downloads from central that were slowing the build
significantly
- ensure the tests will run with a repo manager and no central access
- ensure the tests will run offline if the local repository is populated
The technique for populating the repository is very hacky. We really need the
tests to be doing this themselves. Perhaps moving these IT-like tests into the
IT section and alongside the core ITs is the way to go - but this is a start.
Added:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/local-repo/
- copied from r669205,
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/local-repo/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/local-repo/
- copied from r668880,
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/interp-from-project/local-repo/
Removed:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/local-repo/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/interp-from-project/local-repo/
Modified:
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/aggregate-mojo-failure/plugin/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-build-plan/plugin/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-dep-ver-maven-plugin/1/bad-ext-plugin-dep-ver-maven-plugin-1.pom
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-maven-ver-maven-plugin/1/bad-ext-plugin-maven-ver-maven-plugin-1.pom
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/duplicated-attachments/plugin/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/local-repo/org/apache/maven/errortest/err-loading-plugin-maven-plugin/1/err-loading-plugin-maven-plugin-1.pom
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/err-resolving-ext-plugin-maven-plugin/1/err-resolving-ext-plugin-maven-plugin-1.pom
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/local-repo/org/apache/maven/errortest/ext-plugin-artifact-missing-maven-plugin/1/ext-plugin-artifact-missing-maven-plugin-1.pom
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/local-repo/org/apache/maven/errortest/ext-plugin-version-err-maven-plugin/1/ext-plugin-version-err-maven-plugin-1.pom
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/missing-direct-invoke-mojo/plugin/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/EmbedderUsingEclipsePluginTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/EmbedderUsingScmPluginTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
maven/components/trunk/maven-embedder/src/test/plugin-version-references/jar-pom.xml
maven/components/trunk/maven-embedder/src/test/plugin-version-references/maven-plugin-pom.xml
maven/components/trunk/maven-embedder/src/test/resources/pom2.xml
Modified: maven/components/trunk/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Wed Jun 18 09:56:56 2008
@@ -106,6 +106,40 @@
</execution>
</executions>
</plugin>
+
+ <!-- These aren't used by the build, but need to be in the local
repository for
+ some tests to work offline. Look to improve them.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.3</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.2</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.2</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <version>1.0</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.3</version>
+ <extensions>true</extensions>
+ </plugin>
</plugins>
</build>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/aggregate-mojo-failure/plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/aggregate-mojo-failure/plugin/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/aggregate-mojo-failure/plugin/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/aggregate-mojo-failure/plugin/pom.xml
Wed Jun 18 09:56:56 2008
@@ -17,7 +17,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-build-plan/plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-build-plan/plugin/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-build-plan/plugin/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-build-plan/plugin/pom.xml
Wed Jun 18 09:56:56 2008
@@ -17,7 +17,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-dep-ver-maven-plugin/1/bad-ext-plugin-dep-ver-maven-plugin-1.pom
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-dep-ver-maven-plugin/1/bad-ext-plugin-dep-ver-maven-plugin-1.pom?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-dep-ver-maven-plugin/1/bad-ext-plugin-dep-ver-maven-plugin-1.pom
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-dep-ver-maven-plugin/1/bad-ext-plugin-dep-ver-maven-plugin-1.pom
Wed Jun 18 09:56:56 2008
@@ -23,7 +23,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml
Wed Jun 18 09:56:56 2008
@@ -25,7 +25,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-maven-ver-maven-plugin/1/bad-ext-plugin-maven-ver-maven-plugin-1.pom
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-maven-ver-maven-plugin/1/bad-ext-plugin-maven-ver-maven-plugin-1.pom?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-maven-ver-maven-plugin/1/bad-ext-plugin-maven-ver-maven-plugin-1.pom
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-maven-ver-maven-plugin/1/bad-ext-plugin-maven-ver-maven-plugin-1.pom
Wed Jun 18 09:56:56 2008
@@ -22,7 +22,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml
Wed Jun 18 09:56:56 2008
@@ -25,7 +25,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/pom.xml
Wed Jun 18 09:56:56 2008
@@ -17,7 +17,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/duplicated-attachments/plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/duplicated-attachments/plugin/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/duplicated-attachments/plugin/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/duplicated-attachments/plugin/pom.xml
Wed Jun 18 09:56:56 2008
@@ -22,7 +22,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/local-repo/org/apache/maven/errortest/err-loading-plugin-maven-plugin/1/err-loading-plugin-maven-plugin-1.pom
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/local-repo/org/apache/maven/errortest/err-loading-plugin-maven-plugin/1/err-loading-plugin-maven-plugin-1.pom?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/local-repo/org/apache/maven/errortest/err-loading-plugin-maven-plugin/1/err-loading-plugin-maven-plugin-1.pom
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/local-repo/org/apache/maven/errortest/err-loading-plugin-maven-plugin/1/err-loading-plugin-maven-plugin-1.pom
Wed Jun 18 09:56:56 2008
@@ -23,7 +23,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/err-resolving-ext-plugin-maven-plugin/1/err-resolving-ext-plugin-maven-plugin-1.pom
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/err-resolving-ext-plugin-maven-plugin/1/err-resolving-ext-plugin-maven-plugin-1.pom?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/err-resolving-ext-plugin-maven-plugin/1/err-resolving-ext-plugin-maven-plugin-1.pom
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/err-resolving-ext-plugin-maven-plugin/1/err-resolving-ext-plugin-maven-plugin-1.pom
Wed Jun 18 09:56:56 2008
@@ -28,7 +28,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml
Wed Jun 18 09:56:56 2008
@@ -18,4 +18,10 @@
</dependency>
</dependencies>
+ <repositories>
+ <repository>
+ <id>repo</id>
+ <url>file://localhost/${basedir}/local-repo</url>
+ </repository>
+ </repositories>
</project>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/local-repo/org/apache/maven/errortest/ext-plugin-artifact-missing-maven-plugin/1/ext-plugin-artifact-missing-maven-plugin-1.pom
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/local-repo/org/apache/maven/errortest/ext-plugin-artifact-missing-maven-plugin/1/ext-plugin-artifact-missing-maven-plugin-1.pom?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/local-repo/org/apache/maven/errortest/ext-plugin-artifact-missing-maven-plugin/1/ext-plugin-artifact-missing-maven-plugin-1.pom
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/local-repo/org/apache/maven/errortest/ext-plugin-artifact-missing-maven-plugin/1/ext-plugin-artifact-missing-maven-plugin-1.pom
Wed Jun 18 09:56:56 2008
@@ -23,7 +23,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/pom.xml
Wed Jun 18 09:56:56 2008
@@ -17,7 +17,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
@@ -46,4 +46,4 @@
</plugins>
</pluginManagement>
</build>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/local-repo/org/apache/maven/errortest/ext-plugin-version-err-maven-plugin/1/ext-plugin-version-err-maven-plugin-1.pom
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/local-repo/org/apache/maven/errortest/ext-plugin-version-err-maven-plugin/1/ext-plugin-version-err-maven-plugin-1.pom?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/local-repo/org/apache/maven/errortest/ext-plugin-version-err-maven-plugin/1/ext-plugin-version-err-maven-plugin-1.pom
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/local-repo/org/apache/maven/errortest/ext-plugin-version-err-maven-plugin/1/ext-plugin-version-err-maven-plugin-1.pom
Wed Jun 18 09:56:56 2008
@@ -18,7 +18,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml
Wed Jun 18 09:56:56 2008
@@ -25,7 +25,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml
Wed Jun 18 09:56:56 2008
@@ -10,7 +10,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml
Wed Jun 18 09:56:56 2008
@@ -13,4 +13,10 @@
</dependency>
</dependencies>
+ <repositories>
+ <repository>
+ <id>repo</id>
+ <url>file://localhost/${basedir}/local-repo</url>
+ </repository>
+ </repositories>
</project>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/missing-direct-invoke-mojo/plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/missing-direct-invoke-mojo/plugin/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/missing-direct-invoke-mojo/plugin/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/missing-direct-invoke-mojo/plugin/pom.xml
Wed Jun 18 09:56:56 2008
@@ -17,7 +17,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/pom.xml
Wed Jun 18 09:56:56 2008
@@ -17,7 +17,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml
Wed Jun 18 09:56:56 2008
@@ -17,7 +17,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/pom.xml
Wed Jun 18 09:56:56 2008
@@ -17,7 +17,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/pom.xml
Wed Jun 18 09:56:56 2008
@@ -22,7 +22,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml
Wed Jun 18 09:56:56 2008
@@ -10,7 +10,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
(original)
+++
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
Wed Jun 18 09:56:56 2008
@@ -19,6 +19,8 @@
* under the License.
*/
+import java.io.File;
+
import org.codehaus.plexus.PlexusTestCase;
public abstract class AbstractEmbedderTestCase
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
(original)
+++
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
Wed Jun 18 09:56:56 2008
@@ -1,5 +1,24 @@
package org.apache.maven.embedder;
+/*
+ * 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.
+ */
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/EmbedderUsingEclipsePluginTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/EmbedderUsingEclipsePluginTest.java?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/EmbedderUsingEclipsePluginTest.java
(original)
+++
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/EmbedderUsingEclipsePluginTest.java
Wed Jun 18 09:56:56 2008
@@ -33,7 +33,7 @@
public void testRunningEclipsePlugin()
throws Exception
{
- File basedir = runWithProject( "eclipse:eclipse" );
+ File basedir = runWithProject(
"org.apache.maven.plugins:maven-eclipse-plugin:2.3:eclipse" );
assertFileExists( new File( basedir, ".classpath" ) );
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/EmbedderUsingScmPluginTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/EmbedderUsingScmPluginTest.java?rev=669222&r1=669221&r2=669222&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/EmbedderUsingScmPluginTest.java
(original)
+++
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/EmbedderUsingScmPluginTest.java
Wed Jun 18 09:56:56 2008
@@ -46,7 +46,7 @@
p.setProperty( "connectionUrl",
"scm:svn:http://svn.apache.org/repos/asf/maven/components/trunk/maven-embedder";
);
- File basedir = runWithProject( "scm:diff", p );
+ File basedir = runWithProject(
"org.apache.maven.plugins:maven-scm-plugin:1.0:diff", p );
}
}
}
