Author: wsmoak
Date: Sun Apr 23 23:53:31 2006
New Revision: 396458
URL: http://svn.apache.org/viewcvs?rev=396458&view=rev
Log:
Include struts-tiles in the assembly and clean up the pom.
Mark several dependencies as 'provided' so they will not be included in the
'lib' directory of the assembly.
(Normally this is done with <exclusions> but I couldn't determine where they
were coming from.)
Modified:
struts/action/trunk/assembly/pom.xml
struts/action/trunk/assembly/src/main/assembly/dist.xml
Modified: struts/action/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=396458&r1=396457&r2=396458&view=diff
==============================================================================
--- struts/action/trunk/assembly/pom.xml (original)
+++ struts/action/trunk/assembly/pom.xml Sun Apr 23 23:53:31 2006
@@ -51,60 +51,6 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
<executions>
- <!--execution>
- <id>copy-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-core</artifactId>
- <version>${version}</version>
- <classifier>javadoc</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-el</artifactId>
- <version>${version}</version>
- <classifier>javadoc</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-extras</artifactId>
- <version>${version}</version>
- <classifier>javadoc</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-faces</artifactId>
- <version>${version}</version>
- <classifier>javadoc</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-mailreader-dao</artifactId>
- <version>${version}</version>
- <classifier>javadoc</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-scripting</artifactId>
- <version>${version}</version>
- <classifier>javadoc</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-taglib</artifactId>
- <version>${version}</version>
- <classifier>javadoc</classifier>
- </artifactItem>
- </artifactItems>
-
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
- </configuration>
- </execution-->
<execution>
<id>copy-war</id>
<phase>package</phase>
@@ -171,60 +117,6 @@
<outputDirectory>${project.build.directory}/webapps</outputDirectory>
</configuration>
</execution>
- <!--execution>
- <id>copy-sources</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-core</artifactId>
- <version>${version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-el</artifactId>
- <version>${version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-extras</artifactId>
- <version>${version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-faces</artifactId>
- <version>${version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-mailreader-dao</artifactId>
- <version>${version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-scripting</artifactId>
- <version>${version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-taglib</artifactId>
- <version>${version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- </artifactItems>
-
<outputDirectory>${project.build.directory}/sources</outputDirectory>
- </configuration>
- </execution-->
</executions>
</plugin>
</plugins>
@@ -240,9 +132,6 @@
<configuration>
<descriptors>
<descriptor>src/main/assembly/dist.xml</descriptor>
- <!-- descriptor>src/main/assembly/all.xml</descriptor -->
- <!-- descriptor>src/main/assembly/dep.xml</descriptor -->
- <!-- descriptor>src/main/assembly/src.xml</descriptor -->
</descriptors>
<finalName>struts-action-${version}</finalName>
<outputDirectory>target/assembly/out</outputDirectory>
@@ -288,6 +177,26 @@
<groupId>org.apache.struts.action</groupId>
<artifactId>struts-mailreader-dao</artifactId>
<version>${version}</version>
+ </dependency>
+
+ <!-- Avoid transitive dependencies by marking these as provided -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>2.0.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: struts/action/trunk/assembly/src/main/assembly/dist.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/src/main/assembly/dist.xml?rev=396458&r1=396457&r2=396458&view=diff
==============================================================================
--- struts/action/trunk/assembly/src/main/assembly/dist.xml (original)
+++ struts/action/trunk/assembly/src/main/assembly/dist.xml Sun Apr 23 23:53:31
2006
@@ -193,6 +193,14 @@
<include>src/</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>../tiles</directory>
+ <outputDirectory>src/tiles</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
<!-- Include the website docs in the assembly -->
@@ -255,6 +263,10 @@
<fileSet>
<directory>../taglib/target/site</directory>
<outputDirectory>docs/struts-taglib</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../tiles/target/site</directory>
+ <outputDirectory>docs/struts-tiles</outputDirectory>
</fileSet>
</fileSets>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
