Author: wsmoak
Date: Thu Jul 27 21:17:21 2006
New Revision: 426376
URL: http://svn.apache.org/viewvc?rev=426376&view=rev
Log:
Declare a dependency on the XWork Javadoc jar, then unpack and include it in
the assembly.
Re-establish the <dependencyManagement> section in the parent pom, and set the
xwork version there.
WW-1378
Modified:
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/assembly/src/main/assembly/all.xml
struts/struts2/trunk/pom.xml
Modified: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=426376&r1=426375&r2=426376&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Thu Jul 27 21:17:21 2006
@@ -97,6 +97,23 @@
<outputDirectory>${project.build.directory}/apps</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>xwork-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>opensymphony</groupId>
+ <artifactId>xwork</artifactId>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${project.build.directory}/xwork-apidocs</outputDirectory>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
Modified: struts/struts2/trunk/assembly/src/main/assembly/all.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/all.xml?rev=426376&r1=426375&r2=426376&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Thu Jul 27 21:17:21
2006
@@ -46,7 +46,13 @@
<include>*.war</include>
</includes>
</fileSet>
-
+
+ <!-- Include the XWork Javadoc in the assembly -->
+ <fileSet>
+ <directory>target/xwork-apidocs</directory>
+ <outputDirectory>xwork-apidocs</outputDirectory>
+ </fileSet>
+
<!-- Include the source code in the assembly -->
<fileSet>
<directory>../</directory>
Modified: struts/struts2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=426376&r1=426375&r2=426376&view=diff
==============================================================================
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Thu Jul 27 21:17:21 2006
@@ -50,7 +50,7 @@
robust client and server side validation, and much more.
</description>
-->
-
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk</developerConnection>
@@ -80,7 +80,7 @@
<!--<module>assembly</module>-->
<module>api</module>
</modules>
-
+
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -134,8 +134,8 @@
</dependencies>
</profile>
</profiles>
-
-
+
+
<build>
<pluginManagement>
<plugins>
@@ -227,7 +227,15 @@
</plugins>
</reporting>
- <dependencies/>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>opensymphony</groupId>
+ <artifactId>xwork</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<repositories>
<repository>
