Author: bentmann
Date: Tue Dec 16 02:30:13 2008
New Revision: 727010
URL: http://svn.apache.org/viewvc?rev=727010&view=rev
Log:
o Added a unit test to smoke check the settings.xml shipped with the distro
(merged from r727007)
Added:
maven/components/branches/maven-2.1.x/apache-maven/src/test/
- copied from r727007,
maven/components/branches/maven-2.0.x/apache-maven/src/test/
maven/components/branches/maven-2.1.x/apache-maven/src/test/java/
- copied from r727007,
maven/components/branches/maven-2.0.x/apache-maven/src/test/java/
maven/components/branches/maven-2.1.x/apache-maven/src/test/java/org/
- copied from r727007,
maven/components/branches/maven-2.0.x/apache-maven/src/test/java/org/
maven/components/branches/maven-2.1.x/apache-maven/src/test/java/org/apache/
- copied from r727007,
maven/components/branches/maven-2.0.x/apache-maven/src/test/java/org/apache/
maven/components/branches/maven-2.1.x/apache-maven/src/test/java/org/apache/maven/
- copied from r727007,
maven/components/branches/maven-2.0.x/apache-maven/src/test/java/org/apache/maven/
maven/components/branches/maven-2.1.x/apache-maven/src/test/java/org/apache/maven/settings/
- copied from r727007,
maven/components/branches/maven-2.0.x/apache-maven/src/test/java/org/apache/maven/settings/
maven/components/branches/maven-2.1.x/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
- copied unchanged from r727007,
maven/components/branches/maven-2.0.x/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
Modified:
maven/components/branches/maven-2.1.x/ (props changed)
maven/components/branches/maven-2.1.x/apache-maven/pom.xml
Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 16 02:30:13 2008
@@ -1,5 +1,5 @@
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,720697,725329-725330,725342,725349,725359,726876-726881
-/maven/components/branches/maven-2.0.x:679552-679867,709032,709208,709241,720042,725949,726244,726417,726541,726885
+/maven/components/branches/maven-2.0.x:679552-679867,709032,709208,709241,720042,725949,726244,726417,726541,726885,727007
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990
-/maven/components/trunk:720001,721902
+/maven/components/trunk:720001,721902,726845
Modified: maven/components/branches/maven-2.1.x/apache-maven/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/apache-maven/pom.xml?rev=727010&r1=727009&r2=727010&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/apache-maven/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/apache-maven/pom.xml Tue Dec 16
02:30:13 2008
@@ -40,6 +40,17 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>basedir</name>
+ <value>${basedir}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>1.2-SNAPSHOT</version>
<executions>
