[struts-site] branch asf-site updated: Updates production by Jenkins

2018-12-02 Thread git-site-role
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 0f1fb16  Updates production by Jenkins
0f1fb16 is described below

commit 0f1fb168a9176afe00d1dd2a7262c61f222fe08d
Author: jenkins 
AuthorDate: Sun Dec 2 10:30:53 2018 +

Updates production by Jenkins
---
 content/getting-started/how-to-create-a-struts2-web-application.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/content/getting-started/how-to-create-a-struts2-web-application.html 
b/content/getting-started/how-to-create-a-struts2-web-application.html
index f54c10d..a980d70 100644
--- a/content/getting-started/how-to-create-a-struts2-web-application.html
+++ b/content/getting-started/how-to-create-a-struts2-web-application.html
@@ -230,7 +230,7 @@ project folder structure. In your pom.xml
 Step 2 - Add index.jsp
 
 Our next step is to add a simple index.jsp to this web application. Create an 
index.jsp under src/main/webapp
-with a title of Basic Struts 2 Application - Welcome and in 
the body add an h1 heading of Welcome to Struts 2!
+with a title of Basic Struts 2 Application - Welcome and in 
the body add an h1 heading of Welcome To Struts 2!
 
 index.jsp
 



[struts] 01/01: Merge pull request #283 from JCgH4164838Gh792C124B5/localS2Branch

2018-12-02 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit c4892530a3595b049bada4d9395cf68771279815
Merge: 4e7ed1f 0e41063
Author: Lukasz Lenart 
AuthorDate: Sun Dec 2 11:28:42 2018 +0100

Merge pull request #283 from JCgH4164838Gh792C124B5/localS2Branch

Upgrade DWR from 1.x to 2.x

 apps/showcase/pom.xml | 2 +-
 plugins/dwr/pom.xml   | 2 +-
 pom.xml   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)



[struts] branch master updated (4e7ed1f -> c489253)

2018-12-02 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.


from 4e7ed1f  Merge pull request #284 from 
sepe81/fix-sonar-warnings-for-ActionSupport
 add 0e41063  Upgrade DWR from 1.x to 2.x - intended to resolve Jenkins 
build failure with old DWR version.
 new c489253  Merge pull request #283 from 
JCgH4164838Gh792C124B5/localS2Branch

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 apps/showcase/pom.xml | 2 +-
 plugins/dwr/pom.xml   | 2 +-
 pom.xml   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)



[struts-site] 01/01: Merge pull request #121 from fanofxiaofeng/patch-21

2018-12-02 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git

commit 1f22c0df82dbb8d81a99a3a76592a99a95a1e15a
Merge: bac9e48 47b6426
Author: Lukasz Lenart 
AuthorDate: Sun Dec 2 11:27:56 2018 +0100

Merge pull request #121 from fanofxiaofeng/patch-21

to -> To

 source/getting-started/how-to-create-a-struts2-web-application.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



[struts-site] branch master updated (bac9e48 -> 1f22c0d)

2018-12-02 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git.


from bac9e48  Adds a note about support for Struts 2.5
 add 47b6426  to -> To
 new 1f22c0d  Merge pull request #121 from fanofxiaofeng/patch-21

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 source/getting-started/how-to-create-a-struts2-web-application.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)