svn commit: r450765 [2/2] - in /maven/archiva/trunk: ./ archiva-plexus-application/ archiva-plexus-runtime/ archiva-security/ archiva-security/src/ archiva-security/src/main/ archiva-security/src/main/java/ archiva-security/src/main/java/org/ archiva-s...

[brett]

Modified: maven/archiva/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?view=diff&rev=450765&r1=450764&r2=450765
==============================================================================
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Thu Sep 28 01:55:32 2006
@@ -82,6 +82,7 @@
           <execution>
             <goals>
               <goal>descriptor</goal>
+              <goal>merge-descriptors</goal>
             </goals>
           </execution>
         </executions>
@@ -130,6 +131,7 @@
     <module>archiva-repository-layer</module>
     <module>archiva-plexus-application</module>
     <module>archiva-plexus-runtime</module>
+    <module>archiva-security</module>
   </modules>
   <dependencies>
     <dependency>
@@ -239,6 +241,11 @@
       <dependency>
         <groupId>org.apache.maven.archiva</groupId>
         <artifactId>archiva-applet</artifactId>
+        <version>${pom.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.archiva</groupId>
+        <artifactId>archiva-security</artifactId>
         <version>${pom.version}</version>
       </dependency>
       <dependency>