Author: wesw
Date: Fri Oct 2 17:34:59 2009
New Revision: 821108
URL: http://svn.apache.org/viewvc?rev=821108&view=rev
Log:
WW-3269 fixing up the docs packaging
Modified:
struts/struts2/branches/STRUTS_2_1_X/apps/blank/pom.xml
struts/struts2/branches/STRUTS_2_1_X/apps/mailreader/pom.xml
struts/struts2/branches/STRUTS_2_1_X/apps/pom.xml
struts/struts2/branches/STRUTS_2_1_X/apps/portlet/pom.xml
struts/struts2/branches/STRUTS_2_1_X/apps/rest-showcase/pom.xml
struts/struts2/branches/STRUTS_2_1_X/apps/showcase/pom.xml
struts/struts2/branches/STRUTS_2_1_X/assembly/pom.xml
struts/struts2/branches/STRUTS_2_1_X/assembly/src/main/assembly/all.xml
struts/struts2/branches/STRUTS_2_1_X/assembly/src/main/assembly/docs.xml
struts/struts2/branches/STRUTS_2_1_X/bundles/admin/pom.xml
struts/struts2/branches/STRUTS_2_1_X/bundles/demo/pom.xml
struts/struts2/branches/STRUTS_2_1_X/bundles/pom.xml
struts/struts2/branches/STRUTS_2_1_X/core/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/codebehind/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/config-browser/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/convention/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/dojo/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/dwr/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/embeddedjsp/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/jasperreports/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/javatemplates/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/jfreechart/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/jsf/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/json/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/junit/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/osgi/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/oval/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/pell-multipart/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/plexus/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/portlet/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/rest/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/sitegraph/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/sitemesh/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/spring/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/struts1/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/testng/pom.xml
struts/struts2/branches/STRUTS_2_1_X/plugins/tiles/pom.xml
struts/struts2/branches/STRUTS_2_1_X/pom.xml
Modified: struts/struts2/branches/STRUTS_2_1_X/apps/blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/apps/blank/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/apps/blank/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/apps/blank/pom.xml Fri Oct 2 17:34:59
2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-blank</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/apps/mailreader/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/apps/mailreader/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/apps/mailreader/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/apps/mailreader/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-mailreader</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/apps/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/apps/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/apps/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/apps/pom.xml Fri Oct 2 17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/apps/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/apps/portlet/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/apps/portlet/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/apps/portlet/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-portlet</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/apps/rest-showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/apps/rest-showcase/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/apps/rest-showcase/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/apps/rest-showcase/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,13 +26,13 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
<name>Struts 2 Rest Showcase Example</name>
<description>Struts 2 Rest Showcase Example</description>
Modified: struts/struts2/branches/STRUTS_2_1_X/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/apps/showcase/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/apps/showcase/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/apps/showcase/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-showcase</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/assembly/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/assembly/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/assembly/pom.xml Fri Oct 2 17:34:59
2009
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<scm>
@@ -288,8 +288,9 @@
<arg value="-nv" />
<arg value="-E" />
<arg value="-L" />
- <arg
value="--directory-prefix=${project.build.directory}/cwiki" />
<arg value="-r" />
+ <arg
value="--directory-prefix=${project.build.directory}/cwiki" />
+ <arg value="--restrict-file-names=windows"
/>
<arg value="http://cwiki.apache.org/WW/"; />
</exec>
</tasks>
Modified:
struts/struts2/branches/STRUTS_2_1_X/assembly/src/main/assembly/all.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/assembly/src/main/assembly/all.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/assembly/src/main/assembly/all.xml
(original)
+++ struts/struts2/branches/STRUTS_2_1_X/assembly/src/main/assembly/all.xml Fri
Oct 2 17:34:59 2009
@@ -120,8 +120,8 @@
<!-- Include the Confluence docs in the assembly -->
<fileSet>
- <directory>target/cwiki</directory>
- <outputDirectory>docs</outputDirectory>
+ <directory>target/cwiki/WW</directory>
+ <outputDirectory>docs/docs</outputDirectory>
</fileSet>
<!-- Plugins -->
Modified:
struts/struts2/branches/STRUTS_2_1_X/assembly/src/main/assembly/docs.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/assembly/src/main/assembly/docs.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/assembly/src/main/assembly/docs.xml
(original)
+++ struts/struts2/branches/STRUTS_2_1_X/assembly/src/main/assembly/docs.xml
Fri Oct 2 17:34:59 2009
@@ -51,7 +51,7 @@
<!-- Include the Confluence docs in the assembly -->
<fileSet>
<directory>target/cwiki/WW</directory>
- <outputDirectory>docs</outputDirectory>
+ <outputDirectory>docs/docs</outputDirectory>
</fileSet>
<!-- Plugins -->
Modified: struts/struts2/branches/STRUTS_2_1_X/bundles/admin/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/bundles/admin/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/bundles/admin/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/bundles/admin/pom.xml Fri Oct 2
17:34:59 2009
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-admin-bundle</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/bundles/demo/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/bundles/demo/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/bundles/demo/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/bundles/demo/pom.xml Fri Oct 2
17:34:59 2009
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-demo-bundle</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/bundles/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/bundles/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/bundles/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/bundles/pom.xml Fri Oct 2 17:34:59
2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/core/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/core/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/core/pom.xml Fri Oct 2 17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/codebehind/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/codebehind/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/codebehind/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/codebehind/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-codebehind-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/config-browser/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/config-browser/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/config-browser/pom.xml
(original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/config-browser/pom.xml Fri Oct
2 17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-config-browser-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/convention/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/convention/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/convention/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/convention/pom.xml Fri Oct 2
17:34:59 2009
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-convention-plugin</artifactId>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/dojo/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/dojo/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/dojo/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/dojo/pom.xml Fri Oct 2
17:34:59 2009
@@ -25,7 +25,7 @@
<parent>
<artifactId>struts2-plugins</artifactId>
<groupId>org.apache.struts</groupId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.struts</groupId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/dwr/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/dwr/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/dwr/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/dwr/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-dwr-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/embeddedjsp/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/embeddedjsp/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/embeddedjsp/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/embeddedjsp/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/jasperreports/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/jasperreports/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/jasperreports/pom.xml
(original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/jasperreports/pom.xml Fri Oct
2 17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-jasperreports-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/javatemplates/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/javatemplates/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/javatemplates/pom.xml
(original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/javatemplates/pom.xml Fri Oct
2 17:34:59 2009
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-javatemplates-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/jfreechart/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/jfreechart/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/jfreechart/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/jfreechart/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-jfreechart-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/jsf/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/jsf/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/jsf/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/jsf/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-jsf-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/json/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/json/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/json/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/json/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-json-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/junit/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/junit/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/junit/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/junit/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-junit-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/osgi/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/osgi/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/osgi/pom.xml Fri Oct 2
17:34:59 2009
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/oval/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/oval/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/oval/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/oval/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-oval-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/pell-multipart/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/pell-multipart/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/pell-multipart/pom.xml
(original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/pell-multipart/pom.xml Fri Oct
2 17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-pell-multipart-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/plexus/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/plexus/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/plexus/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/plexus/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plexus-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/pom.xml Fri Oct 2 17:34:59
2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/portlet/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/portlet/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/portlet/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-portlet-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/rest/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/rest/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/rest/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/rest/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,11 +26,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-rest-plugin</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
<name>Struts 2 REST Plugin</name>
<dependencies>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/sitegraph/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/sitegraph/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/sitegraph/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/sitegraph/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-sitegraph-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/sitemesh/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/sitemesh/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/sitemesh/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/sitemesh/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-sitemesh-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/spring/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/spring/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/spring/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/spring/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-spring-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/struts1/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/struts1/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/struts1/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/struts1/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-struts1-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/testng/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/testng/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/testng/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/testng/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-testng-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/plugins/tiles/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/plugins/tiles/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/plugins/tiles/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/plugins/tiles/pom.xml Fri Oct 2
17:34:59 2009
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-tiles-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_1_X/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_1_X/pom.xml?rev=821108&r1=821107&r2=821108&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_1_X/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_1_X/pom.xml Fri Oct 2 17:34:59 2009
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.1.8</version>
+ <version>2.1.8.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/struts2</url>
@@ -28,9 +28,9 @@
-->
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_8</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_8</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_8</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_1_X</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_1_X</developerConnection>
+
<url>http://svn.apache.org/viewcvs.cgi/struts/struts2/branches/STRUTS_2_1_X</url>
</scm>
<issueManagement>
@@ -53,7 +53,7 @@
</snapshotRepository>
<site>
<id>apache-site</id>
- <url>scp://people.apache.org/www/struts.apache.org/2.x/</url>
+
<url>scp://people.apache.org/www/struts.apache.org/${pom.version}</url>
</site>
</distributionManagement>
@@ -332,6 +332,14 @@
</configuration>
</plugin> -->
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ <configuration>
+ <releaseProfiles>release</releaseProfiles>
+ <goals>deploy site-deploy</goals>
+ </configuration>
+ </plugin>
</plugins>
<defaultGoal>install</defaultGoal>
