Skip to content

allow Jetty 9.4 jetty-servlets class names to work with Jetty 12 - #345

Merged
copybara-service[bot] merged 5 commits into
mainfrom
b374963516-servlet-filters
Feb 20, 2025
Merged

allow Jetty 9.4 jetty-servlets class names to work with Jetty 12#345
copybara-service[bot] merged 5 commits into
mainfrom
b374963516-servlet-filters

Conversation

@lachlan-roberts

Copy link
Copy Markdown
Collaborator

The package name of jetty-servlets classes has changed from Jetty 9.4 to Jetty 12.

This PR allows applications to use the old jetty-servlets class names, for example org.eclipse.jetty.servlets.CrossOriginFilter would be translated to org.eclipse.jetty.ee8.servlets.CrossOriginFilter for the EE8 environment.

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
@lachlan-roberts

Copy link
Copy Markdown
Collaborator Author

Note some of the classes in jetty-servlets are deprecated in Jetty 9.4 and have been removed in in Jetty 12.

  • AsyncGzipFilter
  • CGI
  • ConcatServlet
  • DataRateLimitedServlet
  • GzipFilter
  • IncludableGzipFilter
  • MultiPartFilter
  • PushCacheFilter
  • PushSessionCacheFilter
  • PutFilter
  • WelcomeFilter

@ludoch

ludoch commented Feb 19, 2025

Copy link
Copy Markdown
Collaborator

@maigovannon Ideally, a member in BLR should add a e2e test for such app using these servlets. Good learning step in our e2e app tests in this repo.

@ludoch

ludoch commented Feb 19, 2025

Copy link
Copy Markdown
Collaborator

Also wondering if the local devappserver would also serve such apps...

@maigovannon

Copy link
Copy Markdown
Collaborator

@maigovannon Ideally, a member in BLR should add a e2e test for such app using these servlets. Good learning step in our e2e app tests in this repo.

Makes sense. We can take it up as a follow-up.

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
@copybara-service
copybara-service Bot merged commit a018522 into main Feb 20, 2025
@copybara-service
copybara-service Bot deleted the b374963516-servlet-filters branch February 20, 2025 16:37
copybara-service Bot pushed a commit that referenced this pull request Mar 11, 2025
…is related to #345

PiperOrigin-RevId: 735623640
Change-Id: I6b2e351765d0778cc2ded07255be8c84b46181db
ludoch added a commit that referenced this pull request Mar 18, 2025
* Bump io.netty:netty-common from 4.1.117.Final to 4.1.118.Final

Bumps [io.netty:netty-common](https://github.com/netty/netty) from 4.1.117.Final to 4.1.118.Final.
- [Commits](netty/netty@netty-4.1.117.Final...netty-4.1.118.Final)

---
updated-dependencies:
- dependency-name: io.netty:netty-common
  dependency-type: direct:production
...

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

* - Add Maven CI action for building with Zulu and Liberica JDKs for Java 21, 23.
- Removing Java 22 from all JDK since we can now safely just test on JDK23 and the upcoming JDK24.

PiperOrigin-RevId: 727603486
Change-Id: I73c659ef58fe85fb6d9964d0997949eccec08aeb

* allow Jetty 9.4 jetty-servlets class names to work with Jetty 12

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

* allow Jetty 9.4 jetty-servlets class names to work with Jetty 12

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

* allow Jetty 9.4 jetty-servlets class names to work with Jetty 12

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

* Upgrade GAE Java version from 2.0.32 to 2.0.33 and prepare next version 2.0.34-SNAPSHOT

PiperOrigin-RevId: 728533780
Change-Id: Ic8bd0b0863999092f469267dbb15d0eca39a92db

* PR #345 - changes from review

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

* PR #345 - fixes for broken tests

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

* Set API host idle timeout to 2 seconds by default instead of no timeout. See jetty/jetty.project#3891

PiperOrigin-RevId: 729286826
Change-Id: Iea5120e9e46db5874fd95426537f4136bf876f84

* Set API host idle timeout to 2 seconds by default instead of no timeout. See jetty/jetty.project#3891

PiperOrigin-RevId: 729581319
Change-Id: I85a21e3fdd2cc5c5c250ff048632f5687870a049

* Update all non-major dependencies

* Set API host idle timeout to 25 seconds by default instead of no timeout. See jetty/jetty.project#3891

PiperOrigin-RevId: 731360214
Change-Id: Ifedd44381e45a318ab38705d910ba3f41317ee79

* Update all non-major dependencies

* Update to Jetty 12.0.17 and allow invalid pathSpecs in EE8

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

* Internal change

PiperOrigin-RevId: 734104453
Change-Id: I0ad3f52c675374e3f9337a02ebf5b5668eef8b1b

* Update all non-major dependencies

* Adding `org.eclipse.jetty.servlet` to deprecated package names. This is related to #345

PiperOrigin-RevId: 735623640
Change-Id: I6b2e351765d0778cc2ded07255be8c84b46181db

* Fix App Engine tests for Windows.

This change addresses several issues that prevented App Engine tests from passing on Windows:

- **Maven Wrapper:** The Maven wrapper executable `mvnw` is now invoked with the `.cmd` extension when running on Windows to ensure it can be executed correctly.
- **Newline Handling:** Test output reading logic has been updated to handle both `\n` and `\r\n` newline representations, which is necessary for Windows compatibility.

These changes ensure that the affected tests pass on both Linux/macOS and Windows environments.

PiperOrigin-RevId: 736207509
Change-Id: I7c11b010689343ccdbf9b29801e17569064bb867

* Copybara import of the project:

--
a47b5b3 by Lachlan Roberts <lachlan.p.roberts@gmail.com>:

fix JSPs from appengine-local-runtime-shared-jetty12

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
COPYBARA_INTEGRATE_REVIEW=#350 from GoogleCloudPlatform:DevAppServer-JSP a47b5b3
PiperOrigin-RevId: 736601363
Change-Id: I231efd68881ea23227d1f8d1a21749cc02b71d0e

* Update all non-major dependencies

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Abhinand Sundararajan <abhinasu@google.com>
Co-authored-by: GAE Java Team <gae-java-bot@google.com>
Co-authored-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Co-authored-by: Srinjoy Ray <srinjoyray@google.com>
Co-authored-by: Mend Renovate <bot@renovateapp.com>
Co-authored-by: Lachlan <lachlan@webtide.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants