Repository navigation
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up to #562 based on review feedback from @lachlan-roberts.
Context & Summary of Changes
ContainerIncludeJarPatternRegex Matching:In Jetty 12.1.15, the servlet API jar was moved to
ee11/support/jakarta.servlet.jakarta.servlet-api-6.1.0.jar. The previous pattern anchored on/jakarta.servlet-api-no longer matched because of thejakarta.servlet.prefix.Dropping the leading
/allows.*jakarta.servlet-api-[^/]*\.jar$to match both the legacy name (jakarta.servlet-api-6.1.0.jar) and the 12.1.15 name (jakarta.servlet.jakarta.servlet-api-6.1.0.jar).EE11 DevAppServerModulesFilter Import Fix:
In
runtime/local_jetty121_ee11/src/main/java/com/google/appengine/tools/development/jetty/ee11/JettyContainerService.java, updated the import ofDevAppServerModulesFilterfrom thejavax.servletversion (com.google.appengine.tools.development.DevAppServerModulesFilter) to thejakartaversion (com.google.appengine.tools.development.jakarta.DevAppServerModulesFilter). This prevents a runtimeNoClassDefFoundError: javax/servlet/Filterwhen running EE11 applications under DevAppServer.Module Exclusion Parity:
In
api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE8Sdk.java, added exclusion for-ethereum-jars to align withJetty121EE11SdkandgetQuickStartClasspath().New Regression Tests (
JettySdkTest.java)Added comprehensive regression tests in
e2etests/devappservertests/src/test/java/com/google/appengine/tools/development/JettySdkTest.java:testContainerIncludeJarPatternMatchesSharedJars:Verifies that the
ContainerIncludeJarPatternconfigured onDevAppEngineWebAppContextsuccessfully matches the shared container jars (jakarta.servlet-apiand JSTL) in the SDK. This guarantees that TLDs and web fragments in shared libraries are scanned and accessible to webapps.testNoJuliLoggingSpiInSharedOrJspLibs:Inspects all jars in
lib/shared/andjetty121/jetty-home/lib/ee*/for both EE8 and EE11 to ensure no jar contains the Tomcat JULI Log ServiceLoader provider (META-INF/services/org.apache.juli.logging.Log), preventing classloader deadlocks and Commons-Logging hijacking.testJspClasspathContainsRequiredClasses:Verifies that all classes required for JSP compilation and runtime execution are resolvable from the combined user JSP libs and shared libs classpath on both environments:
javax.servlet.jsp.JspPage,org.apache.jasper.servlet.JspServletjakarta.servlet.jsp.JspPage,jakarta.el.RecordELResolver,org.glassfish.wasp.runtime.TldScannertestForbiddenModulesNotExposed:Verifies that optional, clustering, and non-supported Jetty modules (
-cdi-,-alpn-,-demo-,-websocket-,-gcloud-,-infinispan-,-hazelcast-,-ethereum-) are completely excluded from shared and JSP classpaths across both EE8 and EE11.Test & Coverage Status
devappservertests: 20/20 passed (100% pass rate)JettySdkTest: 9/9 passed (all 4 new tests verified)DevAppServerMainTest: 6/6 passed (verified EE8, EE10, EE11 under DevAppServer)JaxRsTest: 5/5 passedstagingtests: 293/293 passed (100% pass rate)