4504e610f1
Merge pull request #425 from apache/WW-5077-dmi-aware
...
[WW-5077] DMI aware pattern
2020-07-17 14:16:36 +04:30
9b3a23eb28
WW-5077 Adjusts DMI aware Regex to be more narrowed
2020-07-17 08:08:57 +02:00
3220d832d2
WW-5077 Restores escaped brackets
2020-07-16 07:30:06 +02:00
bd007953ea
Sets a proper timestamp as maven-jar-plugin doesn't support "now"
2020-07-11 20:39:55 +02:00
1b0c743e85
WW-5077 Uses a different pattern if DMI is enabled
2020-07-11 20:31:30 +02:00
89e02a4fb4
Adds outputTimestamp property to support reproducible build
...
See the link for more details
https://lists.apache.org/thread.html/r27ebcfec6431dc5f4830744e3567f082d8f140dc579f2a35408ea25c%40%3Cusers.maven.apache.org%3E
2020-07-11 19:45:33 +02:00
8cb93ad39a
[maven-release-plugin] prepare for next development iteration
2020-07-02 07:53:53 +02:00
e8656d5737
[maven-release-plugin] prepare release STRUTS_2_5_23
2020-07-02 07:53:39 +02:00
7f10ed505f
Merge pull request #419 from apache/WW-5077-better-logs
...
[WW-5077] Better logs
2020-05-24 09:32:56 +02:00
043814b774
WW-5077 Uses better logging to inform user about excluded params
2020-05-24 08:59:40 +02:00
0fabde9f97
Merge pull request #417 from JCgH4164838Gh792C124B5/LL_tiny-improvements_unittest
...
Provide unit test for partial backport PR#416 for 2.5.x
2020-05-18 07:49:51 +02:00
4457f03c70
Provide unit test for partial backport of L. Lenart's PR#414 to 2.5.x:
...
- DispatcherTest provides code coverage tests of all getLocale() paths.
2020-05-17 14:20:41 -04:00
3d3512a399
Merge pull request #416 from JCgH4164838Gh792C124B5/Partial_Backport_LL_tiny-improvements
...
Partial backport of Tiny improvements PR#414 to 2.5.x:
2020-05-17 08:58:49 +02:00
59a6cbf6ca
Partial backport of L. Lenart's PR#414 to 2.5.x:
...
- Improve Dispatcher getLocale() handling if running in AppEngine.
- Implemented the same improvement to the defaultLocale logic path within
getLocale().
2020-05-16 18:48:35 -04:00
19802b0614
Bumps struts-master and maven-site-plugin
2020-05-14 07:21:48 +02:00
e46e662a7a
Merge pull request #411 from JCgH4164838Gh792C124B5/WW-5072_fix
...
Minor change to fix WW-5072
2020-05-03 12:00:20 +02:00
4786fba0d7
Minor change to fix WW-5072 (single file upload failure):
...
- Add action-local method to get upload file size.
- Change file upload validation to use new method.
2020-05-02 17:51:45 -04:00
e32bd7dba9
Merge pull request #405 from apache/WW-5065-append-or-not
...
[WW-5065] Defines a new flag to control appending params
2020-04-26 19:51:29 +02:00
6e1d2add07
WW-5065 Adds missing flag value
2020-04-24 09:33:06 +02:00
2eeac367fe
WW-5065 Cleans up code and marks old constructor as deprecated
2020-04-24 09:32:50 +02:00
30b43044a3
WW-5065 Defines a new flag to control appending params
2020-04-23 07:13:14 +02:00
5c82f0246e
Merge pull request #400 from atkaiser/WW5065-FixAbstractMatcherReplaceParams
...
[WW-5065] Removing unnecessary part of AbstractMatcher#replaceParameters
2020-04-22 06:59:21 +02:00
fff35cfd9d
Merge pull request #402 from JCgH4164838Gh792C124B5/WW-5067-25x-Fix1
...
WW-5067-Fix1 (correct accidental artifactId change)
2020-04-20 07:45:58 +02:00
1526b36dd6
Merge pull request #404 from JCgH4164838Gh792C124B5/WW-5069
...
Initial fix for WW-5069 (improve build behaviour JDK9+)
2020-04-20 07:23:57 +02:00
6d6a422db7
Initial fix for WW-5069:
...
- Force US Locale for two tests that use date strings of the form
MM/DD/CCYY.
- When the tests/build are run in an environment with a non-US Locale
and newer JDKs the tests may fail due to inability to parse the US date
format.
Note: Was noticed on Windows 10 with JDK11, but could affect other
environments when run in a non-US Locale.
2020-04-19 21:50:09 -04:00
5cf57b9132
WW-5067-Fix1
...
- Accidental change of artifactId when groupId was changed for weld-se in
original PR. This commit restores the originally intended artifactId.
2020-04-18 15:49:44 -04:00
f4c0135878
Merge pull request #401 from JCgH4164838Gh792C124B5/WW-5067-25x
...
Proposed WW-5067 change
2020-04-13 09:08:26 +02:00
77cfae3084
Proposed WW-5067 change.
...
------
Proposed list of library version updates:
---
- cdi-api 1.0-SP4 -> 1.2
- weld-core 1.0.1-SP4 -> 2.2.16.SP1
- weld-se 1.0.1-Final -> weld-se-core 2.2.16.SP1
- slf4j-api 1.7.28 -> 1.7.30
- slf4j-simple 1.7.28 -> 1.7.30
- jackson 2.10.0 -> 2.10.3
- ognl 3.1.26 -> 3.1.28
- asm 7.1 -> 7.3.1
- spring 4.3.25.RELEASE -> 4.3.26.RELEASE
- freemarker 2.3.28 -> 2.3.30
- org.apache.felix.main 4.6.1 -> 6.0.3
---
Proposed list of Maven plugin version updates:
---
- doxia-core 1.8 -> 1.9.1
- doxia-module-markdown 1.7 -> 1.9.1
- maven-project-info-reports-plugin 2.7 -> 3.0.0
- updateimpact-maven-plugin 1.0.10 -> 1.0.12
- maven-surefire-plugin 2.22.1 -> 3.0.0-M4
- maven-war-plugin 2.1 -> 3.2.3
- maven-dependency-plugin 2.10 -> 3.1.2
- dependency-check-maven 3.3.4 -> 5.3.2
Note: Unable to upgrade maven-bundle-plugin past 2.1.0 as it introduced
OOM during JDK7 builds with default heap settings.
---
2020-04-12 23:38:43 -04:00
ec56290056
Removing unnecessary part of AbstractMatcher#replaceParameters method and adding a test to make sure it is working correctly
2020-04-08 11:23:02 -07:00
47c87bc62c
Merge pull request #385 from JCgH4164838Gh792C124B5/local_25x_TstFix1
...
Fix incorrect encoding strings in FileUploadInterceptorTest
2019-12-01 12:34:54 +01:00
ce467b7fa5
Fix incorrect encoding strings provided in FileUPloadInterceptorTest
...
- Tests were using "text/html" which is not a valid character encoding.
No impact currently, but the tests could fail in the future if this is not
corrected. If the code is re-used elsewhere for a test of an action a
valid encoding will be needed.
- Switch to a predefined constant CharSet to get the string instead.
2019-11-30 16:06:05 -05:00
73eb6ed189
Adds a link to Struts Examples pages
2019-11-25 09:39:50 +01:00
80a91dc75f
[maven-release-plugin] prepare for next development iteration
2019-11-17 20:17:42 +01:00
a6edb0d5df
[maven-release-plugin] prepare release STRUTS_2_5_22
2019-11-17 20:17:20 +01:00
3dfc5a4074
Disable expressionMaxLength by default for Struts 2.5.x. ( #380 )
...
* Disable struts.ognl.expressionMaxLength by default for Struts 2.5.x.
- Commented out struts.ognl.expressionMaxLength line in default.properties
and provided in-place comments about its usage.
- Changed OgnlValueStack.handleOgnlException() methods to output error
instead of warn for failures to evaluate expressions due to security
constraints.
- Updated existing unit tests to compensate for change in default
behaviour.
- Added a unit test to confirm default behaviour for
struts.ognl.expressionMaxLength is disabled.
* Updated commit for disable struts.ognl.expressionMaxLength by default for
Struts 2.5.x
- Additional unit test requested by Y. Zamani for code coverage.
- Corrected accidental use of wrong (static) toString method in one test.
- Addition of a minimum struts.ognl.expressionMaxLength value permitted
by Struts 2 (128). Any value smaller than that is likely to be a
configuration error and if a user really wishes to force it they may go to
OGNL directly to do so.
* Updated commit for disable struts.ognl.expressionMaxLength by default for
Struts 2.5.x
- Removed minimum struts.ognl.expressionMaxLength (restored to previous
behaviour) as requested by Y. Zamani and L. Lenart.
- Updated unit tests to compensate for the above change.
- Changed log output from warn to error in applyExpressionMaxLength() on
exception since it will likely be considered a fatal condition.
2019-11-16 20:09:19 +03:30
fdfeb3233a
Uses the latest struts-master
2019-11-07 20:41:58 +01:00
ae3ae2be76
[maven-release-plugin] prepare for next development iteration
2019-11-07 20:18:06 +01:00
8dface4fcb
[maven-release-plugin] prepare release STRUTS_2_5_21
2019-11-07 20:17:01 +01:00
1348971d40
Merge pull request #378 from JCgH4164838Gh792C124B5/local_25x_CfgChg1
...
Minor follow-up changes to PR #371
2019-11-04 08:32:03 +01:00
dd6d206d78
Additional change
...
- added unit test (hoping to make coveralls happy).
2019-11-02 14:11:21 -04:00
e2b644a4fb
Minor follow-up changes to PR #371
...
- added some additional exclusions in struts-default.xml.
- added log warning that specifies the value of maxLength involved if
applyExpressionMaxLength(maxLength) fails.
- added null guards to two handleOgnlException() methods that could
result in an NPE with #371 changes (a null OgnlException parameter
was permissible previously, correct or not).
2019-11-02 13:31:09 -04:00
13cfba86f8
Merge pull request #371 from yasserzamani/WW-5041
...
WW-5041 Upgrade to OGNL 3.1.26 and adapt to its new features
2019-10-30 08:18:01 +01:00
d84d59f53c
Merge branch 'struts-2-5-x' into WW-5041
2019-10-30 07:50:01 +01:00
3651f55869
Merge pull request #376 from sepe81/update-jackson-to-210
...
WW-5042 Upgrade jackson-databind to version 2.10.0
2019-10-16 13:39:13 +02:00
7ffa750c68
WW-5042 Upgrade jackson-databind to version 2.10.0
...
(cherry picked from commit 4556f404bd
2019-10-15 18:40:33 +02:00
313876aa3c
Merge pull request #372 from JCgH4164838Gh792C124B5/local_25x_LibUpd4
...
Update multiple Struts 2.5.x libraries to more recent versions.
2019-10-09 07:24:42 +02:00
9d7a9f81db
Remove jackson-databind 2.9.9.x comment from pom.xml as requested by
...
S. Peters and L. Lenart.
2019-10-08 21:01:14 -04:00
fe98223724
Update multiple Struts 2.5.x libraries to more recent versions.
...
Relates to WW-5033 and PRs: #356 , #362 . Updated libraries:
Spring Platform 4.3.24 -> 4.3.25
Log4j2 2.11.2 -> 2.12.1
Jackson 2.9.9 -> 2.9.10 (allows removal of jackson 2.9.9.3 "micro patch"
entry, taking care of pom.xml FIXME).
stax2-api 4.1 -> 4.2 (noted during Jackson update)
Fluido Skin 1.7 -> 1.8
SLF4J 1.7.26 -> 1.7.28
2019-10-06 18:29:57 -04:00
1de94b2092
WW-5041 Upgrade to OGNL 3.1.26 and adapt to its new features
2019-10-01 14:57:46 +03:30
706bb560e4
Merge pull request #367 from JCgH4164838Gh792C124B5/local_25x_SendRedirectEnh
...
Minor improvement proposed for ServletRedirectResult sendRedirect()
2019-09-23 08:54:14 +02:00
Yasser Zamani