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,514 Commits 21 Branches 184 Tags
d04ed76f1b0801098cd20521b60264cc73627487
Commit Graph

1398 Commits

Author SHA1 Message Date
Lukasz Lenart ea23ce295a [maven-release-plugin] prepare for next development iteration 2020-11-25 17:32:09 +01:00
Lukasz Lenart 4cf9093cc5 [maven-release-plugin] prepare release STRUTS_2_5_26 2020-11-25 17:31:54 +01:00
Lukasz Lenart 46bae3ce68 Reverts version to 2.5.26-SNAPSHOT 2020-11-25 17:13:51 +01:00
Lukasz Lenart a2df8f9890 [maven-release-plugin] prepare for next development iteration 2020-11-24 08:22:00 +01:00
Lukasz Lenart 7253edeada [maven-release-plugin] prepare release STRUTS_2_5_26 2020-11-24 08:16:43 +01:00
Lukasz Lenart 4506d5716d Reverts version to 2.5.26-SNAPSHOT 2020-11-24 07:49:59 +01:00
Lukasz Lenart 83aff6e470 [maven-release-plugin] prepare for next development iteration 2020-11-21 08:40:22 +01:00
Lukasz Lenart 3138dc7fbd [maven-release-plugin] prepare release STRUTS_2_5_26 2020-11-21 08:40:09 +01:00
Lukasz Lenart 0a75d8e8fa Avoids recursion in tags 2020-11-11 07:31:36 +01:00
Lukasz Lenart 1d18e8f9a8 WW-5095 Sets ActionMapping when preparing a test nv 2020-11-11 07:27:40 +01:00
Lukasz Lenart 84aeb77011 [maven-release-plugin] prepare for next development iteration 2020-09-17 13:37:00 +02:00
Lukasz Lenart b3a9d82d58 [maven-release-plugin] prepare release STRUTS_2_5_25 2020-09-17 13:36:38 +02:00
JCgH4164838Gh792C124B5 10a834a54c Backport a few PR#433 OSGi plugin-related changes from 2.6 to 2.5. 
- Fix to allow the OSGi plugin to initialize with no internet connection.
- Fix an unintended JS change for the admin bundle.
- Fix the OSGi Demo bundle so it works under 2.5.x as well.
 2020-09-08 15:25:02 -04:00
Lukasz Lenart abb1ac3c99 [maven-release-plugin] prepare for next development iteration 2020-08-18 07:38:38 +02:00
Lukasz Lenart dcc59937a8 [maven-release-plugin] prepare release STRUTS_2_5_24 2020-08-18 07:38:25 +02:00
JCgH4164838Gh792C124B5 d61be3e4ce Updated with suggested changes from review. 
- BundlePackageLoader changes suggested by L. Lenart.
- FelixOsgiHost changes to better handle Felix bundle cache location
  processing (Windows and Linux).
- FelixOsgIHost test modified to not fail if felix-cache directory cannot
  be created (warn only) to avoid failing the whole build.
 2020-07-25 16:11:02 -04:00
JCgH4164838Gh792C124B5 c7149ab1bc Initial attempt to fix OSGi Plugin issues discovered during examination of 
WW-5075.
- Indication is that the OSGi Plugin has been failing since Struts 2.3.4.
- Applied fix to ResourceFinder to restore 2.3.x logic that was broken in
  2.5.x.
- Implemented changes to restore OSGi Plugin functionality for 2.5.x.
- Applied changes to the OSGi Admin Bundle to function under 2.5.x.
- Updated the OSGi Admin Bundle JS libraries and related CSS to newer
  versions.
- Added new unit tests for the OSGi plugin.
- The OSGi plugin will only function properly with exploded/expanded WAR
  files.
 2020-07-20 01:12:12 -04:00
Lukasz Lenart 8cb93ad39a [maven-release-plugin] prepare for next development iteration 2020-07-02 07:53:53 +02:00
Lukasz Lenart e8656d5737 [maven-release-plugin] prepare release STRUTS_2_5_23 2020-07-02 07:53:39 +02:00
JCgH4164838Gh792C124B5 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
JCgH4164838Gh792C124B5 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
Lukasz Lenart 80a91dc75f [maven-release-plugin] prepare for next development iteration 2019-11-17 20:17:42 +01:00
Lukasz Lenart a6edb0d5df [maven-release-plugin] prepare release STRUTS_2_5_22 2019-11-17 20:17:20 +01:00
Lukasz Lenart ae3ae2be76 [maven-release-plugin] prepare for next development iteration 2019-11-07 20:18:06 +01:00
Lukasz Lenart 8dface4fcb [maven-release-plugin] prepare release STRUTS_2_5_21 2019-11-07 20:17:01 +01:00
Yasser Zamani b0dd7c1c0d include ref in path as WW-5011 workaround (#353) 
* include ref in path for StrutsApplicationResource as WW-5011 workaround

* add license to newly added xml files in previous commit

* WW-5011 include ref in path via .toURI().getPath()

* WW-5011 check protocol and not throw exception due to lazy file existence

* decrease log file size to pass travis build
 2019-05-28 09:53:27 +04:30
Yasser Zamani fdd1054070 Merge pull request #328 from aleksandr-m/feature/WW-5009 
WW-5009 EmptyStackException in JSON plugin due to concurrency
 2019-02-05 14:37:57 +03:30
Aleksandr Mashchenko 7242a87165 WW-5009 Fix tests 2019-02-03 12:58:43 +02:00
Aleksandr Mashchenko 0323795d67 WW-5009 EmptyStackException in JSON plugin due to concurrency 2019-02-03 12:41:18 +02:00
Yasser Zamani 3eb68be674 upgrade to ASM 7 
fixes WW-5005
 2019-01-23 16:24:40 +03:30
Lukasz Lenart cb0ac7c440 [maven-release-plugin] prepare for next development iteration 2019-01-09 09:00:04 +01:00
Lukasz Lenart 96c38b27e4 [maven-release-plugin] prepare release STRUTS_2_5_20 2019-01-09 08:59:40 +01:00
Lukasz Lenart 45161e88f9 [maven-release-plugin] prepare for next development iteration 2018-12-30 15:24:15 +01:00
Lukasz Lenart 4456620b51 [maven-release-plugin] prepare release STRUTS_2_5_19 2018-12-30 15:23:53 +01:00
Yasser Zamani 32c8f6f811 [WW-4981] Adds support for JDK11 (#270) 2018-11-19 14:27:21 +03:30
ORDTesters d7a7c909ea [WW-4977] Fixing flaky test in Jsr168DispatcherTest and Jsr286DispatcherTest. 
(cherry picked from commit 2d4e26f)
 2018-11-18 15:39:41 +03:30
Yasser Zamani 11de8810e4 satisfy coveralls via testing with a not URLClassLoader 
See also WW-4845

(cherry picked from commit 02abab3)
 2018-11-16 17:30:27 +03:30
Yasser Zamani 75dc4c00d2 pass all current tests with java 9 
See also WW-4845

(cherry picked from commit a5d888a)
 2018-11-16 17:29:37 +03:30
JCgH4164838Gh792C124B5 3b81a9edaa Update Struts 2.5.19 build with some newer (compatible) library versions. 
- Fix SCM tag entry typo in main pom.xml.
- 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.5.19 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
  - ognl 3.1.15 -> 3.1.18  (Note: newest version that passes unit tests)
  - oval 1.31 -> 1.90      (Note: required unit test fix for OValValidationInterceptorTest.java)
  - tiles 3.0.7 -> 3.0.8
  - tiles-request 1.0.6 -> 1.0.7
  - log4j 2.10.0 -> 2.11.1
  - jackson 2.9.5 -> 2.9.7
  - fluido-skin.version 1.6 -> 1.7
  - slf4j 1.7.12 -> 1.7.25
  - xtream 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-markdown 1.3 -> 1.7
  - freemarker 2.3.26-incubating -> 2.3.28
  - 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-lang 3.6 -> 3.8.1
  - commons-beanutils 1.9.2 -> 1.9.3
  - 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)
  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
    remain as long as JMock 1.2.0 is used.
 2018-11-12 14:49:56 -05:00
Lukasz Lenart f4d7dbe88e [maven-release-plugin] prepare for next development iteration 2018-09-18 11:23:59 +02:00
Lukasz Lenart 289782c583 [maven-release-plugin] prepare release STRUTS_2_5_18 2018-09-18 11:23:36 +02:00
Yaser Zamani 83c0f1cd1e [maven-release-plugin] prepare for next development iteration 2018-08-13 17:13:52 +04:30
Yaser Zamani eacc002334 [maven-release-plugin] prepare release STRUTS_2_5_17 2018-08-13 17:12:34 +04:30
Lukasz Lenart 6e87474f9a Validates action, namespace and method in the same way 2018-06-21 09:19:57 +02:00
Lukasz Lenart d175836757 Changes version to snapshot 2018-05-02 08:45:44 +02:00
Lukasz Lenart 6efaf900d4 Increases scope when location parsing is avoided 2018-05-02 08:25:06 +02:00
Lukasz Lenart b3bad5ea44 Avoids parsing namespace when using existing namespace 2018-05-02 08:04:15 +02: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