Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 09:36:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,176 Commits 21 Branches 184 Tags
00533db153d6366ea31533d323610d980a3fbb2c
Commit Graph

1733 Commits

Author SHA1 Message Date
Lukasz Lenart 00533db153 [maven-release-plugin] prepare for next development iteration 2024-01-20 11:39:08 +01:00
Lukasz Lenart cd3389ab35 [maven-release-plugin] prepare release STRUTS_7_0_0_M1 2024-01-20 11:38:59 +01:00
Lukasz Lenart 13bf91bf31 Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-01-20 
# Conflicts:
#	Jenkinsfile
#	core/src/main/java/org/apache/struts2/dispatcher/MockDispatcher.java
#	core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
#	core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
#	plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
#	plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletApplicationMap.java
#	plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
#	plugins/portlet/src/test/java/org/apache/struts2/StrutsTestCasePortletTests.java
#	plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsDecorator.java
 2024-01-20 09:29:05 +01:00
Lukasz Lenart e9738698a4 WW-5387 Fixes remove() signature 2024-01-16 20:36:00 +01:00
Kusal Kithul-Godage 3b078995aa Merge pull request #826 from apache/WW-5382-stale-config 
WW-5382 Fix stale injections in Dispatcher
 2024-01-07 02:14:28 +11:00
Lukasz Lenart d8090ef9d8 Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-01-04 
# Conflicts:
#	Jenkinsfile
#	bundles/admin/src/main/resources/osgi/admin/shell.ftl
#	bundles/admin/src/main/resources/osgi/admin/viewBundle.ftl
#	bundles/admin/src/main/resources/osgi/admin/viewBundles.ftl
#	plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
 2024-01-04 10:21:52 +01:00
Lukasz Lenart 5e9dd3d690 Merge pull request #830 from apache/feature/WW-5383-exclude-jars 
[WW-5383] Updates RegEx to excludes JARs by default
 2024-01-04 10:10:58 +01:00
Lukasz Lenart cc78033d3d WW-5383 Updates RegEx to excludes JARs by default 2024-01-04 06:49:10 +01:00
Kusal Kithul-Godage ee600f99b1 WW-5379 Use ValueStackProvider marker interface for Velocity context implementation flexibility 2024-01-02 21:24:40 +11:00
Kusal Kithul-Godage 946737c811 WW-5382 Rework Dispatcher injections 2024-01-02 03:57:45 +11:00
Kusal Kithul-Godage 6f1e1222bc WW-5382 Rework existing Dispatcher tests and base test classes 2024-01-02 02:56:57 +11:00
Kusal Kithul-Godage 450ee91b03 WW-5379 Fix not looking in chained contexts' chained contexts 2023-12-28 08:17:20 +11:00
Kusal Kithul-Godage 3eddd56d2d WW-5379 Add support for internal and chained contexts 2023-12-28 07:42:23 +11:00
Kusal Kithul-Godage 3dbc5c250e WW-5379 Implement alternative mechanism for Velocity directives to obtain ValueStack 2023-12-28 05:00:31 +11:00
Lukasz Lenart 938f8eadb9 Adds missing import 2023-12-16 16:22:15 +01:00
jdyer1 8b8de96b49 WN-5141 fix whitespace issues 2023-12-16 11:10:00 +01:00
Kusal Kithul-Godage 97dbdc1c90 Delete remaining deprecated plugins 2023-12-16 11:09:25 +01:00
James Dyer 6f35c02fbf [WW-5141] Removes deprecated plugins (#798) 
* WW-5141

- remove portlet

* WW-5141

- remove "pell multipart plugin"

* WW-5141

- remove code for "pell multipart plugin"

* WW-5141

-  remove dwr plugin

* WW-5141

- remove dwr plugin code

* WW-5141

- remove "dwr" from "struts-showcase"

* WW-5141

- remove references to "oval plugin" (removed)

* WW-5141

- remove dwr from struts-showcase
 2023-12-16 11:03:47 +01:00
jdyer1 3f2b8c526b WN-5141 
- fix formatting
 2023-12-16 10:59:19 +01:00
jdyer1 eb4387521e Revert "WN-5141" 
This reverts commit 1fc70af56b.
 2023-12-16 10:59:18 +01:00
jdyer1 0e6d31729c WN-5141 
- use eclipse transformer for Velocity Tools View and Velocity Tools View Jsp
 2023-12-16 10:59:18 +01:00
jdyer1 94c166f228 Revert "WN-5141" 
This reverts commit def5254a57.
 2023-12-16 10:59:18 +01:00
jdyer1 147f0ca8a5 Revert "WN-5141" 
This reverts commit 1c66e692cc.
 2023-12-16 10:59:18 +01:00
jdyer1 71c2fe0ef9 Revert "WN-5141" 
This reverts commit d5e766e43a.
 2023-12-16 10:59:18 +01:00
jdyer1 79138e1853 WW-5335 Prepares for Java 17 & Struts 7.x 2023-12-16 10:57:07 +01:00
jdyer1 d20972c13f WW-5141 fix formatting problems 2023-12-16 10:56:57 +01:00
jdyer1 6e76a3abc8 WN-5141 
- use eclipse transformer on sitemesh2
 2023-12-16 10:55:52 +01:00
jdyer1 38c51d255e WN-5141 
- eclipse transformer for freemarker
 2023-12-16 10:55:51 +01:00
jdyer1 730e5829d0 Revert "WN-5141" 
This reverts commit cdb0820e63.
 2023-12-16 10:55:51 +01:00
jdyer1 ec6c96e16c Revert "WN-5141" 
This reverts commit b8b9f8aa37.
 2023-12-16 10:55:51 +01:00
jdyer1 a9edf74798 Revert "WN-5141" 
This reverts commit 8d3880a670.
 2023-12-16 10:55:50 +01:00
jdyer1 b52f18ced4 Revert "WN-5141" 
This reverts commit 908d064839.
 2023-12-16 10:55:50 +01:00
jdyer1 06228a7297 WN-5141 
- removal of "embedded jsp" plugin (deprecated)
 2023-12-16 10:55:49 +01:00
jdyer1 ec8ac50b6f WN-5141 
- REMOVE OVAL Plugin (deprecated) - requires javax.persistence, no newer relase of net.sf.oval avaiable
 2023-12-16 10:49:51 +01:00
jdyer1 63828c0e8d WN-5141 
- TODO:  TEMPORARY ignore "embedded jsp" test.  Classpath/tld issues?  Might be going away/
 2023-12-16 10:49:51 +01:00
jdyer1 6c0a97cfa2 WN-5141 
- fixes for "embedded jsp plugin"
 2023-12-16 10:49:51 +01:00
jdyer1 7dd2e817e7 WN-5141 
- TODO:  TEMP ignore test, depends on freemarker
 2023-12-16 10:49:51 +01:00
jdyer1 8fecaa2c30 WN-5141 
- CDI:  update beans.xml for Jakarta EE 9
- use "annotated=all" as "FooService.java" does not have a CDI annotation
 2023-12-16 10:49:50 +01:00
jdyer1 07792bd0e0 WN-5141 
- add back in "mockobjects" where they can be used
 2023-12-16 10:46:58 +01:00
jdyer1 6ad0ad512d WN-5141 
- fix visibility of el api
- remove mockobjects from pom (needs to be migrated to ?spring web mocks?)
 2023-12-16 10:46:57 +01:00
jdyer1 bbdeb2d459 Revert "WN-5141" 
This reverts commit 5d1aa6edcf.
 2023-12-16 10:46:57 +01:00
jdyer1 416dd7e22b WN-5141 
- remove el method deprecarted/removed from api
 2023-12-16 10:46:57 +01:00
jdyer1 37e1794678 WN-5141 
- TODO:  TEMPORARY remove sitemesh plugin from build
 2023-12-16 10:46:56 +01:00
jdyer1 0cee06f5ab WN-5141 
- TODO:  TEMPARARY comment-out velocity-tools code
 2023-12-16 10:46:56 +01:00
jdyer1 54a9ef85e7 WN-5141 
- TODO:  TEMPORARY comment-out freemarker code
 2023-12-16 10:46:56 +01:00
jdyer1 fed840b6ac WN-5141 
- TODO:  TEMPORARY comment-out velocity
 2023-12-16 10:46:56 +01:00
jdyer1 0566cc58c6 WN-5141 
- TODO:  temporary comment-out velocity dependencies
 2023-12-16 10:46:56 +01:00
jdyer1 8726288bd5 WN-5141 
- TODO:  temporary comment out velocity tools (requires javax)
 2023-12-16 10:46:56 +01:00
jdyer1 2e528eb66a WN-5141 
- TODO:  TEMPORARY comment-out problematic Freemarker code
 2023-12-16 10:40:36 +01:00
jdyer1 697e18553b WN-5141 
- upgrade sitemesh (TODO: maybe not necessary??)
 2023-12-16 10:40:36 +01:00