incubator-mrunit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1188775 - in /incubator/mrunit/trunk: ./ pom.xml
Date Tue, 25 Oct 2011 16:39:40 GMT
Author: brock
Date: Tue Oct 25 16:39:40 2011
New Revision: 1188775

URL: http://svn.apache.org/viewvc?rev=1188775&view=rev
Log:
Merged 1188763 from 0.5.0 (fixed MRUNIT-33: maven assembly fails with no assembly descriptors
found)

Modified:
    incubator/mrunit/trunk/   (props changed)
    incubator/mrunit/trunk/pom.xml

Propchange: incubator/mrunit/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 25 16:39:40 2011
@@ -1,2 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/mrunit:713112
 /hadoop/core/trunk/src/contrib/mrunit:776175-786373
+/incubator/mrunit/branches/mrunit-0.5.0:1188763

Modified: incubator/mrunit/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/pom.xml?rev=1188775&r1=1188774&r2=1188775&view=diff
==============================================================================
--- incubator/mrunit/trunk/pom.xml (original)
+++ incubator/mrunit/trunk/pom.xml Tue Oct 25 16:39:40 2011
@@ -137,13 +137,13 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>2.2.1</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/dist.xml</descriptor>
+          </descriptors>
+        </configuration>
         <executions>
           <execution>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/dist.xml</descriptor>
-              </descriptors>
-            </configuration>
             <phase>package</phase>
             <goals>
               <goal>single</goal>



Mime
View raw message