Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Struts 7.0.x #792

Merged
merged 308 commits into from
Nov 30, 2024
Merged

Struts 7.0.x #792

merged 308 commits into from
Nov 30, 2024

Conversation

lukaszlenart
Copy link
Member

@lukaszlenart lukaszlenart commented Nov 15, 2023 •
edited
Loading

SNAPSHOT build is available in ASF Snapshot repository or you can download Nightlies build from here

@lukaszlenart lukaszlenart changed the title [Preview] Struts 7 0 x [Preview] Struts 7.0.x Nov 15, 2023
jdyer1 and others added 28 commits December 16, 2023 10:55
@jdyer1 @lukaszlenart
WN-5141
d36a76c 
- update freemarker tests
@jdyer1 @lukaszlenart
WN-5141
38c51d2 
- eclipse transformer for freemarker
@jdyer1 @lukaszlenart
WN-5141
48b8a3b 
- pom corrections (compiles ok, however, eclipse IDE does not work)
@jdyer1 @lukaszlenart
WN-5141
e9c6ce0 
- try shade plugin
@jdyer1 @lukaszlenart
Revert "WN-5141"
712fa7f 
This reverts commit deebfc3.
@jdyer1 @lukaszlenart
WN-5141
72d07f8 
- fix for IncludeTagTest
@jdyer1 @lukaszlenart
WN-5141
6e76a3a 
- use eclipse transformer on sitemesh2
@jdyer1 @lukaszlenart
WW-5141 fix formatting problems
d20972c
@jdyer1 @lukaszlenart
WW-5335 Prepares for Java 17 & Struts 7.x
79138e1
@lukaszlenart
WW-5335 Reverts adding release/struts-7-0-x branch to scorecards anal…
b8d07f4 
…ysis

Only the main branch is supported by this action
@jdyer1 @lukaszlenart
WN-5141
8b501aa 
- initial attempt to update references javax>jakarta and get things to compile
@jdyer1 @lukaszlenart
WN-5141
baddd36 
- use 10.x version of tomcat jars
@jdyer1 @lukaszlenart
WN-5141
df56821 
- fix things broken with rebase
@lukaszlenart
WW-5335 Prepares for Java 17 & Struts 7.x
2fe7a91
@lukaszlenart
WW-5335 Reverts adding release/struts-7-0-x branch to scorecards anal…
8c906f3 
…ysis

Only the main branch is supported by this action
@jdyer1 @lukaszlenart
WN-5141
7d835bf 
- fix license header
@jdyer1 @lukaszlenart
WN-5141
519b8bd 
- upgrade to latest jetty-maven plugin
- remove spurious jetty dependencies from parent pom
@jdyer1 @lukaszlenart
WN-5141
1295c59 
- struts showcase fixes (still 1 test failure)
@jdyer1 @lukaszlenart
Revert "WN-5141"
71c2fe0 
This reverts commit d5e766e.
@jdyer1 @lukaszlenart
Revert "WN-5141"
147f0ca 
This reverts commit 1c66e69.
@jdyer1 @lukaszlenart
Revert "WN-5141"
94c166f 
This reverts commit def5254.
@jdyer1 @lukaszlenart
WN-5141
0e6d317 
- use eclipse transformer for Velocity Tools View and Velocity Tools View Jsp
@jdyer1 @lukaszlenart
Revert "WN-5141"
eb43875 
This reverts commit 1fc70af.
@jdyer1 @lukaszlenart
WN-5141
c59ba68 
- fix formatting tabs>spaces
@jdyer1 @lukaszlenart
WN-5141
e95a07f 
- velocity with showcase
@jdyer1 @lukaszlenart
WN-5141
3f2b8c5 
- fix formatting
@jdyer1 @lukaszlenart
Revert "WN-5141"
8cd0dc9 
This reverts commit 4f9febb.
@jdyer1 @lukaszlenart
WN-5141
b372ac9 
- velocity and struts showcase
@kusalk kusalk mentioned this pull request Nov 3, 2024
Merged
lukaszlenart and others added 10 commits November 3, 2024 12:16
@lukaszlenart
Merge pull request #1113 from apache/feature/WW-5481-text
058a449 
WW-5481 Extract text related classes into org.apache.struts2.text
@lukaszlenart
WW-5482 Moves locale related code into org.apache.struts2.locale
0c2d275
@kusalk
Merge pull request #1118 from apache/7.0.x/merge-master-2024-11-03-v2
803a857 
7.0.x/merge master 2024 11 03 v2
@lukaszlenart
Merge pull request #1114 from apache/feature/WW-5482-locale
7fc0c41 
WW-5482 Extract locale related classes into org.apache.struts2.locale
@lukaszlenart
[maven-release-plugin] prepare release STRUTS_7_0_0_M10
5760d45
@lukaszlenart
[maven-release-plugin] prepare for next development iteration
90c9dfa
@lukaszlenart
WW-5486 Fixes exposing params added by ServletDispatcherResult
24e6041
@lukaszlenart
WW-5486 Simplifies test to avoid using mocks
cf26007
@lukaszlenart
WW-5486 Removes try-catches
a49b5a3
@lukaszlenart
Merge pull request #1123 from apache/fix/WW-5486-request-params
08f664c 
WW-5486 Fixes exposing params added by ServletDispatcherResult
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
8 Security Hotspots
71.1% Coverage on New Code (required ≥ 80%)
C Reliability Rating on New Code (required ≥ A)
E Security Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

@lukaszlenart
WW-5463 Exposes final location as request attribute FORWARD_SERVLET_PATH
24c0e5f
@lukaszlenart
Merge pull request #1127 from apache/feature/WW-5463-servlet-path
9b2d6a2 
WW-5463 Exposes final location as request attribute FORWARD_SERVLET_PATH
@lukaszlenart
Merge remote-tracking branch 'origin/master' into merge/master-to-7xx…
6100068 
…-2024-11-29

# Conflicts:
#	apps/pom.xml
#	apps/rest-showcase/pom.xml
#	apps/showcase/pom.xml
#	assembly/pom.xml
#	bom/pom.xml
#	bundles/demo/pom.xml
#	bundles/pom.xml
#	core/pom.xml
#	jakarta/pom.xml
#	jakarta/velocity-tools-view-jakarta/pom.xml
#	plugins/async/pom.xml
#	plugins/bean-validation/pom.xml
#	plugins/cdi/pom.xml
#	plugins/config-browser/pom.xml
#	plugins/convention/pom.xml
#	plugins/dwr/README.md
#	plugins/embeddedjsp/pom.xml
#	plugins/gxp/pom.xml
#	plugins/jasperreports/pom.xml
#	plugins/javatemplates/pom.xml
#	plugins/jfreechart/pom.xml
#	plugins/json/pom.xml
#	plugins/junit/pom.xml
#	plugins/osgi/pom.xml
#	plugins/oval/pom.xml
#	plugins/pell-multipart/pom.xml
#	plugins/plexus/pom.xml
#	plugins/pom.xml
#	plugins/portlet-junit/pom.xml
#	plugins/portlet-mocks/pom.xml
#	plugins/portlet-tiles/pom.xml
#	plugins/portlet/pom.xml
#	plugins/rest/pom.xml
#	plugins/sitemesh/pom.xml
#	plugins/spring/pom.xml
#	plugins/testng/pom.xml
#	plugins/tiles/pom.xml
#	plugins/velocity/pom.xml
#	plugins/xslt/pom.xml
#	pom.xml
@lukaszlenart lukaszlenart changed the title [Preview] Struts 7.0.x Struts 7.0.x Nov 29, 2024
@lukaszlenart lukaszlenart marked this pull request as ready for review November 30, 2024 07:27
@lukaszlenart lukaszlenart merged commit 5f35af0 into master Nov 30, 2024
9 of 12 checks passed
@lukaszlenart lukaszlenart deleted the release/struts-7-0-x branch November 30, 2024 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deki deki deki requested changes

@kusalk kusalk kusalk approved these changes

@rgielen rgielen Awaiting requested review from rgielen

@aleksandr-m aleksandr-m Awaiting requested review from aleksandr-m

@yasserzamani yasserzamani Awaiting requested review from yasserzamani

@sdutry sdutry Awaiting requested review from sdutry

@cnenning cnenning Awaiting requested review from cnenning

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@lukaszlenart @jdyer1 @jellisgwn @ctmay4 @JulB310 @deki @kusalk @sepe81