Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,507 Commits 21 Branches 184 Tags
176a0d77522e6c69099f01cff0a1c88568fabc19
Commit Graph

1409 Commits

Author SHA1 Message Date
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
ORDTesters 2d4e26ff8a [WW-4977] Fixing flaky test in Jsr168DispatcherTest and Jsr286DispatcherTest. 2018-11-11 21:48:42 -06:00
Yasser Zamani a5d888a373 pass all current tests with java 9 
See also WW-4845
 2018-11-11 14:31:35 +03:30
Lukasz Lenart 8cf787b39c WW-4963 Implements new ServiceAware interface 
that uses withServices instead of setServices
 2018-09-25 09:53:50 +02:00
Lukasz Lenart 5428252d57 WW-4963 Implements new PortletResponseAware interface with a test 
that uses withPortletResponse instead of setPortletReponse
 2018-09-25 09:03:29 +02:00
Lukasz Lenart ec4a44567d WW-4963 Implements new PortletRequestAware interface 
that uses withPortletRequest instead of setPortletRequest
 2018-09-25 08:51:16 +02:00
Lukasz Lenart f59860026c WW-4963 Implements new PortletPreferencesAware interface 
that uses withPortletPreferences instead of setPortletPreferences
 2018-09-25 08:40:27 +02:00
Lukasz Lenart 42245be546 WW-4963 Implements new PortletContextAware interface 
that uses withPortletContext instead of setPortletContext
 2018-09-25 08:36:32 +02:00
Lukasz Lenart 01016b458e WW-4963 Implements new BundleContextAware interface 
that uses withBundleContext instead of setBundleContext
 2018-09-25 08:23:45 +02:00
Lukasz Lenart 384d418039 WW-4963 Implements new PrincipalAware interface 
that uses withPrincipalProxy instead of setPrincipalProxy
 2018-09-25 08:10:36 +02:00
Lukasz Lenart eec0d8e877 Validates action, namespace and method in the same way 2018-08-24 10:24:57 +02:00
Lukasz Lenart 8d86442ce7 Increases scope when location parsing is avoided 2018-08-24 10:18:49 +02:00
Lukasz Lenart 2877a656e0 Avoids parsing namespace when using existing namespace 2018-08-24 10:18:38 +02:00
Yasser Zamani b804b86744 delete unused local variable timerKey 
See also WW-4779
 2018-05-30 12:56:10 +04:30
Stefaan Dutry 38c304696b further clean up after rmoving profiling layer 
* removed empty catch blocks
* removed no longer used Strings
 2018-05-21 22:48:45 +02:00
Stefaan Dutry 6c0d719a8a fix RestActionInvocation 2018-05-21 21:38:12 +02:00
Stefaan Dutry 14c0f47d84 remove UtilTimerStack 
Part of removing the profiling layer

Issue:
* WW-4779
 2018-05-21 21:30:56 +02:00
Stefaan Dutry 03ade0597d drop deprecated logging layer 
issue:
* WW-4763
 2018-05-19 21:18:46 +02:00
Jarek Lipski 459cb61ca4 Adds deque and queue support JSON plugin 2018-05-12 17:06:38 +02:00
Jarek Lipski 73cace0cbb Adds sorted and navigable set support JSON plugin 
See WW-4937 for more details.
 2018-05-12 16:59:17 +02:00
Yasser Zamani 57901aba50 Merge pull request #125 from lukaszlenart/immutable-context 
Immutable context
 2018-05-03 13:14:56 +04:30
Lukasz Lenart 5e505fa6ca Adds missing JavaDoc 2018-03-21 08:28:34 +01:00
Lukasz Lenart a990e69c73 Implements missing method 2018-03-20 15:42:17 +01:00
Lukasz Lenart 8e74ce610b Upgrades dependencies to Servlet API 2.5 and JSP API 2.1 2018-03-20 15:41:54 +01:00
Lukasz Lenart c41a0167dd Merge pull request #179 from yasserzamani/WW-4874 
WW-4874 Introduces Async plugin (adds support for async methods)
 2018-03-20 14:59:12 +01:00
Lukasz Lenart a37eafa710 Merge branch 'master' into immutable-context 2018-03-20 14:57:07 +01:00
Lukasz Lenart a4c4102e5c Merge branch 'master' into immutable-context 2018-03-20 14:48:25 +01:00
Lukasz Lenart 7f3c09c98e Merge pull request #208 from aleksandr-m/feature/lang_to_text 
WW-4915 Replace deprecated commons-lang3 classes
 2018-03-16 14:30:40 +01:00
Lukasz Lenart f1610537c8 Merge pull request #177 from aleksandr-m/feature/WW-4875 
WW-4875 Add ability to use Java based configuration
 2018-03-16 14:23:06 +01:00
Lukasz Lenart e2c2ea876e [maven-release-plugin] prepare for next development iteration 2018-03-02 13:00:17 +01:00
Lukasz Lenart 1fec084542 [maven-release-plugin] prepare release STRUTS_2_5_16 2018-03-02 12:59:53 +01:00
Yasser Zamani 26babb6fdf Merge pull request #210 from lukaszlenart/jackson-xml 
WW-4922: Jackson XML
 2018-03-02 13:17:38 +03:30
Lukasz Lenart 6e691ffdbf Merge pull request #212 from zepernick/master 
WW-4923 Null check to avoid NPE when not passing a JDBC connection
 2018-02-28 10:16:06 +01:00
Yasser Zamani 4b540f1ab4 fix location with full path of resource 2018-02-28 11:24:31 +03:30
Yasser Zamani a448b8a91b make newly added methods protected to allow users to override them 
See also WW-4921, WW-3442
 2018-02-27 14:18:46 +03:30
Yasser Zamani b806c11ea5 initialize session 
See also WW-4921
 2018-02-27 13:20:33 +03:30
Yasser Zamani a64b8b27fb add test if connection close after result 
See also WW-4923
 2018-02-27 08:45:27 +03:30