[1/2] struts git commit: WW-4703 Increases container field visibility

2016-10-27 Thread lukaszlenart
Repository: struts
Updated Branches:
  refs/heads/master 1af188703 -> 8699f639f


WW-4703 Increases container field visibility


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/24a97d33
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/24a97d33
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/24a97d33

Branch: refs/heads/master
Commit: 24a97d33e68ddc44b3d6e3d77bf2be353c3c655a
Parents: 1af1887
Author: Lukasz Lenart 
Authored: Fri Oct 28 08:43:01 2016 +0200
Committer: Lukasz Lenart 
Committed: Fri Oct 28 08:43:01 2016 +0200

--
 core/src/main/java/com/opensymphony/xwork2/ActionSupport.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/24a97d33/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
--
diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java 
b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
index 012b1f7..76fbcba 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
@@ -37,7 +37,8 @@ public class ActionSupport implements Action, Validateable, 
ValidationAware, Tex
 private final ValidationAwareSupport validationAware = new 
ValidationAwareSupport();
 
 private transient TextProvider textProvider;
-private Container container;
+
+protected Container container;
 
 public void setActionErrors(Collection errorMessages) {
 validationAware.setActionErrors(errorMessages);



[2/2] struts git commit: WW-4704 Upgrades to OGNL 3.1.12

2016-10-27 Thread lukaszlenart
WW-4704 Upgrades to OGNL 3.1.12


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8699f639
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8699f639
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8699f639

Branch: refs/heads/master
Commit: 8699f639f39e5f245b2bc76e1c878d17ce46738a
Parents: 24a97d3
Author: Lukasz Lenart 
Authored: Fri Oct 28 08:47:33 2016 +0200
Committer: Lukasz Lenart 
Committed: Fri Oct 28 08:47:33 2016 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/8699f639/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0b6626f..b7b10dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
 
 ${project.version}
 
4.1.6.RELEASE
-3.1.10
+3.1.12
 3.3
 5.1
 3.0.7