[21/50] [abbrv] git commit: Uses wget to fetch docs instead re-exporting pages from wiki
Uses wget to fetch docs instead re-exporting pages from wiki
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/769e815c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/769e815c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/769e815c
Branch: refs/heads/feature/http-interceptor
Commit: 769e815c6e0a72b25812ff1c4526105be9491e0c
Parents: 1a668af
Author: Lukasz Lenart
Authored: Fri May 2 15:35:31 2014 +0200
Committer: Lukasz Lenart
Committed: Fri May 2 15:35:31 2014 +0200
--
assembly/pom.xml | 86 +--
1 file changed, 36 insertions(+), 50 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/769e815c/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7984c29..56a551b 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -77,6 +77,42 @@
+maven-antrun-plugin
+
+
+cwiki-docs
+prepare-package
+
+run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://struts.apache.org/development/2.x/docs/"; />
+
+
+
+
+
+
+
+
+
+
+
+
maven-assembly-plugin
@@ -103,59 +139,9 @@
-
-
-export-cwiki
-
-
-!skipWiki
-
-
-
-
-
-org.codehaus.mojo
-exec-maven-plugin
-1.2
-
-
-cwiki-docs
-prepare-package
-
-java
-
-
-runtime
-
true
-
org.apache.cxf.cwiki.SiteExporter
-
--d
-
${project.build.directory}/cwiki/WW
--password
-
${confluence.password}
--user
-${confluence.user}
-
${basedir}/src/main/resources/docs.cfg
-
-
-
-
-
-
-
-
-
-
-org.apache.cxf.site-export
-cxf-site-export
-1.0-SNAPSHOT
-runtime
-
-
-
org.apache.struts
struts2-cdi-plugin
[31/50] [abbrv] git commit: Merge branch 'hotfix/2.3.16.3'
Merge branch 'hotfix/2.3.16.3' Conflicts: apps/rest-showcase/pom.xml archetypes/struts2-archetype-angularjs/pom.xml archetypes/struts2-archetype-blank/pom.xml archetypes/struts2-archetype-convention/pom.xml archetypes/struts2-archetype-dbportlet/pom.xml archetypes/struts2-archetype-plugin/pom.xml archetypes/struts2-archetype-portlet/pom.xml archetypes/struts2-archetype-starter/pom.xml assembly/src/main/assembly/docs.xml Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/38a3f8bf Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/38a3f8bf Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/38a3f8bf Branch: refs/heads/feature/http-interceptor Commit: 38a3f8bfb6b226db3adb44a8fc4ad0850feee54f Parents: c9fd44f bcffc25 Author: Lukasz Lenart Authored: Thu May 8 21:55:35 2014 +0200 Committer: Lukasz Lenart Committed: Thu May 8 21:55:35 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 +- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 3 +- archetypes/struts2-archetype-blank/pom.xml | 3 +- archetypes/struts2-archetype-convention/pom.xml | 3 +- archetypes/struts2-archetype-dbportlet/pom.xml | 3 +- archetypes/struts2-archetype-plugin/pom.xml | 3 +- archetypes/struts2-archetype-portlet/pom.xml| 3 +- archetypes/struts2-archetype-starter/pom.xml| 3 +- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- .../struts2/interceptor/CookieInterceptor.java | 45 +++-- .../interceptor/CookieInterceptorTest.java | 53 plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 53 files changed, 142 insertions(+), 69 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/blank/pom.xml -- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/jboss-blank/pom.xml -- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/mailreader/pom.xml -- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/pom.xml -- diff --cc apps/pom.xml index ac06753,d0a24d0..5860c18 --- a/apps/pom.xml +++ b/apps/pom.xml @@@ -26,11 -26,12 +26,11 @@@
[01/10] git commit: Correct type with release-plugin version
Repository: struts Updated Branches: refs/heads/develop 086c0a0d5 -> 63897e83d Correct type with release-plugin version Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/dbcdbd0d Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/dbcdbd0d Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/dbcdbd0d Branch: refs/heads/develop Commit: dbcdbd0d129657ddceafbd8df36406e4bb7b7b91 Parents: 7dd83df Author: Lukasz Lenart Authored: Thu May 1 11:21:13 2014 +0200 Committer: Lukasz Lenart Committed: Thu May 1 11:21:13 2014 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/dbcdbd0d/pom.xml -- diff --git a/pom.xml b/pom.xml index dc336c1..579ddcb 100644 --- a/pom.xml +++ b/pom.xml @@ -124,7 +124,7 @@ org.apache.maven.plugins maven-release-plugin -2.52 +2.5 org.apache.maven.plugins
[CONF] Confluence Changes in the last 24 hours
Confluence Changes in the last 24 hours Apache Open Climate Workbench Pages Page: Installation of Python 2.7, Modules and OCW for Mac/*nix edited by Kim Whitehall [05:16 PM] (View Changes) Apache Cloudstack Pages Page: VM Snapshots in Hyper-V edited by Anshul Gangwar [11:27 AM] (View Changes) Page: Templates with multiple volumes edited by prashant kumar mishra [10:26 AM] (View Changes) Apache CXF Documentation Pages Page: 3.0 Migration Guide edited by Colm O hEigeartaigh [04:21 PM] (View Changes) Apache Hive Pages Page: WebHCat Reference edited by Lefty Leverenz [09:11 AM] (View Changes) Page: WebHCat Configure edited by Lefty Leverenz [08:34 AM] (View Changes) KNOX Pages Page: Topology Policy Separation created by Larry McCay [08:03 PM] Page: KNOX-242-support basedn, search attribute based LDAP authentication edited by Dilli Dorai [01:42 PM] (View Changes) Apache Mesos Pages Page: Framework API Rate Limiting Design Document edited by Yan Xu [06:57 PM] (View Changes) Apache OpenOffice Community Pages Page: AOO 4.1 Release Notes edited by Andrea Pescetti [09:28 PM] (View Changes) Page: OpenOffice Weekly News (collect drafts here) edited by Rob Weir [01:21 PM] (View Changes) Apache Roller Pages Page: WhoUsesRoller edited by Glen Mazza [12:25 AM] (View Changes) Spark Pages
[09/10] git commit: Sets correct version in poms to match actually released version
Sets correct version in poms to match actually released version Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d2663ced Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d2663ced Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d2663ced Branch: refs/heads/develop Commit: d2663cedd264a5b26bc1b12035aff7b32e138f78 Parents: 38a3f8b Author: Lukasz Lenart Authored: Thu May 8 21:57:25 2014 +0200 Committer: Lukasz Lenart Committed: Thu May 8 21:57:25 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml| 4 ++-- archetypes/struts2-archetype-starter/pom.xml| 4 ++-- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 ++-- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 51 files changed, 60 insertions(+), 60 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 99de588..f56bf90 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.4-SNAPSHOT +2.3.16.3 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 283ccb4..f9e0b8c 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.4-SNAPSHOT +2.3.16.3 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index fc1307a..b6281b1 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-mailreader http://git-wip-us.apache.org/r
[CONF] Confluence Changes in the last 24 hours
Confluence Changes in the last 24 hours Apache Curator Comments Page: TN4 has a new comment [ Jordan Zimmerman ] Apache CXF Documentation Pages Page: Migration Guides edited by Colm O hEigeartaigh [09:21 AM] (View Changes) Apache Hive Pages Page: HiveServer2 Clients edited by Thejas M Nair [03:04 PM] (View Changes) KNOX Comments Page: Topology Policy Separation has a new comment [ Kevin Minder ] Apache Mesos Pages Page: Metrics Design Document edited by Dominic Hamon [05:44 PM] (View Changes) This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
