struts git commit: WW-4596 Uses unmodifiable set to avoid changing allowed methods
Repository: struts
Updated Branches:
refs/heads/master 0cc5fcaaa -> c53c6d8c8
WW-4596 Uses unmodifiable set to avoid changing allowed methods
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c53c6d8c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c53c6d8c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c53c6d8c
Branch: refs/heads/master
Commit: c53c6d8c8e3c2985dd57b7d7c0e2b30cce85e3e8
Parents: 0cc5fca
Author: Lukasz Lenart
Authored: Fri Feb 5 09:02:52 2016 +0100
Committer: Lukasz Lenart
Committed: Fri Feb 5 09:02:52 2016 +0100
--
.../com/opensymphony/xwork2/config/entities/PackageConfig.java | 2 +-
.../xwork2/config/providers/XmlConfigurationProvider.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/c53c6d8c/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
index 1e7a4dd..c0e9477 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
@@ -519,7 +519,7 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
public Set getGlobalAllowedMethods() {
Set allowedMethods = target.globalAllowedMethods;
allowedMethods.addAll(getParentsAllowedMethods(target.parents));
-return allowedMethods;
+return Collections.unmodifiableSet(allowedMethods);
}
public Set getParentsAllowedMethods(List
parents) {
http://git-wip-us.apache.org/repos/asf/struts/blob/c53c6d8c/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index c27f95b..1ea9c3e 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -859,7 +859,7 @@ public class XmlConfigurationProvider implements
ConfigurationProvider {
Set allowedMethods;
if (allowedMethodsEls.getLength() > 0) {
// user defined 'allowed-methods' so used them whatever Strict DMI
was enabled or not
-allowedMethods = packageContext.getGlobalAllowedMethods();
+allowedMethods = new
HashSet<>(packageContext.getGlobalAllowedMethods());
if (allowedMethodsEls.getLength() > 0) {
Node n = allowedMethodsEls.item(0).getFirstChild();
@@ -872,14 +872,14 @@ public class XmlConfigurationProvider implements
ConfigurationProvider {
}
} else if (packageContext.isStrictMethodInvocation()) {
// user enabled Strict DMI but didn't defined action specific
'allowed-methods' so we use 'global-allowed-methods' only
-allowedMethods = packageContext.getGlobalAllowedMethods();
+allowedMethods = new
HashSet<>(packageContext.getGlobalAllowedMethods());
} else {
// Strict DMI is disabled to any method can be called
allowedMethods = new HashSet<>();
allowedMethods.add(ActionConfig.REGEX_WILDCARD);
}
-return allowedMethods;
+return Collections.unmodifiableSet(allowedMethods);
}
protected void loadDefaultInterceptorRef(PackageConfig.Builder
packageContext, Element element) {
struts git commit: Adds some logginf to allowed methods
Repository: struts
Updated Branches:
refs/heads/master c53c6d8c8 -> 24085bdc5
Adds some logginf to allowed methods
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/24085bdc
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/24085bdc
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/24085bdc
Branch: refs/heads/master
Commit: 24085bdc5a15094b3752d3926f75882ee2a87b54
Parents: c53c6d8
Author: Lukasz Lenart
Authored: Fri Feb 5 09:36:21 2016 +0100
Committer: Lukasz Lenart
Committed: Fri Feb 5 09:36:21 2016 +0100
--
.../xwork2/config/entities/ActionConfig.java| 1 +
.../xwork2/config/entities/AllowedMethods.java | 27
.../providers/XmlConfigurationProvider.java | 8 +++---
.../config/entities/ActionConfigTest.java | 4 +--
4 files changed, 33 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/24085bdc/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
index a821c93..e12a86b 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
@@ -199,6 +199,7 @@ public class ActionConfig extends Located implements
Serializable {
}
sb.append(")");
sb.append(" - ").append(location);
+sb.append(" - ").append(allowedMethods);
sb.append("}");
return sb.toString();
}
http://git-wip-us.apache.org/repos/asf/struts/blob/24085bdc/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
index 976117d..22fea12 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2002-2006,2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.opensymphony.xwork2.config.entities;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -7,6 +25,8 @@ import java.util.regex.Pattern;
public class AllowedMethods {
+private static final Logger LOG =
LogManager.getLogger(AllowedMethods.class);
+
private Set allowedMethods;
public static AllowedMethods build(Set methods) {
@@ -40,6 +60,8 @@ public class AllowedMethods {
}
}
+LOG.debug("Defined allowed methods: {}", allowedMethods);
+
return new AllowedMethods(allowedMethods);
}
@@ -85,6 +107,11 @@ public class AllowedMethods {
String original();
}
+@Override
+public String toString() {
+return "allowedMethods=" + allowedMethods;
+}
+
private static class PatternAllowedMethod implements AllowedMethod {
private final Pattern allowedMethodPattern;
http://git-wip-us.apache.org/repos/asf/struts/blob/24085bdc/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index 1ea9c3e..1779764 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -469,11 +469,9 @@ public class XmlConfigurationProvider implements
ConfigurationProvider {
.build();
packageContext.addActionConfig(name, actionConfig);
-
struts-examples git commit: Adds some more complicated pattern
Repository: struts-examples
Updated Branches:
refs/heads/master 74c60c11f -> 2697ee741
Adds some more complicated pattern
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/2697ee74
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/2697ee74
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/2697ee74
Branch: refs/heads/master
Commit: 2697ee7417c4b87354e287bf50cf8f8364aff479
Parents: 74c60c1
Author: Lukasz Lenart
Authored: Fri Feb 5 09:37:07 2016 +0100
Committer: Lukasz Lenart
Committed: Fri Feb 5 09:37:07 2016 +0100
--
.../struts/tutorials/wildcardmethod/action/PersonAction.java | 7 +++
wildcard-method-selection/src/main/resources/struts.xml | 5 +
2 files changed, 12 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/2697ee74/wildcard-method-selection/src/main/java/org/apache/struts/tutorials/wildcardmethod/action/PersonAction.java
--
diff --git
a/wildcard-method-selection/src/main/java/org/apache/struts/tutorials/wildcardmethod/action/PersonAction.java
b/wildcard-method-selection/src/main/java/org/apache/struts/tutorials/wildcardmethod/action/PersonAction.java
index 4aa0926..4bc65e5 100644
---
a/wildcard-method-selection/src/main/java/org/apache/struts/tutorials/wildcardmethod/action/PersonAction.java
+++
b/wildcard-method-selection/src/main/java/org/apache/struts/tutorials/wildcardmethod/action/PersonAction.java
@@ -32,6 +32,13 @@ public class PersonAction extends ActionSupport {
return INPUT;
}
+public String runCreateThis() {
+log.debug("In create method");
+person = new Person();
+
+return INPUT;
+}
+
public String edit() {
log.debug("In edit method");
person = personService.getPerson(id);
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/2697ee74/wildcard-method-selection/src/main/resources/struts.xml
--
diff --git a/wildcard-method-selection/src/main/resources/struts.xml
b/wildcard-method-selection/src/main/resources/struts.xml
index f5e5dba..9aab5c6 100644
--- a/wildcard-method-selection/src/main/resources/struts.xml
+++ b/wildcard-method-selection/src/main/resources/struts.xml
@@ -21,6 +21,11 @@
input.jsp
+
+ view.jsp
+ input.jsp
+
+
[7/7] struts-site git commit: Marks file as executable and sets proper interpreter
Marks file as executable and sets proper interpreter Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/3931c431 Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/3931c431 Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/3931c431 Branch: refs/heads/master Commit: 3931c4315dd06dff566ae851655007919ab97e92 Parents: 0f3fd54 Author: Lukasz Lenart Authored: Fri Feb 5 20:36:08 2016 +0100 Committer: Lukasz Lenart Committed: Fri Feb 5 20:36:08 2016 +0100 -- docker-run.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/3931c431/docker-run.fish -- diff --git a/docker-run.fish b/docker-run.fish old mode 100644 new mode 100755 index 076df98..dc883c1 --- a/docker-run.fish +++ b/docker-run.fish @@ -1,2 +1,2 @@ +#!/usr/local/bin/fish docker run -v $PWD:/srv/jekyll -it -p 4000:4000 theapachestruts/struts-site-jekyll bundle exec jekyll serve --watch -
[3/7] struts-site git commit: Updates release dates
Updates release dates Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/a0a08298 Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/a0a08298 Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/a0a08298 Branch: refs/heads/master Commit: a0a08298d16ddd48bad64f80628e55f22df078e0 Parents: 21a0a8a Author: Lukasz Lenart Authored: Wed Jan 27 09:31:00 2016 +0100 Committer: Lukasz Lenart Committed: Wed Jan 27 09:31:00 2016 +0100 -- _config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/a0a08298/_config.yml -- diff --git a/_config.yml b/_config.yml index 9f3ef50..cbac87d 100644 --- a/_config.yml +++ b/_config.yml @@ -29,8 +29,8 @@ root: # Simplifies introducing changes related to the latest release current_version: 2.3.24.1 current_version_short: 23241 -current_beta_version: 2.5-BETA2 +current_beta_version: 2.5-BETA3 current_beta_version_short: 25 release_date: 24 september 2015 release_date_short: 20150924 -beta_release_date_short: 20151001 +beta_release_date_short: 20160126
[1/7] struts-site git commit: Modifies how Docker is launched
Repository: struts-site Updated Branches: refs/heads/master 840f0616c -> 3931c4315 Modifies how Docker is launched Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/80f0d7b0 Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/80f0d7b0 Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/80f0d7b0 Branch: refs/heads/master Commit: 80f0d7b0b410f41ab8ba2d8275d0a252a5948c3a Parents: 840f061 Author: Lukasz Lenart Authored: Wed Jan 27 09:20:40 2016 +0100 Committer: Lukasz Lenart Committed: Wed Jan 27 09:20:40 2016 +0100 -- docker-run.fish | 2 +- docker-run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/80f0d7b0/docker-run.fish -- diff --git a/docker-run.fish b/docker-run.fish index fcc7e94..076df98 100644 --- a/docker-run.fish +++ b/docker-run.fish @@ -1,2 +1,2 @@ -docker run -v $PWD:/srv/jekyll -t -p 4000:4000 theapachestruts/struts-site-jekyll bundle exec jekyll serve --watch +docker run -v $PWD:/srv/jekyll -it -p 4000:4000 theapachestruts/struts-site-jekyll bundle exec jekyll serve --watch http://git-wip-us.apache.org/repos/asf/struts-site/blob/80f0d7b0/docker-run.sh -- diff --git a/docker-run.sh b/docker-run.sh index 5437bc2..7b15bc4 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -1,4 +1,4 @@ #!/bin/sh -docker run -v $(pwd):/srv/jekyll -t -p 4000:4000 theapachestruts/struts-site-jekyll bundle exec jekyll serve --watch +docker run -v $(pwd):/srv/jekyll -it -p 4000:4000 theapachestruts/struts-site-jekyll bundle exec jekyll serve --watch
[4/7] struts-site git commit: Prepares new announcement
Prepares new announcement
Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/eedc836d
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/eedc836d
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/eedc836d
Branch: refs/heads/master
Commit: eedc836d29c09e5f3af68e875fee3697bcab4cf9
Parents: a0a0829
Author: Lukasz Lenart
Authored: Wed Jan 27 09:31:11 2016 +0100
Committer: Lukasz Lenart
Committed: Wed Jan 27 09:31:11 2016 +0100
--
source/announce.md | 140 ++--
1 file changed, 15 insertions(+), 125 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts-site/blob/eedc836d/source/announce.md
--
diff --git a/source/announce.md b/source/announce.md
index 2b548ee..267f001 100644
--- a/source/announce.md
+++ b/source/announce.md
@@ -5,12 +5,12 @@ title: Announcements
# Announcements
- Skip to: Announcements - 2014
+ Skip to: Announcements - 2015
- 1 October 2015 - Struts 2.5-BETA2 (BETA) {#a20151001}
+ 26 January 2016 - Struts 2.5-BETA3 (BETA) {#a20160126}
-The Apache Struts group is pleased to announce that Struts 2.5-BETA2 is
available as a "BETA" release.
+The Apache Struts group is pleased to announce that Struts 2.5-BETA3 is
available as a "BETA" release.
Apache Struts 2 is an elegant, extensible framework for creating
enterprise-ready Java web applications.
The framework is designed to streamline the full development cycle, from
building, to deploying,
@@ -18,8 +18,17 @@ to maintaining applications over time.
This release contains several breaking changes and improvements just to
mention few of them:
- - New security option was added - Strict Method Invocation (also known as
Strict DMI), see WW-4540
- - Add support for latest stable AngularJS in Maven archetype, see WW-4522
+ - Dropped support for id and name - replaced with var, see WW-2069
+ - Dedicated archive with a minimal set of dependencies was introduced, see
WW-4570
+ - It is possible to use multiple names when defining a result, see WW-4590
+ - Rest plugin honors Accept header, see WW-4588
+ - New result 'JSONActionRedirectResult' in json-plugin was defined, see
WW-4591
+ - Tiles plugin was upgrade to the latest Tiles 3 and tiles3-plugin was
dropped, see WW-4584
+ - JasperReports plugins was upgraded to JasperReport 6.0, see WW-4381
+ - OGNL was upgraded to version 3.0.11 and it breaks access to properties as
it follows Java Bean Specification,
+ see WW-4207 and WW-3909
+ - and then OGNL was upgraded to version 3.1.1, see WW-4561
+ - and then OGNL was upgraded to version 3.2.1, see WW-4577
and many other improvements, please check the version notes
@@ -29,127 +38,8 @@ Servlet API 2.4, JSP API 2.0, and Java 7.
Should any issues arise with your use of any version of the Struts framework,
please post your comments
to the user list, and, if appropriate, file a tracking ticket.
- 24 September 2015 - Struts 2.3.24.1 General Availability with Security
Fix Release {#a20150924}
-
-The Apache Struts group is pleased to announce that Struts 2.3.24.1 is
available as a "General Availability"
-release. The GA designation is our highest quality grade.
-
-Apache Struts 2 is an elegant, extensible framework for creating
enterprise-ready Java web applications.
-The framework is designed to streamline the full development cycle, from
building, to deploying,
-to maintaining applications over time.
-
-One medium security issue was solved with this release:
-
- - [S2-026](/docs/s2-026.html)
-Special `top` object can be used to access Struts' internals
-
-**All developers are strongly advised to perform this action.**
-
-The 2.3.x series of the Apache Struts framework has a minimum requirement of
the following specification versions:
-Servlet API 2.4, JSP API 2.0, and Java 6.
-
-Should any issues arise with your use of any version of the Struts framework,
-please post your comments to the user list, and, if appropriate, file a
tracking ticket.
-
- 26 August 2015 - Security Bulletin S2-025 {#a20150826}
-
-The Apache Struts group is pleased to announce that a new security bulletin
was published -
-[S2-025](/docs/s2-025.html)
-
-Thanks to Taki Uchiyama from JPCERT/CC who reported two potential XSS
vulnerabilities available
-in older versions of The Apache Struts 2. Please read the mentioned security
bulletin for more details
-and also reading our [Security guideline](/docs/security.html) will help you
secure your application
-
- 31 July 2015 - Struts 2.5-BETA1 (BETA) {#a20150731}
-
-The Apache Struts group is pleased to announce that Struts 2.5-BETA1 is
available as a "BETA"
-release.
-
-Apache Struts 2 is an elegant, extensibl
[5/7] struts-site git commit: Updates links
Updates links Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/bd0bd053 Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/bd0bd053 Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/bd0bd053 Branch: refs/heads/master Commit: bd0bd053a0a759b4a855ca704a682781bc917ac9 Parents: eedc836 Author: Lukasz Lenart Authored: Wed Jan 27 09:31:20 2016 +0100 Committer: Lukasz Lenart Committed: Wed Jan 27 09:31:20 2016 +0100 -- source/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/bd0bd053/source/index.html -- diff --git a/source/index.html b/source/index.html index 1bf3c3a..ea47f97 100644 --- a/source/index.html +++ b/source/index.html @@ -39,7 +39,7 @@ title: Welcome to the Apache Struts project -Apache Struts 2.5 BETA2 +Apache Struts 2.5 BETA3 It's a second release of upcoming Struts 2.5. Read more in Announcement or in
[6/7] struts-site git commit: Adds Dockerfile used to build supporting image
Adds Dockerfile used to build supporting image
Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/0f3fd548
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/0f3fd548
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/0f3fd548
Branch: refs/heads/master
Commit: 0f3fd54845cd3ac10e595c940e84cbb756a469dc
Parents: bd0bd05
Author: Lukasz Lenart
Authored: Fri Feb 5 20:35:43 2016 +0100
Committer: Lukasz Lenart
Committed: Fri Feb 5 20:35:43 2016 +0100
--
docker/Dockerfile | 54 ++
1 file changed, 54 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts-site/blob/0f3fd548/docker/Dockerfile
--
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 000..9b4ec36
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,54 @@
+FROM debian
+MAINTAINER Lukasz Lenart
+LABEL Description="This image is used to support building Apache Struts main
website"
+RUN \
+ apt-get update && \
+ apt-get install -y \
+vim \
+bzip2 \
+gcc \
+git-core \
+make \
+libssl-dev \
+libreadline-dev \
+zlib1g-dev \
+node \
+sudo \
+curl && \
+
+ addgroup --system --gid 1000 jekyll && \
+ adduser --system --ingroup jekyll --uid 1000 --home /home/jekyll
--disabled-password jekyll && \
+ mkdir -p /srv/jekyll && \
+ chown jekyll:jekyll /srv/jekyll && \
+ echo "jekyll ALL=NOPASSWD:ALL" >> /etc/sudoers
+USER jekyll
+RUN \
+ cd && \
+
+ git clone git://github.com/sstephenson/rbenv.git .rbenv && \
+ echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.profile && \
+ echo 'eval "$(rbenv init -)"' >> ~/.profile && \
+ . ~/.profile && \
+
+ git clone git://github.com/sstephenson/ruby-build.git
~/.rbenv/plugins/ruby-build && \
+ echo 'export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH"' >> ~/.profile
&& \
+ . ~/.profile && \
+
+ git clone https://github.com/sstephenson/rbenv-gem-rehash.git
~/.rbenv/plugins/rbenv-gem-rehash && \
+
+ rbenv install 2.2.3 && \
+ rbenv global 2.2.3 && \
+ ruby -v && \
+ echo "gem: --no-ri --no-rdoc" > ~/.gemrc && \
+
+ gem clean && gem install bundler --no-document && \
+
+ sudo rm -rf /usr/lib/ruby/gems/*/cache/*.gem
+WORKDIR /srv/jekyll
+EXPOSE 4000
+ENV HOME /home/jekyll
+ENV HOSTNAME struts-jekyll
+ENV PATH ${PATH}:${HOME}/.rbenv/plugins/ruby-build/bin
+ENV PATH ${PATH}:${HOME}/.rbenv/bin
+ENV PATH ${PATH}:${HOME}/.rbenv/shims
+CMD ["bundle", "install"]
\ No newline at end of file
[2/7] struts-site git commit: Renames the old announcement page
Renames the old announcement page
Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/21a0a8af
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/21a0a8af
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/21a0a8af
Branch: refs/heads/master
Commit: 21a0a8af6930c3d7fddd226182263fd3f7279d1f
Parents: 80f0d7b
Author: Lukasz Lenart
Authored: Wed Jan 27 09:30:52 2016 +0100
Committer: Lukasz Lenart
Committed: Wed Jan 27 09:30:52 2016 +0100
--
source/announce-2015.md | 158 +++
1 file changed, 158 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts-site/blob/21a0a8af/source/announce-2015.md
--
diff --git a/source/announce-2015.md b/source/announce-2015.md
new file mode 100644
index 000..2b548ee
--- /dev/null
+++ b/source/announce-2015.md
@@ -0,0 +1,158 @@
+---
+layout: default
+title: Announcements
+---
+# Announcements
+
+
+ Skip to: Announcements - 2014
+
+
+ 1 October 2015 - Struts 2.5-BETA2 (BETA) {#a20151001}
+
+The Apache Struts group is pleased to announce that Struts 2.5-BETA2 is
available as a "BETA" release.
+
+Apache Struts 2 is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework is designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+This release contains several breaking changes and improvements just to
mention few of them:
+
+ - New security option was added - Strict Method Invocation (also known as
Strict DMI), see WW-4540
+ - Add support for latest stable AngularJS in Maven archetype, see WW-4522
+
+and many other improvements, please check the version notes
+
+The 2.5.x series of the Apache Struts framework has a minimum requirement of
the following specification versions:
+Servlet API 2.4, JSP API 2.0, and Java 7.
+
+Should any issues arise with your use of any version of the Struts framework,
please post your comments
+to the user list, and, if appropriate, file a tracking ticket.
+
+ 24 September 2015 - Struts 2.3.24.1 General Availability with Security
Fix Release {#a20150924}
+
+The Apache Struts group is pleased to announce that Struts 2.3.24.1 is
available as a "General Availability"
+release. The GA designation is our highest quality grade.
+
+Apache Struts 2 is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework is designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+One medium security issue was solved with this release:
+
+ - [S2-026](/docs/s2-026.html)
+Special `top` object can be used to access Struts' internals
+
+**All developers are strongly advised to perform this action.**
+
+The 2.3.x series of the Apache Struts framework has a minimum requirement of
the following specification versions:
+Servlet API 2.4, JSP API 2.0, and Java 6.
+
+Should any issues arise with your use of any version of the Struts framework,
+please post your comments to the user list, and, if appropriate, file a
tracking ticket.
+
+ 26 August 2015 - Security Bulletin S2-025 {#a20150826}
+
+The Apache Struts group is pleased to announce that a new security bulletin
was published -
+[S2-025](/docs/s2-025.html)
+
+Thanks to Taki Uchiyama from JPCERT/CC who reported two potential XSS
vulnerabilities available
+in older versions of The Apache Struts 2. Please read the mentioned security
bulletin for more details
+and also reading our [Security guideline](/docs/security.html) will help you
secure your application
+
+ 31 July 2015 - Struts 2.5-BETA1 (BETA) {#a20150731}
+
+The Apache Struts group is pleased to announce that Struts 2.5-BETA1 is
available as a "BETA"
+release.
+
+Apache Struts 2 is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework is designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+This release contains several breaking changes and improvements just to
mention few of them:
+
+ - XWork source was merged into Struts Core source, it means that there be no
more xwork artifact nor dedicated jar
+ - OGNL was upgraded to version 3.0.11 and it breaks access to properties as
it follows Java Bean Specification, see WW-4207 and WW-3909
+ - Spring dependency for tests and spring plugin was upgraded to version
4.1.6, see WW-4510.
+ - Struts2 internal logging api was marked as deprecated and was replaced with
new Log4j2 api as logging layer, see WW-4504.
+ - Struts2 is now build with JDK7, see WW-4503.
+ - New plugin to support bean validation is
