[struts] 01/01: Merge pull request #262 from yasserzamani/WW-4845

2018-11-15 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 56d86a485b35f1d38ad5938d3cacb41b04933962
Merge: 772f899 02abab3
Author: Lukasz Lenart 
AuthorDate: Thu Nov 15 16:18:03 2018 +0100

Merge pull request #262 from yasserzamani/WW-4845

WW-4845 pass all current tests with java 9

 .travis.yml|  1 +
 .../opensymphony/xwork2/util/ClassPathFinder.java  | 33 -
 .../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 15 -
 .../xwork2/util/ClassPathFinderTest.java   | 50 +-
 .../test/java/org/apache/struts2/TestUtils.java| 17 +
 .../struts2/jasper/JspCompilationContext.java  |  4 +-
 .../struts2/jasper/compiler/JspRuntimeContext.java | 78 +-
 .../struts2/jasper/compiler/TagFileProcessor.java  |  3 +-
 .../struts2/jasper/compiler/TldLocationsCache.java | 44 ++--
 .../org/apache/struts2/EmbeddedJSPResultTest.java  | 27 ++--
 10 files changed, 187 insertions(+), 85 deletions(-)



[struts] branch master updated (772f899 -> 56d86a4)

2018-11-15 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 772f899  Merge pull request #267 from 
pHeidelbach/WW-4930-smi-cannot-be-disabled-for-action-packges-found-via-convention-plugin
 add a5d888a  pass all current tests with java 9
 add e0c1ede  Merge branch 'master' of https://github.com/apache/struts 
into WW-4845
 add 16d6d21  workaround coveralls fail on java 9
 add f8e1987  skip coveralls on java 9
 add 7763156  Merge branch 'master' of https://github.com/apache/struts 
into WW-4845
 add 02abab3  satisfy coveralls via testing with a not URLClassLoader
 new 56d86a4  Merge pull request #262 from yasserzamani/WW-4845

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:
 .travis.yml|  1 +
 .../opensymphony/xwork2/util/ClassPathFinder.java  | 33 -
 .../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 15 -
 .../xwork2/util/ClassPathFinderTest.java   | 50 +-
 .../test/java/org/apache/struts2/TestUtils.java| 17 +
 .../struts2/jasper/JspCompilationContext.java  |  4 +-
 .../struts2/jasper/compiler/JspRuntimeContext.java | 78 +-
 .../struts2/jasper/compiler/TagFileProcessor.java  |  3 +-
 .../struts2/jasper/compiler/TldLocationsCache.java | 44 ++--
 .../org/apache/struts2/EmbeddedJSPResultTest.java  | 27 ++--
 10 files changed, 187 insertions(+), 85 deletions(-)



[struts] branch master updated (4b51f93 -> 772f899)

2018-11-15 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 4b51f93  Merge pull request #268 from 
sepe81/remove-dependency-cglib-nodep
 add 38b96b1  WW-4930 Add constant to enable smi inheritance between parent 
package configs and its children
 add 8b4755d  WW-4930 Add test run with enabled SMI inheritance
 new 772f899  Merge pull request #267 from 
pHeidelbach/WW-4930-smi-cannot-be-disabled-for-action-packges-found-via-convention-plugin

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:
 .../struts2/convention/ConventionConstants.java|   2 +
 .../PackageBasedActionConfigBuilder.java   |   9 +-
 .../config/entities/ConventionConstantConfig.java  |  10 ++
 .../src/main/resources/struts-plugin.xml   |   2 +
 .../PackageBasedActionConfigBuilderTest.java   | 103 +
 5 files changed, 109 insertions(+), 17 deletions(-)



[struts] 01/01: Merge pull request #267 from pHeidelbach/WW-4930-smi-cannot-be-disabled-for-action-packges-found-via-convention-plugin

2018-11-15 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 772f8999b7a0993cb936534d4e16a06c4a446309
Merge: 4b51f93 8b4755d
Author: Lukasz Lenart 
AuthorDate: Thu Nov 15 16:14:15 2018 +0100

Merge pull request #267 from 
pHeidelbach/WW-4930-smi-cannot-be-disabled-for-action-packges-found-via-convention-plugin

WW-4930 Add constant to enable smi inheritance

 .../struts2/convention/ConventionConstants.java|   2 +
 .../PackageBasedActionConfigBuilder.java   |   9 +-
 .../config/entities/ConventionConstantConfig.java  |  10 ++
 .../src/main/resources/struts-plugin.xml   |   2 +
 .../PackageBasedActionConfigBuilderTest.java   | 103 +
 5 files changed, 109 insertions(+), 17 deletions(-)



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

2018-11-15 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 4eb6469  Updates production by Jenkins
4eb6469 is described below

commit 4eb64693e028e5cdd318280c2589828a2e2947d4
Author: jenkins 
AuthorDate: Thu Nov 15 09:00:51 2018 +

Updates production by Jenkins
---
 content/struts23-eol-announcement.html | 5 +
 1 file changed, 5 insertions(+)

diff --git a/content/struts23-eol-announcement.html 
b/content/struts23-eol-announcement.html
index ee10646..0fc7f02 100644
--- a/content/struts23-eol-announcement.html
+++ b/content/struts23-eol-announcement.html
@@ -169,6 +169,11 @@ the latest version of Struts 2.
 
 You are free to put effort in Struts 2.3.x. There are basically one 
possibility: fork the existing source and support it on your own.
   
+  
+I’m using Apache Struts 2.5.x, what will happen with this 
version?
+
+Struts 2.5.x is still actively supported, we are working on new 
versions as well as we are preparing a new Struts 2.6 version. Migration from 
Struts 2.5.x to Struts 2.6 will a way smoother than switching from Struts 2.3.x 
to Struts 2.5.x.
+  
 
 
   



[struts-site] branch master updated: Adds a note about support for Struts 2.5

2018-11-15 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


The following commit(s) were added to refs/heads/master by this push:
 new bac9e48  Adds a note about support for Struts 2.5
bac9e48 is described below

commit bac9e4896a56b31d8e6d81170bbb9123d4da8337
Author: Lukasz Lenart 
AuthorDate: Thu Nov 15 09:46:44 2018 +0100

Adds a note about support for Struts 2.5
---
 source/struts23-eol-announcement.md | 4 
 1 file changed, 4 insertions(+)

diff --git a/source/struts23-eol-announcement.md 
b/source/struts23-eol-announcement.md
index 56c0521..71e4b68 100644
--- a/source/struts23-eol-announcement.md
+++ b/source/struts23-eol-announcement.md
@@ -38,3 +38,7 @@ internal changes to improve overall framework's security.
 *   **My friends / colleagues and I would like to see Struts 2.3.x being 
maintained again. What can we do?**
 
 You are free to put effort in Struts 2.3.x. There are basically one 
possibility: fork the existing source and support it on your own.
+
+*   **I'm using Apache Struts 2.5.x, what will happen with this version?**
+
+Struts 2.5.x is still actively supported, we are working on new versions 
as well as we are preparing a new Struts 2.6 version. Migration from Struts 
2.5.x to Struts 2.6 will a way smoother than switching from Struts 2.3.x to 
Struts 2.5.x.