Commit Graph

  • 9088405b0f Fix compile issue of jasper plugin with latest jasper version Johannes Geppert 2019-02-09 15:35:12 +01:00
  • bbe46e92f0 Fix compile issue of post order test example with latest http client version Johannes Geppert 2019-02-09 15:32:02 +01:00
  • 95866c347e Use latest available hibernate-validator version for bean validation test scope Johannes Geppert 2019-02-09 15:08:06 +01:00
  • 75d252554b Solve some dependency convergence issues reported by maven enforce plugin Johannes Geppert 2019-02-09 15:04:22 +01:00
  • 67d40ce12a Add maven enforce plugin with rule to avoid dependency convergence issues Johannes Geppert 2019-02-09 15:03:46 +01:00
  • c58e49223d Merge pull request #330 from aleksandr-m/feature/java8_date Lukasz Lenart 2019-02-07 08:12:02 +01:00
  • 2a92b71aaf Merge pull request #331 from aleksandr-m/feature/jenkins_badge Lukasz Lenart 2019-02-07 08:05:59 +01:00
  • 1a5653ad9b Update jenkins badge Aleksandr Mashchenko 2019-02-06 23:14:58 +02:00
  • aacac5b9fc WW-5016 Support java8 date/time in date tag Aleksandr Mashchenko 2019-02-06 23:06:09 +02:00
  • f3fb36b834 Merge pull request #329 from aleksandr-m/feature/WW-5009_master Yasser Zamani 2019-02-05 14:38:24 +03:30
  • fdd1054070 Merge pull request #328 from aleksandr-m/feature/WW-5009 Yasser Zamani 2019-02-05 14:37:57 +03:30
  • f6e0cdeb67 WW-4991 Not existing property in listValueKey throws exception Aleksandr Mashchenko 2019-02-04 22:06:26 +02:00
  • 32e88d1a2e Merge pull request #322 from aleksandr-m/feature/WW-4991 Aleksandr Mashchenko 2019-02-04 21:52:26 +02:00
  • 48fe791eef Merge pull request #312 from aleksandr-m/feature/java8 Lukasz Lenart 2019-02-04 13:19:28 +01:00
  • 9d4e720922 upgrade to ASM 7 Yasser Zamani 2019-01-23 16:24:40 +03:30
  • 6403de4516 Merge pull request #315 from yasserzamani/WW-5005 Lukasz Lenart 2019-02-04 10:57:33 +01:00
  • a3085373c6 Adds a link to JavaDocs Lukasz Lenart 2019-02-04 10:57:14 +01:00
  • 13c517fc3c Merge branch 'struts-2-5-x' into WW-5005 Yasser Zamani 2019-02-04 12:47:23 +03:30
  • be457f4241 WW-5009 EmptyStackException in JSON plugin due to concurrency Aleksandr Mashchenko 2019-02-03 21:41:08 +02:00
  • 7242a87165 WW-5009 Fix tests Aleksandr Mashchenko 2019-02-03 12:58:43 +02:00
  • 0323795d67 WW-5009 EmptyStackException in JSON plugin due to concurrency Aleksandr Mashchenko 2019-02-03 12:41:18 +02:00
  • 5d663b3193 Merge pull request #325 from lukaszlenart/upgrade-depdency-check Yasser Zamani 2019-02-03 13:39:09 +03:30
  • 4410feb1da Upgrades OWASP dependency-check-plugin to version 4.0.2 Lukasz Lenart 2019-02-01 08:15:20 +01:00
  • efd5a7c7ab Merge pull request #320 from JCgH4164838Gh792C124B5/localS2_26x_B2 Aleksandr Mashchenko 2019-01-31 17:39:35 +02:00
  • 71267a9b4b Revert some changes to be more consistent with 2.6 version Aleksandr Mashchenko 2019-01-31 17:32:36 +02:00
  • 5524c579d2 Fix for NPE issue discovered in WW-5004. (#316) JCgH4164838Gh792C124B5 2019-01-31 09:31:41 -05:00
  • 64bd12b26d Fix for access issue for 2.6 discovered in WW-5004 (Minor update to previous commit): - Restored ability to access public static fields (true by default). - Introduced a boolean configuration flag (allowStaticFieldAccess). - Replaced one remaining Boolean.parseBoolean() conversion in OgnlUtil use BooleanUtils.toBoolean(). - Enhanced unit tests to confirm proper operation of the fix. - Replicating L. Lenart's change in PR#317: - Removed injection parameter for setAllowStaticMethodAccess in OgnlValueStackFactory. - Replaced with lazy retrieval of allowStaticMethodAccess from container. - Used same pattern for the new allowStaticFieldAccess flag. - Added retrieval methods for both flags from the container. - Optimized calling sequence of isAccessible() based on feedback from previous commit. - Made a couple of getters and the protected checkXXX methods final (avoid descendant interference). JCgH4164838Gh792C124B5 2019-01-30 18:31:51 -05:00
  • 873ca8fa20 WW-4991 Not existing property in listValueKey throws exception Aleksandr Mashchenko 2019-01-30 23:10:06 +02:00
  • 14c4c52be9 Excludes Jenkinsfile from license check Lukasz Lenart 2019-01-30 20:44:22 +01:00
  • 66a3f82d7b Allows use Jenkinsfile syntax in IDEA Lukasz Lenart 2019-01-30 20:39:53 +01:00
  • 925eb62949 Fix for access issue for 2.6 discovered in WW-5004 (2nd amended commit): - Restored ability to access public static fields (true by default). - Introduced a boolean configuration flag (allowStaticFieldAccess). - Replaced one remaining Boolean.parseBoolean() conversion in OgnlUtil use BooleanUtils.toBoolean(). - Enhanced unit tests to confirm proper operation of the fix. - Replicating L. Lenart's change in PR#317: - Removed injection parameter for setAllowStaticMethodAccess in OgnlValueStackFactory. - Replaced with lazy retrieval of allowStaticMethodAccess from container. - Used same pattern for the new allowStaticFieldAccess flag. - Added retrieval methods for both flags from the container. JCgH4164838Gh792C124B5 2019-01-28 02:45:57 -05:00
  • 4d7deafb6b Drops empty lines Lukasz Lenart 2019-01-30 18:50:12 +01:00
  • 6183fa0147 Merge pull request #319 from lukaszlenart/WW-5007-jackson-ugrade-s26 Yasser Zamani 2019-01-25 15:29:30 +03:30
  • 8988d57644 Merge pull request #318 from lukaszlenart/WW-5007-jackson-ugrade-s25 Yasser Zamani 2019-01-25 15:23:18 +03:30
  • 9029f159db WW-5007 Upgrades Jackson libraries to version 2.9.8 Lukasz Lenart 2019-01-25 12:36:22 +01:00
  • 2e7cf63964 WW-5007 Upgrades Jackson libraries to version 2.9.8 Lukasz Lenart 2019-01-25 12:29:48 +01:00
  • b743ae56ca Minor cleanup/consistency changes for 3 modules. - Made a private ConcurrentMap reference final, made initial sets immutable (consistency). - Made sets for Accepted and Excluded patterns checkers immutable in 2 modules (consistency). - Added @Override annotations missing from a few methods in 2 modules. - Updated the 3 relevant unit tests to verify immutable states of various sets. JCgH4164838Gh792C124B5 2019-01-24 14:47:45 +03:30
  • 3eb68be674 upgrade to ASM 7 Yasser Zamani 2019-01-23 16:24:40 +03:30
  • c9f279ec2e Merge pull request #314 from JCgH4164838Gh792C124B5/localS2_25x_B2 Yasser Zamani 2019-01-23 11:51:58 +03:30
  • 3d25d2fb15 Merge pull request #313 from lukaszlenart/WW-5001 Aleksandr Mashchenko 2019-01-22 23:33:48 +02:00
  • 881e1b2580 Minor cleanup/consistency changes for 3 modules. - Made a private ConcurrentMap reference final, made initial sets immutable (consistency). - Made sets for Accepted and Excluded patterns checkers immutable in 2 modules (consistency). - Added @Override annotations missing from a few methods in 2 modules. - Updated the 3 relevant unit tests to verify immutable states of various sets. JCgH4164838Gh792C124B5 2019-01-18 00:09:29 -05:00
  • fc81832e8a WW-5001 Adds support for struts-conversion.properties files Lukasz Lenart 2019-01-15 08:14:12 +01:00
  • 7625c3c09a Update .travis.yml Aleksandr Mashchenko 2019-01-12 18:33:11 +02:00
  • b909693c40 Update Jenkinsfile Aleksandr Mashchenko 2019-01-12 18:32:45 +02:00
  • 6ecd4b43ab Switch to Java 8 Aleksandr Mashchenko 2019-01-12 18:28:53 +02:00
  • 42ef17158f Merge pull request #1 from apache/master Aleksandr Mashchenko 2019-01-12 18:26:26 +02:00
  • aabed3e33f Merge pull request #311 from JCgH4164838Gh792C124B5/localS2_26x_B1 Lukasz Lenart 2019-01-10 08:52:20 +01:00
  • 7e724a0159 Merge pull request #307 from JCgH4164838Gh792C124B5/localS2_26_PluginFix1 Lukasz Lenart 2019-01-10 08:51:55 +01:00
  • 7a9d51f3b3 Equivalent to PR#309 for master (2.6.x) branch. - Removed most of the logging added in PR#292. - Left the added logging for the setExcludedPatterns and setAcceptedPatterns methods in their respective modules. L. Lenart's comment indicated their benefit outweighs overhead (not something that changes often). Made the if-else blocks consistent with preferred styling for the log blocks. - Removed a dangling "/**" start comment tag with no proper close (and the whitespace between it and the next "/**") in the OgnlValueStack module. JCgH4164838Gh792C124B5 2019-01-09 21:43:58 -05:00
  • b315b6e5fd WW-4998 I18nInterceptor's default storage should store locale Aleksandr Mashchenko 2019-01-07 17:29:46 +02:00
  • cb0ac7c440 [maven-release-plugin] prepare for next development iteration Lukasz Lenart 2019-01-09 09:00:04 +01:00
  • 96c38b27e4 [maven-release-plugin] prepare release STRUTS_2_5_20 STRUTS_2_5_20 Lukasz Lenart 2019-01-09 08:59:40 +01:00
  • e9108f0feb Merge pull request #310 from aleksandr-m/feature/WW-4998_i18ninterceptor Lukasz Lenart 2019-01-09 08:45:23 +01:00
  • 3653f6e9e1 Merge pull request #309 from JCgH4164838Gh792C124B5/localS2_25x_B1 Lukasz Lenart 2019-01-09 08:43:49 +01:00
  • 5a2323a19f Update after comments by Y. Zamani and L. Lenart - Reverted the 6 modified files back to 2.5.19 baseline. - Removed most of the logging added in PR#291. - Left the added logging for the setExcludedPatterns and setAcceptedPatterns methods in their respective modules. L. Lenart's comment indicated their benefit outweighs overhead (not something that changes often). Made the if-else blocks consistent with preferred styling for the log blocks. - Removed a dangling "/**" start comment tag with no proper close (and the whitespace between it and the next "/**" in the OgnlValueStack module. (Note: Amended previous commit) JCgH4164838Gh792C124B5 2019-01-06 23:27:32 -05:00
  • ea09a8828b WW-4998 I18nInterceptor's default storage should store locale Aleksandr Mashchenko 2019-01-07 17:29:46 +02:00
  • 094b6c5e3b Merge pull request #289 from lukaszlenart/WW-4972 Aleksandr Mashchenko 2019-01-06 22:16:27 +02:00
  • ab810c2121 Merge pull request #297 from lukaszlenart/WW-4996 Yasser Zamani 2019-01-06 09:27:01 +03:30
  • 17fe42c0f7 Update revision after comments by A. Mashchenko and S. Peters. JCgH4164838Gh792C124B5 2019-01-05 15:25:44 -05:00
  • 87fa5bddf2 Address dev<Mode log flooding concern raised by Greg Huber in the Struts Dev List review of 2.5.19. - Introduce a static count-limiter for the devMode set warning in OgnlValueStack. Limit warnings to 250 total, after which it switches to trace level logs to avoid log flooding. JCgH4164838Gh792C124B5 2019-01-04 16:31:06 -05:00
  • 0ecb482a11 WW-4972 Adds another test case to cover escaping Lukasz Lenart 2019-01-03 12:50:55 +01:00
  • a4bfb0d0f2 WW-4996 Fixes post rebase file name changes Lukasz Lenart 2019-01-03 11:14:02 +01:00
  • 19134516d8 WW-4996 Uses Struts* naming pattern instead of Default* Lukasz Lenart 2019-01-03 10:04:29 +01:00
  • c941326bf3 WW-4996 Reduces code duplication Lukasz Lenart 2019-01-03 09:52:17 +01:00
  • 6adfbed282 WW-4996 Renames and moves class to proper package to better expose its meaning Lukasz Lenart 2018-12-18 08:36:25 +01:00
  • 243a8c832b WW-4996 Refactors creator to use ObjectFactory#buildConverter method Moves class to a proper package and renames it to better expose its function as a default Struts implementation Lukasz Lenart 2018-12-18 08:33:31 +01:00
  • 46e14a80cc downgrade htmlunit to 2.24 to keep java 7 compatibility Yasser Zamani 2019-01-02 16:24:01 +03:30
  • 3eaeed1699 Update length check in testComplex() to compensate for miscalculation of expected length. - Test jsp is processed into a 218 line String, meaning 218 more characters (crlf vs lf) on Windows vs. Linux/Unix. JCgH4164838Gh792C124B5 2018-12-31 17:24:08 -05:00
  • fa90e01ba5 introduce integration tests with minimum needed changes (#301) Yasser Zamani 2018-12-31 19:21:49 +03:30
  • 83a0927935 Merge pull request #298 from sepe81/fix-sonar-warnings-for-DefaultTypeConverter Aleksandr Mashchenko 2018-12-31 13:12:34 +02:00
  • b2b3b556f3 Update Embedded JSP Plugin to utilize the most current Tomcat Juli/Jasper still compatible with JDK 7. - Replaced AnnotationHelper with InstanceHelper due to removal of AnnotationProcessor in Tomcat 7+. - Tomcat Juli/Jasper Maven artifact ids changed with Tomcat 7+. - Addition of tomcat-api dependency due to changes in Jasper for Tomcat 7+. - Applied changes to embedded plugin modules required due to Jasper API changes. - Additional unit tests for better test coverage. JCgH4164838Gh792C124B5 2018-12-31 01:16:24 -05:00
  • 6f05603ab0 WW-4972 Adds two simple test cases to cover incompatible improvements Lukasz Lenart 2018-12-30 18:12:27 +01:00
  • 35497649ba WW-4972 Uses proper statement to escape JS related events Lukasz Lenart 2018-12-30 17:50:25 +01:00
  • 45161e88f9 [maven-release-plugin] prepare for next development iteration Lukasz Lenart 2018-12-30 15:24:15 +01:00
  • 4456620b51 [maven-release-plugin] prepare release STRUTS_2_5_19 STRUTS_2_5_19 Lukasz Lenart 2018-12-30 15:23:53 +01:00
  • 60a1a2642a [maven-release-plugin] prepare release STRUTS_2_3_37 STRUTS_2_3_37 Yasser Zamani 2018-12-30 14:50:11 +03:30
  • d25a342bd2 Merge pull request #305 from lukaszlenart/WW-4975-struts23x Yasser Zamani 2018-12-30 10:15:48 +03:30
  • f4a8f42ca4 Merge pull request #304 from lukaszlenart/WW-4975-struts25x Yasser Zamani 2018-12-29 20:20:12 +03:30
  • 600203bbea Merge pull request #303 from lukaszlenart/WW-4975 Yasser Zamani 2018-12-29 20:19:47 +03:30
  • a775434272 Merge pull request #302 from lukaszlenart/WW-4938-test-and-fix Yasser Zamani 2018-12-29 20:19:11 +03:30
  • 6870fb7f79 WW-4975 Upgrades commons-fileupload to version 1.4 Lukasz Lenart 2018-12-29 17:23:44 +01:00
  • a6f8895c90 WW-4975 Upgrades commons-fileupload to version 1.4 Lukasz Lenart 2018-12-29 17:11:45 +01:00
  • 80a901d292 WW-4975 Upgrades commons-fileupload to version 1.4 Lukasz Lenart 2018-12-29 17:05:16 +01:00
  • a7524b04be WW-4938 Adds missing test case and properly fix injecting internal beans Lukasz Lenart 2018-12-29 16:36:15 +01:00
  • 45e2dd4632 Merge pull request #300 from lukaszlenart/WW-4938-fix Aleksandr Mashchenko 2018-12-23 22:06:46 +02:00
  • 3d20e80950 WW-4972 Uses built-in auto escaping instead of escaping each parameter Lukasz Lenart 2018-12-23 17:44:12 +01:00
  • d09d3dcb3c Fix behaviour for convertValue with value null Sebastian Peters 2018-12-21 23:42:03 +01:00
  • b58dc38c5c Add test for convertValue with BigInteger Sebastian Peters 2018-12-21 23:32:23 +01:00
  • ba493b46c5 Use parameterized Class<?> instead of raw type Sebastian Peters 2018-12-21 23:07:35 +01:00
  • f9272f8590 WW-4938 Reverts dropping injecting internal beans in Spring Factory Lukasz Lenart 2018-12-21 22:01:56 +01:00
  • ee759d273d Add generated tag html Aleksandr Mashchenko 2018-12-21 21:35:16 +02:00
  • cd434da6f0 WW-4995 Add trimBody attribute to set tag JCgH4164838Gh792C124B5 2018-12-21 14:33:31 -05:00
  • 46dbdbe018 Add generated tag html Aleksandr Mashchenko 2018-12-21 21:30:31 +02:00
  • 6f176cc5a7 Enhancement for s:set tag for 2.5.x to allow better tag body whitespace control. (#296) JCgH4164838Gh792C124B5 2018-12-20 10:59:30 -05:00
  • 95d4e8258d Updates and cleanup for some configuration-related items (2.6.x) (#292) JCgH4164838Gh792C124B5 2018-12-20 10:58:21 -05:00
  • db085dbeef Updates and cleanup for some configuration-related items (2.5.x). (#291) JCgH4164838Gh792C124B5 2018-12-20 06:55:34 -05:00
  • 3d120f59aa Add test for convertValue with BigDecimal Sebastian Peters 2018-12-19 21:47:39 +01:00
  • 59e174e34f Simplify nested else/if Sebastian Peters 2018-12-19 21:13:32 +01:00
  • e428d8d785 Add the "@Override" annotation Sebastian Peters 2018-12-18 21:53:04 +01:00
  • d99888da5e Fix warning: Use "BigDecimal.valueOf" instead Sebastian Peters 2018-12-18 21:52:31 +01:00