git commit: updated Struts 2 version to 2.3.16.2
Repository: struts-examples Updated Branches: refs/heads/crud_branch 192b912a8 -> 24bc0c60f updated Struts 2 version to 2.3.16.2 Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/24bc0c60 Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/24bc0c60 Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/24bc0c60 Branch: refs/heads/crud_branch Commit: 24bc0c60f88975d6cfba85e004d508d73926788b Parents: 192b912 Author: phillips1021 Authored: Fri May 2 07:39:19 2014 -0500 Committer: phillips1021 Committed: Fri May 2 07:39:19 2014 -0500 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts-examples/blob/24bc0c60/pom.xml -- diff --git a/pom.xml b/pom.xml index 8d4310e..26b106f 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ UTF-8 -2.3.16.1 +2.3.16.2 1.2.17
[3/3] git commit: Overrides pattern exclusion initialisation to allow test to pass
Overrides pattern exclusion initialisation to allow test to pass
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/519aefdc
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/519aefdc
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/519aefdc
Branch: refs/heads/develop
Commit: 519aefdc86add277a16e46d235328791d910177c
Parents: dddb273
Author: Lukasz Lenart
Authored: Fri May 2 14:50:34 2014 +0200
Committer: Lukasz Lenart
Committed: Fri May 2 14:50:34 2014 +0200
--
.../xwork2/interceptor/ParametersInterceptorTest.java| 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/519aefdc/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
--
diff --git
a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index 4414666..7084924 100644
---
a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++
b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -183,6 +183,10 @@ public class ParametersInterceptorTest extends
XWorkTestCase {
return result;
}
+@Override
+protected void initializeHardCodedExcludePatterns() {
+excludeParams = new HashSet();
+}
};
container.inject(pi);
[2/3] git commit: Additional use cases to check method access
Additional use cases to check method access
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ee3c8d56
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ee3c8d56
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ee3c8d56
Branch: refs/heads/feature/exclude-object-class
Commit: ee3c8d5630b077e2f2708bc4cbeeb933150a71fe
Parents: 53fb5ba
Author: Lukasz Lenart
Authored: Thu May 1 09:40:33 2014 +0200
Committer: Lukasz Lenart
Committed: Thu May 1 09:40:33 2014 +0200
--
.../opensymphony/xwork2/ognl/OgnlUtilTest.java | 54
1 file changed, 54 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/ee3c8d56/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
--
diff --git
a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
index d471183..98ff671 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
@@ -685,6 +685,24 @@ public class OgnlUtilTest extends XWorkTestCase {
assertEquals(expected.getMessage(), "Tree
[class[\"classLoader\"][\"defaultAssertionStatus\"]] trying access excluded
pattern [class]");
}
+public void testAvoidCallingMethodsOnObjectClassAsMap2() throws Exception {
+Foo foo = new Foo();
+OgnlUtil util = new OgnlUtil();
+util.setEnableExpressionCache("false");
+util.setExcludedProperties("class");
+
+Exception expected = null;
+try {
+
util.setValue("model['class']['classLoader']['defaultAssertionStatus']",
ActionContext.getContext().getContextMap(), foo, true);
+fail();
+} catch (OgnlException e) {
+expected = e;
+}
+assertNotNull(expected);
+assertSame(expected.getClass(), OgnlException.class);
+assertEquals(expected.getMessage(), "Tree
[class[\"classLoader\"][\"defaultAssertionStatus\"]] trying access excluded
pattern [class]");
+}
+
public void testAvoidCallingMethodsOnObjectClassAsMapWithQuotes() throws
Exception {
Foo foo = new Foo();
OgnlUtil util = new OgnlUtil();
@@ -721,6 +739,42 @@ public class OgnlUtilTest extends XWorkTestCase {
assertEquals(expected.getMessage(), "Tree [toString] trying access
excluded pattern [toString]");
}
+public void testAvoidCallingMethodsWithBraces() throws Exception {
+Foo foo = new Foo();
+OgnlUtil util = new OgnlUtil();
+util.setEnableExpressionCache("false");
+util.setExcludedProperties("toString");
+
+Exception expected = null;
+try {
+util.setValue("toString()",
ActionContext.getContext().getContextMap(), foo, true);
+fail();
+} catch (OgnlException e) {
+expected = e;
+}
+assertNotNull(expected);
+assertSame(expected.getClass(), OgnlException.class);
+assertEquals(expected.getMessage(), "Tree [toString()] trying access
excluded pattern [toString()]");
+}
+
+public void testAvoidCallingSomeClasses() throws Exception {
+Foo foo = new Foo();
+OgnlUtil util = new OgnlUtil();
+util.setEnableExpressionCache("false");
+util.setExcludedProperties("Runtime");
+
+Exception expected = null;
+try {
+util.setValue("@java.lang.Runtime@getRuntime().exec('mate')",
ActionContext.getContext().getContextMap(), foo, true);
+fail();
+} catch (OgnlException e) {
+expected = e;
+}
+assertNotNull(expected);
+assertSame(expected.getClass(), OgnlException.class);
+assertEquals(expected.getMessage(), "Tree [toString()] trying access
excluded pattern [toString()]");
+}
+
public static class Email {
String address;
[1/3] git commit: Extends patterns with parenthesis during initialisation
Repository: struts
Updated Branches:
refs/heads/develop dddb273b1 -> 519aefdc8
refs/heads/feature/exclude-object-class 5d8aa8a80 -> ee3c8d563
Extends patterns with parenthesis during initialisation
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/53fb5ba5
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/53fb5ba5
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/53fb5ba5
Branch: refs/heads/feature/exclude-object-class
Commit: 53fb5ba5f89c641a92a4f7bee7584e7764741572
Parents: 5d8aa8a
Author: Lukasz Lenart
Authored: Thu May 1 09:39:55 2014 +0200
Committer: Lukasz Lenart
Committed: Thu May 1 09:39:55 2014 +0200
--
.../main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java| 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/53fb5ba5/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index 81f9700..5e06977 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -89,7 +89,11 @@ public class OgnlUtil {
@Inject(value = XWorkConstants.OGNL_EXCLUDED_PROPERTIES, required = false)
public void setExcludedProperties(String commaDelimitedProperties) {
-excludedProperties =
TextParseUtil.commaDelimitedStringToSet(commaDelimitedProperties);
+Set props =
TextParseUtil.commaDelimitedStringToSet(commaDelimitedProperties);
+for (String prop : props) {
+excludedProperties.add(prop);
+excludedProperties.add(prop + "()");
+}
}
/**
@@ -309,8 +313,7 @@ public class OgnlUtil {
if (tree instanceof SimpleNode) {
SimpleNode node = (SimpleNode) tree;
for (String excludedPattern : excludedProperties) {
-// TODO lukaszlenart: need a better way to check 'toString'
and 'toString()' call
-if (excludedPattern.equalsIgnoreCase(node.toString()) ||
(excludedPattern + "()").equalsIgnoreCase(node.toString())) {
+if (excludedPattern.equalsIgnoreCase(node.toString())) {
throw new OgnlException("Tree [" + (parent != null ?
parent : tree) + "] trying access excluded pattern [" + excludedPattern + "]");
}
for (int i = 0; i < node.jjtGetNumChildren(); i++) {
git commit: Overrides pattern exclusion initialisation to allow test to pass
Repository: struts
Updated Branches:
refs/heads/master 1be8ed61e -> c9fd44fbd
Overrides pattern exclusion initialisation to allow test to pass
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c9fd44fb
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c9fd44fb
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c9fd44fb
Branch: refs/heads/master
Commit: c9fd44fbd552a8b3474fe846be2d2834453133ef
Parents: 1be8ed6
Author: Lukasz Lenart
Authored: Fri May 2 14:50:34 2014 +0200
Committer: Lukasz Lenart
Committed: Fri May 2 14:52:20 2014 +0200
--
.../xwork2/interceptor/ParametersInterceptorTest.java| 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/c9fd44fb/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
--
diff --git
a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index 4414666..7084924 100644
---
a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++
b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -183,6 +183,10 @@ public class ParametersInterceptorTest extends
XWorkTestCase {
return result;
}
+@Override
+protected void initializeHardCodedExcludePatterns() {
+excludeParams = new HashSet();
+}
};
container.inject(pi);
[1/2] git commit: Overrides pattern exclusion initialisation to allow test to pass
Repository: struts
Updated Branches:
refs/heads/develop 519aefdc8 -> d35072cd6
Overrides pattern exclusion initialisation to allow test to pass
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c9fd44fb
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c9fd44fb
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c9fd44fb
Branch: refs/heads/develop
Commit: c9fd44fbd552a8b3474fe846be2d2834453133ef
Parents: 1be8ed6
Author: Lukasz Lenart
Authored: Fri May 2 14:50:34 2014 +0200
Committer: Lukasz Lenart
Committed: Fri May 2 14:52:20 2014 +0200
--
.../xwork2/interceptor/ParametersInterceptorTest.java| 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/c9fd44fb/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
--
diff --git
a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index 4414666..7084924 100644
---
a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++
b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -183,6 +183,10 @@ public class ParametersInterceptorTest extends
XWorkTestCase {
return result;
}
+@Override
+protected void initializeHardCodedExcludePatterns() {
+excludeParams = new HashSet();
+}
};
container.inject(pi);
[2/2] git commit: Merge branch 'master' into develop
Merge branch 'master' into develop Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d35072cd Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d35072cd Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d35072cd Branch: refs/heads/develop Commit: d35072cd66f48205ac7e8affdfda8e6e6b86fa04 Parents: 519aefd c9fd44f Author: Lukasz Lenart Authored: Fri May 2 14:52:50 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 14:52:50 2014 +0200 -- --
[2/5] git commit: Uses the same logic as in ParametersInterceptor to use st of patterns to exclude cookies which tries to access Struts internal state
Uses the same logic as in ParametersInterceptor to use st of patterns
to exclude cookies which tries to access Struts internal state
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1a668af7
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1a668af7
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1a668af7
Branch: refs/heads/hotfix/2.3.16.3
Commit: 1a668af7f1ffccea4a3b46d8d8c1fe1c7331ff02
Parents: dbcdbd0
Author: Lukasz Lenart
Authored: Thu May 1 11:31:12 2014 +0200
Committer: Lukasz Lenart
Committed: Thu May 1 11:31:12 2014 +0200
--
.../struts2/interceptor/CookieInterceptor.java | 45 +++--
.../interceptor/CookieInterceptorTest.java | 53
2 files changed, 82 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/1a668af7/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
--
diff --git
a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
index 3e2e81d..340b57f 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
@@ -33,6 +33,7 @@ import org.apache.struts2.ServletActionContext;
import javax.servlet.http.Cookie;
import java.util.Collections;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
@@ -175,7 +176,13 @@ public class CookieInterceptor extends AbstractInterceptor
{
// Allowed names of cookies
private Pattern acceptedPattern = Pattern.compile(ACCEPTED_PATTERN,
Pattern.CASE_INSENSITIVE);
-private Pattern excludedPattern =
Pattern.compile(ExcludedPatterns.CLASS_ACCESS_PATTERN,
Pattern.CASE_INSENSITIVE);
+private Set excludedPatterns = new HashSet();
+
+public CookieInterceptor() {
+for (String pattern : ExcludedPatterns.EXCLUDED_PATTERNS) {
+excludedPatterns.add(Pattern.compile(pattern,
Pattern.CASE_INSENSITIVE));
+}
+}
/**
* Set the cookiesName which if matched will allow the cookie
@@ -253,13 +260,16 @@ public class CookieInterceptor extends
AbstractInterceptor {
* @return true|false
*/
protected boolean isAcceptableValue(String value) {
-boolean matches = !excludedPattern.matcher(value).matches();
-if (!matches) {
-if (LOG.isTraceEnabled()) {
-LOG.trace("Cookie value [#0] matches excludedPattern [#1]",
value, ExcludedPatterns.CLASS_ACCESS_PATTERN);
+for (Pattern excludedPattern : excludedPatterns) {
+boolean matches = !excludedPattern.matcher(value).matches();
+if (!matches) {
+if (LOG.isTraceEnabled()) {
+LOG.trace("Cookie value [#0] matches excludedPattern
[#1]", value, excludedPattern.toString());
+}
+return false;
}
}
-return matches;
+return true;
}
/**
@@ -293,23 +303,26 @@ public class CookieInterceptor extends
AbstractInterceptor {
}
/**
- * Checks if name of Cookie match {@link #excludedPattern}
+ * Checks if name of Cookie match {@link #excludedPatterns}
*
* @param name of Cookie
* @return true|false
*/
protected boolean isExcluded(String name) {
-boolean matches = excludedPattern.matcher(name).matches();
-if (matches) {
-if (LOG.isTraceEnabled()) {
-LOG.trace("Cookie [#0] matches excludedPattern [#1]", name,
ExcludedPatterns.CLASS_ACCESS_PATTERN);
-}
-} else {
-if (LOG.isTraceEnabled()) {
-LOG.trace("Cookie [#0] doesn't match excludedPattern [#1]",
name, ExcludedPatterns.CLASS_ACCESS_PATTERN);
+for (Pattern excludedPattern : excludedPatterns) {
+boolean matches = excludedPattern.matcher(name).matches();
+if (matches) {
+if (LOG.isTraceEnabled()) {
+LOG.trace("Cookie [#0] matches excludedPattern [#1]",
name, excludedPattern.toString());
+}
+return true;
+} else {
+if (LOG.isTraceEnabled()) {
+LOG.trace("Cookie [#0] doesn't match excludedPattern
[#1]", name, excludedPattern.toString());
+}
}
}
-return matches;
+return false;
}
/**
http://git-wip-us.apache.org/repos/asf/struts/blob/1a668af7/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
---
[5/5] git commit: Updates docs assembly with new location of exported pages
Updates docs assembly with new location of exported pages Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0761909c Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0761909c Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0761909c Branch: refs/heads/hotfix/2.3.16.3 Commit: 0761909c65f32a0df9fc392704bf9d248bfea2c8 Parents: bca525d Author: Lukasz Lenart Authored: Fri May 2 15:47:34 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 15:47:34 2014 +0200 -- assembly/src/main/assembly/docs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/0761909c/assembly/src/main/assembly/docs.xml -- diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml index 77dffcb..b1f9991 100644 --- a/assembly/src/main/assembly/docs.xml +++ b/assembly/src/main/assembly/docs.xml @@ -47,7 +47,7 @@ -target/cwiki/WW/docs +target/cwiki/ docs
[4/5] git commit: Sets version in poms to -SNAPSHOT
Sets version in poms to -SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bca525da Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bca525da Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bca525da Branch: refs/heads/hotfix/2.3.16.3 Commit: bca525da8ddf73da634b7e906254a66294293909 Parents: 769e815 Author: Lukasz Lenart Authored: Fri May 2 15:36:19 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 15:36:19 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/bca525da/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 6054fc4..81a88d5 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.2 +2.3.16.3-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 0aebae0..b77c977 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.2 +2.3.16.3-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index f2fc344..bb7ae7c 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-mailreader http://git-wip-us.apache.org/repos/asf/struts/blob/b
[3/5] 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/hotfix/2.3.16.3
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
[1/5] git commit: Correct type with release-plugin version
Repository: struts Updated Branches: refs/heads/hotfix/2.3.16.3 [created] 0761909c6 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/hotfix/2.3.16.3 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
git commit: [maven-release-plugin] prepare release STRUTS_2_3_16_3
Repository: struts Updated Branches: refs/heads/hotfix/2.3.16.3 0761909c6 -> e03ff7286 [maven-release-plugin] prepare release STRUTS_2_3_16_3 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e03ff728 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e03ff728 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e03ff728 Branch: refs/heads/hotfix/2.3.16.3 Commit: e03ff728618f5bf551083fc3a52d43c07434bbc9 Parents: 0761909 Author: Lukasz Lenart Authored: Fri May 2 17:10:41 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 17:10:41 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 | 4 ++-- xwork-core/pom.xml | 2 +- 51 files changed, 61 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 81a88d5..b7343c6 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.3-SNAPSHOT +2.3.16.3 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index b77c977..62c6803 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.3-SNAPSHOT +2.3.16.3 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index bb7ae7c..c41bb76 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.1
git commit: [maven-release-plugin] prepare for next development iteration
Repository: struts Updated Branches: refs/heads/hotfix/2.3.16.3 e03ff7286 -> bcffc256f [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bcffc256 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bcffc256 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bcffc256 Branch: refs/heads/hotfix/2.3.16.3 Commit: bcffc256fa27506588628a4df51977677c8d24aa Parents: e03ff72 Author: Lukasz Lenart Authored: Fri May 2 17:10:54 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 17:10:54 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 | 4 ++-- xwork-core/pom.xml | 2 +- 51 files changed, 61 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index b7343c6..317a2b4 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.3 +2.3.16.4-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 62c6803..1454f7b 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.3 +2.3.16.4-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index c41bb76..7814520 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -
Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_3_16_3 [created] 7e04a1a97
[CONF] Confluence Changes in the last 24 hours
Confluence Changes in the last 24 hours Apache Airavata Pages Page: GFac Description and Steps (Draft) created by Marlon Pierce [09:05 PM] Page: Airavata Orchestrator created by Marlon Pierce [09:07 PM] Page: Registry created by Marlon Pierce [09:05 PM] Page: Airavata Component Descriptions created by Marlon Pierce [09:03 PM] Page: Other Projects created by Eroma [08:13 PM] Page: Glossary created by Eroma [05:39 PM] Page: GSoC 2012 created by Eroma [03:14 PM] Page: Google Summer of Code edited by Eroma [04:10 PM] (View Changes) Page: FAQ created by Eroma [03:11 PM] Page: GSoC 2014 created by Eroma [03:26 PM] Page: University Final Year Projects created by Eroma [03:21 PM] Apache Ambari Pages Page: Blueprints edited by Jaimin [03:11 AM] (View Changes) Apache Camel Pages Blog: We welcome a new committer and a new PMC member created by Christian Mueller [05:06 PM] Page: Parallel Processing and Ordering edited by Henryk Konsek [09:11 AM] (View Changes) Page: HTTP4 edited by Gregor Zurowski [03:14 AM] (View Changes) Apache Cloudstack Pages Page: GPU and vGPU support for CloudStack Guest VMs edited by Sanjay Tripathi [08:47 AM] (View Changes) Comments Page: Test Execution for ACL/RBAC (IAM) has a new comment [ Parth Jagirdar ] Apache cTAKES Pages Page: YTEX Installation edited by Vijay Garla [06:02 PM] (View Changes) Apache CXF Documentation Pages Page: JAX-RS edited by Andrei Shakirin [01:00 PM] (View Changes)
