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

Issue #9301 Fix dependencies for ee10-glassfish-jstl module #9303

Merged

Conversation

janbartel
Copy link
Contributor

First part of fixes for #9301.

This PR:

  • restores the dependency on ee10-apache-jsp to the ee10-glassfish-jsp module
  • prevents the copying of the jakarta.servlet.jsp-api jars to the jetty-home/lib/ee10-glassfish-jstl directory

@janbartel janbartel self-assigned this Feb 2, 2023
@janbartel janbartel marked this pull request as ready for review February 3, 2023 00:41
@janbartel janbartel requested review from olamy and gregw February 3, 2023 00:41
Copy link
Member

@olamy olamy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM do we have any distribution test for this?

@janbartel
Copy link
Contributor Author

LGTM do we have any distribution test for this?

Yes there are distro tests for jstl, but none of our distro tests would have picked up on duplicate classes in different jars.

@janbartel janbartel merged commit 751b0a8 into jetty-12.0.x Feb 8, 2023
@janbartel janbartel deleted the jetty-12.0.x-9301-fix-ee10-glassfish-jstl-module branch February 8, 2023 22:35
gregpoulos pushed a commit to gregpoulos/jetty.project that referenced this pull request Feb 9, 2023
…x-documentation-operations-logging

* upstream/jetty-12.0.x: (35 commits)
  Fixes jetty#9326 - Rename DecryptedEndPoint to SslEndPoint.
  Jetty 10 Upgrade to Hazelcast 5 and totally disable auto join multicast etc.. (fix build on CI) (jetty#9331)
  jetty#9328 - changes from review
  jetty#9287 - catch error in ee9 maxRequestSize MultiPart test
  Jetty 12.0.x 9301 fix ee10 jstl jpms (jetty#9321)
  Issue jetty#9301 Fix dependencies for ee10-glassfish-jstl module (jetty#9303)
  Jetty 12 Hazelcast 5.x and disable auto detection/multicast" (jetty#9332)
  jetty#9287 - fix further test failures
  Fixed imports.
  Issue jetty#7650 - Fix race condition when stopping QueuedThreadPool (jetty#9325)
  jetty#9287 - remove unpaired release of Content.Chunk
  Issue jetty#8991 - rename websocket isDemanding() method to isAutoDemanding()
  Issue jetty#9287 - fix failing tests
  changes f rom review
  add todo to revert to normal pool after fix for jetty#9311
  Issue jetty#9309 - Introducing test for requestlog format with spaces
  use non-pooling RetainableByteBufferPool to work around performance bug
  consumeAvailable should use number of reads instead of bytes
  fix for retainable merge
  changes from review
  ...
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.

3 participants