Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-13 02:27:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,815 Commits 25 Branches 184 Tags
f4e64bc999e4d9765d9c19eb7b00a0773a728e25
Commit Graph

1445 Commits

Author SHA1 Message Date
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
Sebastian Peters 80e50c1367 Remove unused private methods 2018-11-20 21:13:12 +01:00
Sebastian Peters 176a0d7752 Fix: Resources should be closed 
Java 7 introduced the try-with-resources statement,
which implicitly closes Closeables.

Fixes sonar rule squid:S2095
 2018-11-19 22:29:46 +01:00
Lukasz Lenart 2a60c1eee6 [WW-4981] Adds support for JDK11 (#270) 
* Upgrades test dependencies

* Drops unused lib

* Uses AssertJ instead of FestAssert

* Upgrades Surefire Maven Plugin to 2.22.1

* Downgrades to AssertJ 2.x to support JDK7

* decouple tests from java version

Refactor a java 9 conditional test to work always with any java version

See also WW-4845

* fix NullPointerException in NotURLClassLoader tests

Also includes a few improvements

See also WW-4845

* do not specify threadCount & forkMode which breaks tests in java 9

See also WW-4845

* pass all current tests with java 11

See also WW-4981

* fix an odd path problem in java 9

See also WW-4845

* gitignore test-output

See also WW-4981

* ask travis an oracle jdk 11 build

See also WW-4981

* ask travis to report coverage only in latest working jdk, jdk8

See also WW-4845
 2018-11-19 10:35:01 +03:30
Sebastian Peters 91402e5763 Migrate from outdated rat-maven-plugin to apache-rat-plugin 2018-11-18 13:42:16 +01:00
Yasser Zamani 299d91e52b Merge pull request #263 from OrDTesters/JsrDispatcherTestFix 
[WW-4977] Fixing flaky test in Jsr168DispatcherTest and Jsr286DispatcherTest.
 2018-11-18 15:18:49 +03:30
Sebastian Peters 26dc995866 WW-4982 Remove the deprecated JsonLibHandler and json-lib dependency 2018-11-17 22:57:48 +01:00
Lukasz Lenart 56d86a485b Merge pull request #262 from yasserzamani/WW-4845 
WW-4845 pass all current tests with java 9
 2018-11-15 16:18:03 +01:00
Lukasz Lenart 772f8999b7 Merge pull request #267 from pHeidelbach/WW-4930-smi-cannot-be-disabled-for-action-packges-found-via-convention-plugin 
WW-4930 Add constant to enable smi inheritance
 2018-11-15 16:14:15 +01:00
Philipp Heidelbach 8b4755dc49 WW-4930 Add test run with enabled SMI inheritance 2018-11-15 13:15:17 +01:00
Sebastian Peters 790235b602 Remove cglib 2018-11-14 22:06:56 +01:00
Lukasz Lenart 7e720bf5f8 Merge pull request #265 from JCgH4164838Gh792C124B5/localS2Branch 
Update Struts 2.6.0 build with some newer (compatible) library versions.
 2018-11-14 20:56:29 +01:00
Philipp Heidelbach 38b96b11fe WW-4930 Add constant to enable smi inheritance between parent package configs and its children 2018-11-14 14:54:57 +01:00
Yasser Zamani 6b0f90575e delete not-deleted profiling interceptors from plugins 
See also WW-4979
 2018-11-14 17:14:44 +03:30
Yasser Zamani 02abab365a satisfy coveralls via testing with a not URLClassLoader 
See also WW-4845
 2018-11-14 16:39:44 +03:30
JCgH4164838Gh792C124B5 53d7d04246 Update Struts 2.6.0 build with some newer (compatible) library versions. 
- Add missing multiple-success.jsp for Showcase application.
- Enhance main pom.xml maven-surefire-plugin configuration to avoid some test-ng related duplication failures:  "Cannot find JUnit method class junit.framework.TestSuite$1.warning".
- Remove unnecessary plugins/embeddedjsp/pom.xml (struts2-embeddedjsp-plugin) maven-surefire-plugin version override (noted with preceding change).
- Update Struts 2.6.0 build to use some newer (compatible) library versions.
  Change the main pom.xml library versions for the following:
  - spring.platformVersion 4.3.13.RELEASE -> 4.3.20.RELEASE
  - oval 1.31 -> 1.90  (Note: required unit test fix for OValValidationInterceptorTest.java AND code fix for OvalValidationInterceptor.java)
                       (Additional Note: 1.70 was the most recent that functioned without a fix to OvalValidationInterceptor)
  - jackson 2.9.6 -> 2.9.7
  - fluido-skin.version 1.6 -> 1.7
  - slf4j (slf4j-api, slf4j-simple) 1.7.12 -> 1.7.25
  - xstream 1.4.10 -> 1.4.11.1
  - jetty 6.1.9 -> 6.1.26 (last in 6.1.x line)
  - xerces 2.10.0 - > 2.12.0
  - org.owasp 3.1.1 -> 3.3.4
  - versions-maven-plugin 2.5 -> 2.7
  - doxia-core 1.7 -> 1.8
  - doxia-module-markdown 1.3 -> 1.7
  - org.apache.felix.main 4.0.3 -> 4.6.1  (Note: most recent 4.x)
  - easymock 3.4 -> 3.5.1
  - javax.el 3.0 -> 3.0.1-b10
  - jasper 6.0.18 -> 6.0.53  (Note: most recent 6.0.x)
  - juli 6.0.18 -> 6.0.53    (Note: most recent 6.0.x)
  - commons-logging 1.1.3 -> 1.2
  - commons-collections4 4.1 -> 4.2
  - commons-io 2.5 -> 2.6
  - commons-lang3 3.6 -> 3.8.1
  - commons-text 1.2 -> 1.3  (Note: most recent compatible with Java 7)
  - commons-validator 1.5.1 -> 1.6
  - mockito 1.9.5 -> 1.10.19            (Note: most recent 1.x)
  - cdi-api 1.0-SP1 -> 1.0-SP4          (Note: most recent 1.0.x)
  - weld-core 1.0.1-Final -> 1.0.1-SP4  (Note: most recent 1.0.x)
  - cglib 2.2 -> 2.2.2                  (Note: most recent 2.2.x)
  Note for cglib-nodep:  Build succeeded with cglib-nodep 2.2.2 and 3.2.5.  Although
    cglib 3.2.5 matches ASM 5.2, jmock-cglib 1.2.0 identifies cglib-nodep 2.1_3 as its
    requirement (on the JMock http://jmock.org/download.html download page) so it should
    probably remain as long as JMock 1.2.0 is used.
 2018-11-12 19:58:15 -05:00