Author: ddewolf
Date: Fri Feb 16 06:14:46 2007
New Revision: 508404
URL: http://svn.apache.org/viewvc?view=rev&rev=508404
Log:
More assembly and dependency tweaks
Modified:
tiles/framework/trunk/pom.xml
tiles/framework/trunk/tiles-core/pom.xml
tiles/framework/trunk/tiles-core/src/main/assembly/bin.xml
Modified: tiles/framework/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/pom.xml?view=diff&rev=508404&r1=508403&r2=508404
==============================================================================
--- tiles/framework/trunk/pom.xml (original)
+++ tiles/framework/trunk/pom.xml Fri Feb 16 06:14:46 2007
@@ -100,7 +100,7 @@
<link>http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api</link>
<link>http://jakarta.apache.org/commons/chain/apidocs</link>
<link>http://jakarta.apache.org/commons/digester/commons-digester-1.6/docs/api</link>
-
<link>http://jakarta.apache.org/commons/logging/commons-logging-1.0.4/docs/apidocs</link>
+
<link>http://jakarta.apache.org/commons/logging/commons-logging-1.1/apidocs</link>
</links>
</configuration>
</plugin>
Modified: tiles/framework/trunk/tiles-core/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/pom.xml?view=diff&rev=508404&r1=508403&r2=508404
==============================================================================
--- tiles/framework/trunk/tiles-core/pom.xml (original)
+++ tiles/framework/trunk/tiles-core/pom.xml Fri Feb 16 06:14:46 2007
@@ -177,6 +177,12 @@
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.8</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: tiles/framework/trunk/tiles-core/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/assembly/bin.xml?view=diff&rev=508404&r1=508403&r2=508404
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/assembly/bin.xml (original)
+++ tiles/framework/trunk/tiles-core/src/main/assembly/bin.xml Fri Feb 16
06:14:46 2007
@@ -23,16 +23,28 @@
<includeSiteDirectory>false</includeSiteDirectory>
<dependencySets>
- <dependencySet>
- <scope>compile</scope>
- <outputDirectory>/lib</outputDirectory>
- <excludes>
- <exclude>javax.servlet:servlet-api</exclude>
- <exclude>javax.servlet:jsp-api</exclude>
- <exclude>javax.portlet:portlet-api</exclude>
- <exclude>org.apache.tiles:tiles-core</exclude>
- </excludes>
- </dependencySet>
+ <dependencySet>
+ <scope>compile</scope>
+ <outputDirectory>/lib</outputDirectory>
+ <excludes>
+ <exclude>javax.servlet:servlet-api</exclude>
+ <exclude>javax.servlet:jsp-api</exclude>
+ <exclude>javax.portlet:portlet-api</exclude>
+ <exclude>org.apache.tiles:tiles-api</exclude>
+ <exclude>org.apache.tiles:tiles-core</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <scope>compile</scope>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org.apache.tiles:tiles-api</include>
+ </includes>
+ <excludes>
+ <exclude>*</exclude>
+ <exclude>org.apache.tiles:tiles-core</exclude>
+ </excludes>
+ </dependencySet>
</dependencySets>
<fileSets>
