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.

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

Create 4.x branch in preparation for a 4.0.5 release #262

Draft
wants to merge 61 commits into
base: 4.x
Choose a base branch
from

Conversation

chadlwilson
Copy link

@chadlwilson chadlwilson commented Nov 4, 2023

Methodology

  • Went back through each commit one-by-one cherry-picking to the branch except where the changes seemed 5.x dedicated; amending the commits to be 4.x specific
  • Updated to ensure compatibility with javax.servlet 4.x API instead.

Relative to 4.0.4 this should include (ignoring dependabot/dependency updates and docs)

Things to note

  • Now builds with JDK17 targeting aJava 8 minimum (despite the proposed patch release). We could change to 4.1.x but that'd be confusing with the docs, as minor releases are documented separately and this doesn't seem desirable.
    • Originally 4.x was targeting Java 1.5, but my believe is that this theoretically "breaking" change shouldn't matter so much as Java 7 was EOL on 19 July 2022 with 7u351 and unlikely to break anyone?
  • I am not sure how this will work to actually release to maven central. Tried to cherry pick the GitHub Actions stuff, but it's commented out now anyway, so suspect a manual release is needed.
  • Changes to docs presumably will still only be pushed off main and will be ignored from this branch.

Possible things missed

  • Should the changes/enhancements to container tests be ported? I generally did not cherry pick these commits, but there is out-of-date code still on the branch that is related. Needs more digging.
  • Need to validate "in the real world", probably.
  • Post this PR, but during release - create separate PR to master to update the release notes

paultuckey and others added 30 commits November 4, 2023 14:30
(cherry picked from commit ffd9159)
(cherry picked from commit 0d262f7)
(cherry picked from commit 91630bd)
(cherry picked from commit 8c05d86)
(cherry picked from commit 35697bc)
…ssfish Server)

Needed some modifications for request-filename condition to got it
working well on Payara Glassfish Server.

urlrewrite.xml rule:
<rule>
<name>HTML5 Redirect</name>
<condition type="request-filename" operator="notfile"></condition>
<condition type="request-filename" operator="notdir"></condition>
<from>^((?!rest).)*$</from>
<to type="redirect">%{context-path}/index.html</to>
</rule>

(cherry picked from commit d652dad)
…Glassfish Server)

Needed some modifications for request-filename condition to got it
working well on Payara Glassfish Server.

urlrewrite.xml rule:
<rule>
<name>HTML5 Redirect</name>
<condition type="request-filename" operator="notfile"></condition>
<condition type="request-filename" operator="notdir"></condition>
<from>^((?!rest).)*$</from>
<to type="redirect">/index.html</to>
</rule>

(cherry picked from commit b651500)
Duplicate headers from this filter influenced CORS behaviour (ticket paultuckey#228)

(cherry picked from commit 4acda02)
…d_rewrite-style conf files.

(cherry picked from commit 03e0713)
(cherry picked from commit c0a7620)
(cherry picked from commit feaa3e2)
(cherry picked from commit bccdf19)
(cherry picked from commit 358ce15)
Bumps [junit](https://github.com/junit-team/junit4) from 4.9 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
- [Commits](junit-team/junit4@r4.9...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 4810348)
Bumps [junit](https://github.com/junit-team/junit4) from 4.9 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
- [Commits](junit-team/junit4@r4.9...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit b260562)
Bumps [junit](https://github.com/junit-team/junit4) from 4.9 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
- [Commits](junit-team/junit4@r4.9...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 189a694)
(cherry picked from commit 15ad02b)
(cherry picked from commit 5d6c290)
(cherry picked from commit 51369d2)
(cherry picked from commit ae3b449)
(cherry picked from commit bbf3329)
(cherry picked from commit 5519d39)
(cherry picked from commit 520b690)
paultuckey and others added 26 commits November 4, 2023 16:13
(cherry picked from commit 1501e9f)
(cherry picked from commit f4293f8)
(cherry picked from commit 59107fb)
(cherry picked from commit 58962ac)
(cherry picked from commit bd905bd)
(cherry picked from commit b6eb067)
(cherry picked from commit 9b35a66)
Bumps ant from 1.7.0 to 1.10.11.

---
updated-dependencies:
- dependency-name: org.apache.ant:ant
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

(cherry picked from commit fac9851)
(cherry picked from commit b936cba)
(cherry picked from commit db09b69)
(cherry picked from commit 3896147)
(cherry picked from commit 3385a51)
(cherry picked from commit 65c111f)
(cherry picked from commit 3c39547)
(cherry picked from commit 178650a)
(cherry picked from commit 7817bf2)
(cherry picked from commit 332a831)
(cherry picked from commit 7a8d1bb)
(cherry picked from commit bacf03f)
(cherry picked from commit 3459e2f)
(cherry picked from commit 4247add)
(cherry picked from commit 574906a)
(cherry picked from commit 2eed91f)
(cherry picked from commit ec67926)
@chadlwilson
Copy link
Author

Actions run for a basic build is passing at https://github.com/chadlwilson/urlrewritefilter/actions/runs/6753709837/job/18360469952 :-)

@chadlwilson chadlwilson changed the title Experimental attempt to create a 4.0.5 build Create 4.x branch in preparation for a 4.0.5 release Nov 4, 2023
@chadlwilson
Copy link
Author

Hello @paultuckey - as discussed at #191 (comment) I've had a go at this here.

Am I on the right track with this? Aside from doing some more sanity testing myself, how might I get it into a state that is easier to maintain and release?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet