diff --git a/runtime/local_jetty121/src/main/java/com/google/appengine/tools/development/jetty/AppEngineAnnotationConfiguration.java b/runtime/local_jetty121/src/main/java/com/google/appengine/tools/development/jetty/AppEngineAnnotationConfiguration.java index aae9160e1..16b2a2edb 100644 --- a/runtime/local_jetty121/src/main/java/com/google/appengine/tools/development/jetty/AppEngineAnnotationConfiguration.java +++ b/runtime/local_jetty121/src/main/java/com/google/appengine/tools/development/jetty/AppEngineAnnotationConfiguration.java @@ -31,6 +31,9 @@ public class AppEngineAnnotationConfiguration extends AnnotationConfiguration { @Override public List getNonExcludedInitializers(WebAppContext context) throws Exception { + // TODO: remove this line when https://github.com/jetty/jetty.project/issues/14431 is resolved. + context.getMetaData().orderFragments(); + ArrayList nonExcludedInitializers = new ArrayList<>(super.getNonExcludedInitializers(context)); for (ServletContainerInitializer sci : nonExcludedInitializers) { diff --git a/runtime/local_jetty121_ee11/src/main/java/com/google/appengine/tools/development/jetty/ee11/AppEngineAnnotationConfiguration.java b/runtime/local_jetty121_ee11/src/main/java/com/google/appengine/tools/development/jetty/ee11/AppEngineAnnotationConfiguration.java index e921fce5c..7e6927df3 100644 --- a/runtime/local_jetty121_ee11/src/main/java/com/google/appengine/tools/development/jetty/ee11/AppEngineAnnotationConfiguration.java +++ b/runtime/local_jetty121_ee11/src/main/java/com/google/appengine/tools/development/jetty/ee11/AppEngineAnnotationConfiguration.java @@ -29,6 +29,8 @@ public class AppEngineAnnotationConfiguration extends AnnotationConfiguration { @Override protected List getNonExcludedInitializers(State state) { + // TODO: remove this line when https://github.com/jetty/jetty.project/issues/14431 is resolved. + state._context.getMetaData().orderFragments(); List initializers = super.getNonExcludedInitializers(state); for (ServletContainerInitializer sci : initializers) {