You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2008/03/27 06:13:13 UTC
svn commit: r641707 - in
/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty: pom.xml
src/main/assembly/bin.xml
Author: brett
Date: Wed Mar 26 22:13:12 2008
New Revision: 641707
URL: http://svn.apache.org/viewvc?rev=641707&view=rev
Log:
[MRM-688] clean up dependencies included
Modified:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/pom.xml
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
Modified: maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/pom.xml?rev=641707&r1=641706&r2=641707&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/pom.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/pom.xml Wed Mar 26 22:13:12 2008
@@ -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>
@@ -110,18 +120,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<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>
Modified: maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml?rev=641707&r1=641706&r2=641707&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml Wed Mar 26 22:13:12 2008
@@ -33,35 +33,15 @@
<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>