[MRM-688] clean up dependencies included

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@641707 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-web/archiva-standalone/archiva-jetty/pom.xml b/archiva-web/archiva-standalone/archiva-jetty/pom.xml
index d2e4b189534f2c8250d516bfe97f262ce390ab62..41e0fc696319316b0e7fa1185773393d183a04fb 100644 (file)
--- a/archiva-web/archiva-standalone/archiva-jetty/pom.xml
+++ b/archiva-web/archiva-standalone/archiva-jetty/pom.xml
@@ -7,10 +7,8 @@
     <version>1.1-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-jetty</artifactId>
-<!-- Bug in appassembler prevents using a purely attached assembly
   <packaging>pom</packaging>
--->
-  <name>Archiva Web ::  Jetty</name>
+  <name>Archiva Web :: Jetty</name>
   <dependencies>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
@@ -81,24 +79,36 @@
       <artifactId>commons-el</artifactId>
       <version>1.0</version>
       <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>tomcat</groupId>
       <artifactId>jasper-compiler</artifactId>
       <version>5.5.15</version>
       <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jsp-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>    
-    <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>jasper-compiler-jdt</artifactId>
-      <version>5.5.15</version>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>tomcat</groupId>
       <artifactId>jasper-runtime</artifactId>
       <version>5.5.15</version>
       <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -112,18 +122,6 @@
       <version>1.0.1</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.6.2</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xmlParserAPIs</artifactId>
-      <version>2.6.2</version>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml b/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
index ccd920d5d10233d0cbc11f28a4df0a76d3aa2a3b..4a166ac27c321141d19a385bfb993b8dfe3f0689 100644 (file)
--- a/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
+++ b/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
@@ -32,36 +32,16 @@
       <directory>target/generated-resources/appassembler/jsw/archiva/conf</directory>
       <outputDirectory>conf</outputDirectory>
     </fileSet>
-    <fileSet>
-      <directory>target/generated-resources/appassembler/jsw/archiva/repo</directory>
-      <outputDirectory>repo</outputDirectory>
-      <includes>
-       <include>jetty-6.1.6.jar</include>
-       <include>start-6.1.6.jar</include>
-       <include>jetty-naming-6.1.6.jar</include>
-       <include>jetty-util-6.1.6.jar</include>
-       <include>jetty-plus-6.1.6.jar</include>
-       <include>servlet-api-2.5-6.1.6.jar</include>
-       <include>jsp-api-2.0-6.1.6.jar</include>        
-       <include>derby-10.1.3.1.jar</include>
-       <include>mail-1.4.jar</include>
-       <include>ant-1.6.5.jar</include>
-       <include>commons-el-1.0.jar</include>
-       <include>jasper-compiler-5.5.15.jar</include>
-       <include>jasper-compiler-jdt-5.5.15.jar</include>
-       <include>jasper-runtime-5.5.15.jar</include>
-       <include>jcl104-over-slf4j-1.0.1.jar</include>
-       <include>slf4j-simple-1.0.1.jar</include>
-       <include>xercesImpl-2.6.2.jar</include>
-       <include>xmlParserAPIs-2.6.2.jar</include>
-      </includes>
-      <fileMode>0755</fileMode>
-    </fileSet> 
     <fileSet>
       <directory>target/generated-resources/appassembler/jsw/archiva/lib</directory>
       <outputDirectory>lib</outputDirectory>
+      <excludes>
+        <!-- avoid what is pulled in by the appassembler plugin, and the archiva dependencies -->
+        <exclude>archiva-*</exclude>
+        <exclude>maven-metadata-appassembler.xml</exclude>
+      </excludes>
       <fileMode>0755</fileMode>
-    </fileSet>   
+    </fileSet> 
     <fileSet>
       <directory>target/generated-resources/appassembler/jsw/archiva/logs</directory>
       <outputDirectory>logs</outputDirectory>