You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2010/04/07 11:41:48 UTC

svn commit: r931480 - in /jackrabbit/branches/2.1: ./ jackrabbit-jcr-servlet/ jackrabbit-spi2dav/assembly.xml jackrabbit-spi2dav/pom.xml

Author: jukka
Date: Wed Apr  7 09:41:48 2010
New Revision: 931480

URL: http://svn.apache.org/viewvc?rev=931480&view=rev
Log:
2.1: Merged revision 931479 (JCR-2567)

Added:
    jackrabbit/branches/2.1/jackrabbit-spi2dav/assembly.xml
      - copied unchanged from r931479, jackrabbit/trunk/jackrabbit-spi2dav/assembly.xml
Modified:
    jackrabbit/branches/2.1/   (props changed)
    jackrabbit/branches/2.1/jackrabbit-jcr-servlet/   (props changed)
    jackrabbit/branches/2.1/jackrabbit-spi2dav/pom.xml

Propchange: jackrabbit/branches/2.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr  7 09:41:48 2010
@@ -2,3 +2,4 @@
 /jackrabbit/sandbox/JCR-1456:774917-886178
 /jackrabbit/sandbox/JCR-2170:812417-816332
 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863
+/jackrabbit/trunk:931479

Propchange: jackrabbit/branches/2.1/jackrabbit-jcr-servlet/
            ('svn:mergeinfo' removed)

Modified: jackrabbit/branches/2.1/jackrabbit-spi2dav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.1/jackrabbit-spi2dav/pom.xml?rev=931480&r1=931479&r2=931480&view=diff
==============================================================================
--- jackrabbit/branches/2.1/jackrabbit-spi2dav/pom.xml (original)
+++ jackrabbit/branches/2.1/jackrabbit-spi2dav/pom.xml Wed Apr  7 09:41:48 2010
@@ -110,6 +110,22 @@
           </systemProperties>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>assembly.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>