[struts] branch master updated: WW-5086 Fixes s:set tag to persists empty body
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
The following commit(s) were added to refs/heads/master by this push:
new 5e7c921 WW-5086 Fixes s:set tag to persists empty body
5e7c921 is described below
commit 5e7c921d4d41d8a89fea66c3a1bef97506ba3e91
Author: Lukasz Lenart
AuthorDate: Mon Aug 17 09:45:15 2020 +0200
WW-5086 Fixes s:set tag to persists empty body
---
core/src/main/java/org/apache/struts2/components/Set.java | 6 +-
core/src/main/java/org/apache/struts2/views/jsp/SetTag.java | 8 ++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/core/src/main/java/org/apache/struts2/components/Set.java
b/core/src/main/java/org/apache/struts2/components/Set.java
index fb2a366..ff1a27c 100644
--- a/core/src/main/java/org/apache/struts2/components/Set.java
+++ b/core/src/main/java/org/apache/struts2/components/Set.java
@@ -93,7 +93,11 @@ public class Set extends ContextBean {
Object o;
if (value == null) {
-o = body;
+if (body == null) {
+o = findValue("top");
+} else {
+o = body;
+}
} else {
o = findValue(value);
}
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
b/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
index a1b04e5..5817203 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
@@ -68,9 +68,13 @@ public class SetTag extends ContextBeanTag {
@Override
protected String getBody() {
if (trimBody) {
-return super.getBody();
+if (bodyContent == null) {
+return null;
+} else {
+return bodyContent.getString().trim();
+}
} else {
-return (bodyContent == null ? "" : bodyContent.getString());
+return (bodyContent == null ? null : bodyContent.getString());
}
}
}
[struts] branch struts-2-5-x updated: WW-5086 Fixes s:set tag to persists empty body
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/struts-2-5-x by this push:
new 22c88fa WW-5086 Fixes s:set tag to persists empty body
22c88fa is described below
commit 22c88faf388e9d9bfa25672136081d27a7a04117
Author: Lukasz Lenart
AuthorDate: Mon Aug 17 09:45:15 2020 +0200
WW-5086 Fixes s:set tag to persists empty body
---
core/src/main/java/org/apache/struts2/components/Set.java | 6 +-
core/src/main/java/org/apache/struts2/views/jsp/SetTag.java | 8 ++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/core/src/main/java/org/apache/struts2/components/Set.java
b/core/src/main/java/org/apache/struts2/components/Set.java
index fb2a366..ff1a27c 100644
--- a/core/src/main/java/org/apache/struts2/components/Set.java
+++ b/core/src/main/java/org/apache/struts2/components/Set.java
@@ -93,7 +93,11 @@ public class Set extends ContextBean {
Object o;
if (value == null) {
-o = body;
+if (body == null) {
+o = findValue("top");
+} else {
+o = body;
+}
} else {
o = findValue(value);
}
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
b/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
index f369bca..2116a9f 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
@@ -68,9 +68,13 @@ public class SetTag extends ContextBeanTag {
@Override
protected String getBody() {
if (trimBody) {
-return super.getBody();
+if (bodyContent == null) {
+return null;
+} else {
+return bodyContent.getString().trim();
+}
} else {
-return (bodyContent == null ? "" : bodyContent.getString());
+return (bodyContent == null ? null : bodyContent.getString());
}
}
}
[struts] 03/03: WW-5077 Adjusts DMI aware Regex to be more narrowed
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 6d865b6aa08b4327ad2049d576b838990cf2077d
Author: Lukasz Lenart
AuthorDate: Fri Jul 17 08:08:57 2020 +0200
WW-5077 Adjusts DMI aware Regex to be more narrowed
---
.../opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
b/core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
index 57ffba0..0489147 100644
---
a/core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
+++
b/core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
@@ -36,11 +36,11 @@ public class DefaultAcceptedPatternsChecker implements
AcceptedPatternsChecker {
private static final Logger LOG =
LogManager.getLogger(DefaultAcceptedPatternsChecker.class);
public static final String[] ACCEPTED_PATTERNS = {
-
"\\w+((\\.\\w+)|(\\[\\d+\\])|(\\(\\d+\\))|(\\['(\\w|[\\u4e00-\\u9fa5])+'\\])|(\\('(\\w|[\\u4e00-\\u9fa5])+'\\)))*"
+
"\\w+((\\.\\w+)|(\\[\\d+])|(\\(\\d+\\))|(\\['(\\w|[\\u4e00-\\u9fa5])+'])|(\\('(\\w|[\\u4e00-\\u9fa5])+'\\)))*"
};
public static final String[] DMI_AWARE_ACCEPTED_PATTERNS = {
-
"\\w+([:]?\\w+)*((\\.\\w+)|(\\[\\d+\\])|(\\(\\d+\\))|(\\['(\\w|[\\u4e00-\\u9fa5])+'\\])|(\\('(\\w|[\\u4e00-\\u9fa5])+'\\)))*([!]?\\w+)*"
+
"\\w+([:]?\\w+)?((\\.\\w+)|(\\[\\d+])|(\\(\\d+\\))|(\\['(\\w|[\\u4e00-\\u9fa5])+'])|(\\('(\\w|[\\u4e00-\\u9fa5])+'\\)))*([!]?\\w+)?"
};
private Set acceptedPatterns;
[struts] 01/03: WW-5077 Uses a different pattern if DMI is enabled
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 ee8cdc38d4b9d7486b9f3e2c5d741919e70d26d7
Author: Lukasz Lenart
AuthorDate: Sat Jul 11 20:31:30 2020 +0200
WW-5077 Uses a different pattern if DMI is enabled
---
.../security/DefaultAcceptedPatternsChecker.java | 22 +++-
.../security/DefaultExcludedPatternsChecker.java | 2 +-
.../DefaultAcceptedPatternsCheckerTest.java| 136 +
3 files changed, 103 insertions(+), 57 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
b/core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
index 58bb891..5bae39c 100644
---
a/core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
+++
b/core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
@@ -20,6 +20,7 @@ package com.opensymphony.xwork2.security;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.TextParseUtil;
+import org.apache.commons.lang3.BooleanUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.StrutsConstants;
@@ -35,7 +36,11 @@ public class DefaultAcceptedPatternsChecker implements
AcceptedPatternsChecker {
private static final Logger LOG =
LogManager.getLogger(DefaultAcceptedPatternsChecker.class);
public static final String[] ACCEPTED_PATTERNS = {
-
"\\w+((\\.\\w+)|(\\[\\d+\\])|(\\(\\d+\\))|(\\['(\\w|[\\u4e00-\\u9fa5])+'\\])|(\\('(\\w|[\\u4e00-\\u9fa5])+'\\)))*"
+
"\\w+((\\.\\w+)|(\\[\\d+])|(\\(\\d+\\))|(\\['(\\w|[\\u4e00-\\u9fa5])+'])|(\\('(\\w|[\\u4e00-\\u9fa5])+'\\)))*"
+};
+
+public static final String[] DMI_AWARE_ACCEPTED_PATTERNS = {
+
"\\w+([:]?\\w+)*((\\.\\w+)|(\\[\\d+])|(\\(\\d+\\))|(\\['(\\w|[\\u4e00-\\u9fa5])+'])|(\\('(\\w|[\\u4e00-\\u9fa5])+'\\)))*([!]?\\w+)*"
};
private Set acceptedPatterns;
@@ -44,10 +49,21 @@ public class DefaultAcceptedPatternsChecker implements
AcceptedPatternsChecker {
setAcceptedPatterns(ACCEPTED_PATTERNS);
}
+public DefaultAcceptedPatternsChecker(
+@Inject(value =
StrutsConstants.STRUTS_ENABLE_DYNAMIC_METHOD_INVOCATION, required = false)
String dmiValue
+) {
+if (BooleanUtils.toBoolean(dmiValue)) {
+LOG.debug("DMI is enabled, adding DMI related accepted patterns");
+setAcceptedPatterns(DMI_AWARE_ACCEPTED_PATTERNS);
+} else {
+setAcceptedPatterns(ACCEPTED_PATTERNS);
+}
+}
+
@Inject(value = StrutsConstants.STRUTS_OVERRIDE_ACCEPTED_PATTERNS,
required = false)
protected void setOverrideAcceptedPatterns(String acceptablePatterns) {
LOG.warn("Overriding accepted patterns [{}] with [{}], be aware that
this affects all instances and safety of your application!",
-acceptedPatterns, acceptablePatterns);
+acceptedPatterns, acceptablePatterns);
acceptedPatterns = new HashSet<>();
try {
for (String pattern :
TextParseUtil.commaDelimitedStringToSet(acceptablePatterns)) {
@@ -88,7 +104,7 @@ public class DefaultAcceptedPatternsChecker implements
AcceptedPatternsChecker {
LOG.debug("Sets accepted patterns to [{}], note this impacts the
safety of your application!", patterns);
} else {
LOG.warn("Replacing accepted patterns [{}] with [{}], be aware
that this affects all instances and safety of your application!",
-acceptedPatterns, patterns);
+acceptedPatterns, patterns);
}
acceptedPatterns = new HashSet<>(patterns.size());
try {
diff --git
a/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
b/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
index 3b01c9d..276ab92 100644
---
a/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
+++
b/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
@@ -80,7 +80,7 @@ public class DefaultExcludedPatternsChecker implements
ExcludedPatternsChecker {
@Inject(StrutsConstants.STRUTS_ENABLE_DYNAMIC_METHOD_INVOCATION)
protected void setDynamicMethodInvocation(String dmiValue) {
-if (BooleanUtils.toBoolean(dmiValue) == false) {
+if (!BooleanUtils.toBoolean(dmiValue)) {
LOG.debug("DMI is disabled, adding DMI related excluded patterns");
setAdditionalExcludePatterns("^(action|method):.*");
}
diff --git
a/core/src/test/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsCheckerTest.java
b/core/src/test/java/com/opensymphony/xwork2/security/Defa
[struts] 02/03: WW-5077 Restores escaped brackets
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 102b8280bec6492c38d38b93f6ebecb9bcd3b371
Author: Lukasz Lenart
AuthorDate: Thu Jul 16 07:30:06 2020 +0200
WW-5077 Restores escaped brackets
---
.../opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
b/core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
index 5bae39c..57ffba0 100644
---
a/core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
+++
b/core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
@@ -36,11 +36,11 @@ public class DefaultAcceptedPatternsChecker implements
AcceptedPatternsChecker {
private static final Logger LOG =
LogManager.getLogger(DefaultAcceptedPatternsChecker.class);
public static final String[] ACCEPTED_PATTERNS = {
-
"\\w+((\\.\\w+)|(\\[\\d+])|(\\(\\d+\\))|(\\['(\\w|[\\u4e00-\\u9fa5])+'])|(\\('(\\w|[\\u4e00-\\u9fa5])+'\\)))*"
+
"\\w+((\\.\\w+)|(\\[\\d+\\])|(\\(\\d+\\))|(\\['(\\w|[\\u4e00-\\u9fa5])+'\\])|(\\('(\\w|[\\u4e00-\\u9fa5])+'\\)))*"
};
public static final String[] DMI_AWARE_ACCEPTED_PATTERNS = {
-
"\\w+([:]?\\w+)*((\\.\\w+)|(\\[\\d+])|(\\(\\d+\\))|(\\['(\\w|[\\u4e00-\\u9fa5])+'])|(\\('(\\w|[\\u4e00-\\u9fa5])+'\\)))*([!]?\\w+)*"
+
"\\w+([:]?\\w+)*((\\.\\w+)|(\\[\\d+\\])|(\\(\\d+\\))|(\\['(\\w|[\\u4e00-\\u9fa5])+'\\])|(\\('(\\w|[\\u4e00-\\u9fa5])+'\\)))*([!]?\\w+)*"
};
private Set acceptedPatterns;
[struts] branch master updated (5e7c921 -> 6d865b6)
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 5e7c921 WW-5086 Fixes s:set tag to persists empty body new ee8cdc3 WW-5077 Uses a different pattern if DMI is enabled new 102b828 WW-5077 Restores escaped brackets new 6d865b6 WW-5077 Adjusts DMI aware Regex to be more narrowed The 3 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: .../security/DefaultAcceptedPatternsChecker.java | 22 +++- .../security/DefaultExcludedPatternsChecker.java | 2 +- .../DefaultAcceptedPatternsCheckerTest.java| 136 + 3 files changed, 103 insertions(+), 57 deletions(-)
[struts] branch struts-2-5-x updated: [maven-release-plugin] prepare release STRUTS_2_5_24
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch struts-2-5-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/struts-2-5-x by this push: new dcc5993 [maven-release-plugin] prepare release STRUTS_2_5_24 dcc5993 is described below commit dcc59937a8cdf9d5369909f1cf9fb23d15f1baad Author: Lukasz Lenart AuthorDate: Tue Aug 18 07:38:25 2020 +0200 [maven-release-plugin] prepare release STRUTS_2_5_24 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 6 +++--- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/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/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| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- pom.xml | 6 +++--- 35 files changed, 40 insertions(+), 40 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 39dcfb1..df2475a 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.24-SNAPSHOT +2.5.24 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 3f61f0e..c8b7aaf 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -2.5.24-SNAPSHOT +2.5.24 struts2-rest-showcase war -2.5.24-SNAPSHOT +2.5.24 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index a9dba6c..1f54def 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -2.5.24-SNAPSHOT +2.5.24 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 871fff5..a8e36d1 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.24-SNAPSHOT +2.5.24 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index fd66268..5e2977f 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -30,7 +30,7 @@ struts2-bom -2.5.24-SNAPSHOT +2.5.24 pom Struts 2 Bill of Materials @@ -45,7 +45,7 @@ -2.5.24-SNAPSHOT +2.5.24 true true @@ -181,7 +181,7 @@ -STRUTS_2_5_23 +STRUTS_2_5_24 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index ecd72ad..60ebf9d 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -2.5.24-SNAPSHOT +2.5.24 struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 360639a..6878b41 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -2.5.24-SNAPSHOT +2.5.24 struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 8225728..764cb32 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.24-SNAPSHOT +2.5.24 struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index b96b5c5..94fa90c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.24-SNAPSHOT +2.5.24 struts2-core jar diff --git a/plugins/bean-validation/pom.xml b/plugin
[struts] annotated tag STRUTS_2_5_24 created (now 5263960)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_2_5_24 in repository https://gitbox.apache.org/repos/asf/struts.git. at 5263960 (tag) tagging dcc59937a8cdf9d5369909f1cf9fb23d15f1baad (commit) replaces STRUTS_2_5_23 by Lukasz Lenart on Tue Aug 18 07:38:32 2020 +0200 - Log - [maven-release-plugin] copy for tag STRUTS_2_5_24 --- No new revisions were added by this update.
[struts] branch struts-2-5-x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch struts-2-5-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/struts-2-5-x by this push: new abb1ac3 [maven-release-plugin] prepare for next development iteration abb1ac3 is described below commit abb1ac3c997ed0195bf4bdfbd23543946782aa85 Author: Lukasz Lenart AuthorDate: Tue Aug 18 07:38:38 2020 +0200 [maven-release-plugin] prepare for next development iteration --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 6 +++--- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/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/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| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- pom.xml | 6 +++--- 35 files changed, 40 insertions(+), 40 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index df2475a..d735a2e 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.24 +2.5.25-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index c8b7aaf..e23f43d 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -2.5.24 +2.5.25-SNAPSHOT struts2-rest-showcase war -2.5.24 +2.5.25-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 1f54def..76b6341 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -2.5.24 +2.5.25-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index a8e36d1..06a9189 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.24 +2.5.25-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 5e2977f..c179814 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -30,7 +30,7 @@ struts2-bom -2.5.24 +2.5.25-SNAPSHOT pom Struts 2 Bill of Materials @@ -45,7 +45,7 @@ -2.5.24 +2.5.25-SNAPSHOT true true @@ -181,7 +181,7 @@ -STRUTS_2_5_24 +STRUTS_2_5_23 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 60ebf9d..92f6570 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -2.5.24 +2.5.25-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 6878b41..282330e 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -2.5.24 +2.5.25-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 764cb32..595b896 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.24 +2.5.25-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 94fa90c..a866593 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.24 +2.5.25-SNAPSHOT struts2-core jar diff --git a/plugins/bean-validatio
svn commit: r41019 - /dev/struts/2.5.24/
Author: lukaszlenart Date: Tue Aug 18 06:59:07 2020 New Revision: 41019 Log: Updates test release 2.5.24 Added: dev/struts/2.5.24/ dev/struts/2.5.24/struts-2.5.24-all.zip (with props) dev/struts/2.5.24/struts-2.5.24-all.zip.asc (with props) dev/struts/2.5.24/struts-2.5.24-all.zip.sha256 dev/struts/2.5.24/struts-2.5.24-all.zip.sha512 dev/struts/2.5.24/struts-2.5.24-apps.zip (with props) dev/struts/2.5.24/struts-2.5.24-apps.zip.asc (with props) dev/struts/2.5.24/struts-2.5.24-apps.zip.sha256 dev/struts/2.5.24/struts-2.5.24-apps.zip.sha512 dev/struts/2.5.24/struts-2.5.24-docs.zip (with props) dev/struts/2.5.24/struts-2.5.24-docs.zip.asc (with props) dev/struts/2.5.24/struts-2.5.24-docs.zip.sha256 dev/struts/2.5.24/struts-2.5.24-docs.zip.sha512 dev/struts/2.5.24/struts-2.5.24-lib.zip (with props) dev/struts/2.5.24/struts-2.5.24-lib.zip.asc (with props) dev/struts/2.5.24/struts-2.5.24-lib.zip.sha256 dev/struts/2.5.24/struts-2.5.24-lib.zip.sha512 dev/struts/2.5.24/struts-2.5.24-min-lib.zip (with props) dev/struts/2.5.24/struts-2.5.24-min-lib.zip.asc (with props) dev/struts/2.5.24/struts-2.5.24-min-lib.zip.sha256 dev/struts/2.5.24/struts-2.5.24-min-lib.zip.sha512 dev/struts/2.5.24/struts-2.5.24-src.zip (with props) dev/struts/2.5.24/struts-2.5.24-src.zip.asc (with props) dev/struts/2.5.24/struts-2.5.24-src.zip.sha256 dev/struts/2.5.24/struts-2.5.24-src.zip.sha512 Added: dev/struts/2.5.24/struts-2.5.24-all.zip == Binary file - no diff available. Propchange: dev/struts/2.5.24/struts-2.5.24-all.zip -- svn:mime-type = application/zip Added: dev/struts/2.5.24/struts-2.5.24-all.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.5.24/struts-2.5.24-all.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.5.24/struts-2.5.24-all.zip.sha256 == --- dev/struts/2.5.24/struts-2.5.24-all.zip.sha256 (added) +++ dev/struts/2.5.24/struts-2.5.24-all.zip.sha256 Tue Aug 18 06:59:07 2020 @@ -0,0 +1 @@ +7e04173ae33df822a76a60c03c8dc671b30cdeef7a7e8e8b909d885aeb9ee214 struts-2.5.24-all.zip Added: dev/struts/2.5.24/struts-2.5.24-all.zip.sha512 == --- dev/struts/2.5.24/struts-2.5.24-all.zip.sha512 (added) +++ dev/struts/2.5.24/struts-2.5.24-all.zip.sha512 Tue Aug 18 06:59:07 2020 @@ -0,0 +1 @@ +36a72c7a441d1a7642102e69f66cda3e11db064317feea334754fd018e255bd80897f62aa69a4c5c8c4ae0494888abe1798739316dd67d5ca185daac464b7e7c struts-2.5.24-all.zip Added: dev/struts/2.5.24/struts-2.5.24-apps.zip == Binary file - no diff available. Propchange: dev/struts/2.5.24/struts-2.5.24-apps.zip -- svn:mime-type = application/zip Added: dev/struts/2.5.24/struts-2.5.24-apps.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.5.24/struts-2.5.24-apps.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.5.24/struts-2.5.24-apps.zip.sha256 == --- dev/struts/2.5.24/struts-2.5.24-apps.zip.sha256 (added) +++ dev/struts/2.5.24/struts-2.5.24-apps.zip.sha256 Tue Aug 18 06:59:07 2020 @@ -0,0 +1 @@ +06a04e34b64874ab53ee12f1b812235fd99ae37eea792910dc5701ace247a55e struts-2.5.24-apps.zip Added: dev/struts/2.5.24/struts-2.5.24-apps.zip.sha512 == --- dev/struts/2.5.24/struts-2.5.24-apps.zip.sha512 (added) +++ dev/struts/2.5.24/struts-2.5.24-apps.zip.sha512 Tue Aug 18 06:59:07 2020 @@ -0,0 +1 @@ +0c372ae03997f8e54259af245e31e3f7b538c3b1a5c45ea2f990f044e8d34533a26a44429ee71988587c052c1ccbf3d460baf73f4d46a2de683068e355b5f076 struts-2.5.24-apps.zip Added: dev/struts/2.5.24/struts-2.5.24-docs.zip == Binary file - no diff available. Propchange: dev/struts/2.5.24/struts-2.5.24-docs.zip -- svn:mime-type = application/zip Added: dev/struts/2.5.24/struts-2.5.24-docs.zip.asc == Binary file - no diff available. Propchange: dev/st
