Commit Graph

1460 Commits

Author SHA1 Message Date
Lukasz Lenart d826efb9d0 WW-5070 Re-phrases JavaDoc for setRoot() method 2020-04-27 08:20:39 +02:00
Lukasz Lenart 48435c4209 WW-5070 Uses else if to avoid double operation on stack 2020-04-27 08:19:29 +02:00
Lukasz Lenart 333f781207 WW-5070 Generates a new serialVersionUID 2020-04-27 08:17:35 +02:00
Lukasz Lenart 19c71ff153 WW-5070 Adds more sophisticated logic to search for the Root 2020-04-25 09:24:36 +02:00
JCgH4164838Gh792C124B5 9d0a6a80ad Proposed WW-5068 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
    htmlunit 2.27.0 and 2.37.0 -> 2.39.0
    slf4j-api 1.7.29 -> 1.7.30
    slf4j-simple 1.7.29 -> 1.7.30
    log4j2 2.12.1 - > 2.13.1
    jackson 2.10.1 -> 2.10.3
    ognl 3.2.12 -> 3.2.14
    asm 7.2 -> 7.3.1
    spring 4.3.25.RELEASE -> 4.3.26.RELEASE
    fluido-skin 1.8 -> 1.9
    freemarker 2.3.28 -> 2.3.30
    org.apache.felix.main 4.6.1 -> 6.0.3
    velocity 2.1 -> 2.2
    junit 4.12 -> 4.13
    easymock 3.5.1 -> 4.2
    javax.el 3.0.1-b10 -> 3.0.1-b11
    jstl 1.1.2 -> 1.2
    tomcat-jasper 8.5.37 -> 8.5.53
    tomcat-api 8.5.37 -> 8.5.53
    tomcat-juli 8.5.37 -> 8.5.53
    commons-lang3 3.9 -> 3.10
    assertj-core 2.9.1 -> 3.15.0
    mockito-core 2.23.0 -> 3.3.3   (required exclusion for objenesis)
    testng 5.14.10 -> 7.1.0
    juneau-marshall 7.2.2 -> 8.1.3
    validation-api 1.1.0.Final -> 2.0.1.Final
    hibernate-validator 5.4.3.Final -> 6.1.2.Final
    jaxb-impl 2.3.1 -> 2.3.2
---
Proposed list of Maven plugin version updates:
---
    maven-project-info-reports-plugin 2.7 -> 3.0.0
    updateimpact-maven-plugin 1.0.10 -> 1.0.12
    maven-surefire-plugin 2.22.2 -> 3.0.0-M4
    jacoco-maven-plugin 0.8.4 - > 0.8.5
    maven-war-plugin 3.2.2 -> 3.2.3
    maven-bundle-plugin 3.5.0 -> 4.2.1
    maven-dependency-plugin 3.1.1 -> 3.1.2
    dependency-check-maven 5.2.4 -> 5.3.2
    maven-enforcer-plugin 3.0.0-M2 -> 3.0.0-M3
    maven-failsafe-plugin 2.22.2 -> 3.0.0-M4
    maven-site-plugin 3.8.2 -> 3.9.0
    doxia-core 1.9 -> 1.9.1
    doxia-module-markdown 1.9 -> 1.9.1
---
2020-04-18 18:40:21 -04:00
Lukasz Lenart a09ec6298c Drops duplicated dependency 2020-04-04 10:00:14 +02:00
JCgH4164838Gh792C124B5 c9ac74d0a1 Correction for previous commit message. There was a typo which should have
read: "copies one interface from
  org.springframework.mock.web.portlet.multipart" (not
  "org.apache.struts2.mock.web.portlet" which was incorrect).

Refactor (rename) junit-portlet plugin to portlet-mocks plugin.
- Moved StrutsPortletTestCase from the portlet plugin into the junit plugin
 (same package name).
- Added optional dependencies to the junit plugin for the portlet plugin
  and mocks plugin.
- Duplicated StrutsTestCase from the junit plugin with a new name
  StrutsTestCasePortletTests that exists within a test scope only.
  This was done to eliminate a dendency cycle between junit and portlet
  plugins during refactoring.
- Updated the portlet plugin unit tests to use StrutsTestCasePortletTests
  internally instead of StrutsTestCase from the junit plugin.
- Removed junit plugin dependency for portlets plugin, added test scope
  dependency for portlet-mocks plugin.
- Made StrutsSpringPortletMockObjectsTest depend only on TestCase.
- Removed unneeded dependencies from portlet-mocks pom.

Amended commit multiple times: Missed plugins pom.xml change, forgot to
drop StrutsPortletTestCase from portlet plugin (local repository).
2020-03-28 14:26:48 -04:00
JCgH4164838Gh792C124B5 000f7280d9 Fix for test running on JDK 9+. If using Spring 4.x mock objects the
MockServletContext has a dependency on javax.activation that causes a
java.lang.NoClassDefFoundError.
- Test updated to allow the single call that triggers this in JDK9+
to continue as long as the class not found is FileTypeMap (expected).
2020-03-22 15:37:20 -04:00
JCgH4164838Gh792C124B5 ec3532f30a Proposed implementation to address WW-5030.
Introduce new junit-portlet plugin.
- Utilizes a copy of org.springframework.mock.web.portlet package from
  Spring 4.3.x, refactored to org.apache.struts2.mock.web.portlet.  Also
  copies one interface from org.apache.struts2.mock.web.portlet.  The
  package-info.java files identify the package renaming.
- Provides test cases for the mock objects.
- Modifies the portlet plugin to use the junit-portlet plugin as a
  dependency.  Adds a small boundary case fix for PortletRequestMap.
2020-03-22 13:42:47 -04:00
Lukasz Lenart 9053c84d50 Merge pull request #394 from apache/WW-5047-new-velocity
[WW-5047] Upgrades to VelocityEngine 2.1 and VelocityTools 3.0
2020-02-24 09:36:11 +01:00
Lukasz Lenart d5bc76d772 WW-5047 Updates JavaDoc to match with new behaviour 2020-02-23 11:05:53 +01:00
Lukasz Lenart 35aae077c8 WW-5047 Marks previous constructors as deprecated 2020-02-23 10:55:42 +01:00
Lukasz Lenart 6da16931ef WW-5047 Lowers log level to debug 2020-02-01 16:45:30 +01:00
Lukasz Lenart 71d4a7be3b WW-5047 Upgrades to VelocityEngine 2.1 and VelocityTools 3.0 2020-02-01 12:49:01 +01:00
Lukasz Lenart 2c02100c29 WW-5054 Fixes links in config-browser 2020-01-12 12:08:59 +01:00
Lukasz Lenart a456b1fdd5 WW-5049 Reverts to static final as this will be refactored anyway 2019-12-29 09:10:08 +01:00
Lukasz Lenart 9c1b0cf1c2 WW-5049 Supports bean-selection via Java config 2019-12-29 09:10:08 +01:00
Lukasz Lenart 0009bdeb31 WW-5049 Drops unused files 2019-12-29 09:10:08 +01:00
Lukasz Lenart 7c6dfe1930 WW-5049 Sets proper order of configuration elements 2019-12-29 09:10:08 +01:00
Lukasz Lenart 868ec779bf WW-5049 Adds missing internal dependency 2019-12-29 09:07:00 +01:00
Lukasz Lenart 84f8438026 WW-5049 Renames default bean provider 2019-12-29 09:07:00 +01:00
Lukasz Lenart d0039d191b WW-5049 Drops name as not needed 2019-12-29 09:07:00 +01:00
Lukasz Lenart a7cfed7a96 WW-5049 Allows define a custom bean provider 2019-12-29 09:07:00 +01:00
Lukasz Lenart 5c55e69b4f WW-5049 Moves Velocity support into a dedicated plugin 2019-12-29 09:07:00 +01:00
Lukasz Lenart 140bea2e1c WW-5003 Drops XWorkException and uses StrutsException instead 2019-12-27 09:09:42 +01:00
Sebastian Peters 13b5b8e881 WW-5045 Update jasperreports to 6.10.0
and switch exclude from jackson-annotation to jackson-annotations
b/c the artifact name changed
2019-11-08 13:38:27 +01:00
Yasser Zamani 517c2d690b use Tiles already provided URLApplicationResource
fixes WW-5011
see also: https://github.com/joshlong/spring-framework/blob/910dd4146721a803cd9d246b91854e77ffe9272a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java#L88
2019-04-20 12:28:07 +04:30
Lukasz Lenart 3ee47f19c3 Merge pull request #335 from JCgH4164838Gh792C124B5/localS2_26x_Appfix2
Fix 2.6 Showcase bean-validator Java 11 failures.
2019-02-14 07:21:10 +01:00
JCgH4164838Gh792C124B5 a2ba5a0e62 Fix 2.6 Showcase bean-validator Java 11 failures.
The 2.6 Showcase application is throwing JAXB-classloading-related failures when deployed to a container running Java 11.
The stacktrace indicates the issues relate to the bean-validator and Hibernate-Validator (but no issues with Java 8).
Proposed fix:
1) Upgrade Showcase from 5.1.3.Final to 5.4.3.Final (most recent available).
2) Upgrade bean-validator from 5.4.1-Final to 5.4.3.Final (to match versions).
2019-02-14 01:03:44 -05:00
Yasser Zamani 28c9411015 delete deprecated sitegraph plugin 2019-02-11 16:53:20 +03:30
Johannes Geppert 2908d746ce Minor code optimization in jasper reports result 2019-02-10 16:15:38 +01:00
Johannes Geppert 9088405b0f Fix compile issue of jasper plugin with latest jasper version 2019-02-09 15:35:12 +01:00
Johannes Geppert 95866c347e Use latest available hibernate-validator version for bean validation test scope 2019-02-09 15:08:06 +01:00
Johannes Geppert 75d252554b Solve some dependency convergence issues reported by maven enforce plugin
https://issues.apache.org/jira/browse/WW-5018
2019-02-09 15:04:22 +01:00
Yasser Zamani f3fb36b834 Merge pull request #329 from aleksandr-m/feature/WW-5009_master
WW-5009 EmptyStackException in JSON plugin due to concurrency
2019-02-05 14:38:24 +03:30
Yasser Zamani 9d4e720922 upgrade to ASM 7
fixes WW-5005

(cherry picked from commit 3eb68be)
2019-02-04 14:28:16 +03:30
Aleksandr Mashchenko be457f4241 WW-5009 EmptyStackException in JSON plugin due to concurrency 2019-02-03 21:41:08 +02:00
Lukasz Lenart 7e724a0159 Merge pull request #307 from JCgH4164838Gh792C124B5/localS2_26_PluginFix1
Update Embedded JSP Plugin (more current Juli/Jasper versions)
2019-01-10 08:51:55 +01:00
Aleksandr Mashchenko 094b6c5e3b Merge pull request #289 from lukaszlenart/WW-4972
[WW-4972] Switches incompatible_improvements to VERSION_2_3_28
2019-01-06 22:16:27 +02:00
JCgH4164838Gh792C124B5 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.
2018-12-31 17:24:08 -05:00
JCgH4164838Gh792C124B5 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.
2018-12-31 01:16:24 -05:00
Lukasz Lenart 3d20e80950 WW-4972 Uses built-in auto escaping instead of escaping each parameter 2018-12-23 17:44:12 +01:00
Lukasz Lenart 699f5d6c79 [WW-4938] Uses container to create an instance of the class (#295)
* WW-4938 Uses container to create an instance of the class

* WW-4938 Adds a test to proof that @Inject works on constructor

* WW-4938 Adds missing header

* Update core/src/test/java/com/opensymphony/xwork2/mock/InjectableAction.java

Co-Authored-By: lukaszlenart <lukasz.lenart@gmail.com>

* Update core/src/test/java/com/opensymphony/xwork2/mock/DummyTextProvider.java

Co-Authored-By: lukaszlenart <lukasz.lenart@gmail.com>
2018-12-18 15:55:42 +03:30
Lukasz Lenart 85812fb9bb [WW-4989] Uses JacksonXML handler a default handler for XML in the REST plugin (#288)
* WW-4989 Uses Jackson XML handler as a default for XML serialisation

* WW-4989 Renames class to match the same pattern for XML handler
2018-12-14 17:28:47 +03:30
Lukasz Lenart f4c8994da4 WW-4992 Marks Embedded JSP plugin as deprecated 2018-12-14 12:49:07 +01:00
Lukasz Lenart 9d8edf5265 WW-4889 Uses .contains to avoid issues with serialisation order 2018-12-09 13:32:27 +01:00
Lukasz Lenart 314dcdb780 WW-4889 Uses proper order of params in assertEquals 2018-12-07 09:37:37 +01:00
Lukasz Lenart 629ce0d9aa WW-4889 Adds XML handler based on Apache Juneau 2018-12-06 10:05:45 +01:00
Yasser Zamani 7dcdfbe1d7 upgrade to DWR 3 with a showcase
See also WW-4069
2018-12-03 16:23:55 +03:30
JCgH4164838Gh792C124B5 0e410639f3 Upgrade DWR from 1.x to 2.x
- intended to resolve Jenkins build failure with old DWR version.

pom.xml changes:
- entry change in struts2-parent pom.xml
  - upgrade 1.1.1 (uk.ltd.getahead) -> 2.0.11-RELEASE (org.directwebremoting)
- entry change in struts2-dwr-plugin pom.xml
- entry change in struts2-showcase pom.xml
2018-11-25 22:32:22 -05:00