From a9f728f49c21d6ce9108182ded340aa537a2995f Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 28 Sep 2020 14:33:06 -0500 Subject: [PATCH] Issue #5360 - removing dependency to demo-jndi from demo-spec (#5364) * Issue #5360 - removing dependency to demo-jndi from demo-spec + Adding demo-jndi dep to demo.mod instead. Signed-off-by: Joakim Erdfelt --- demos/demo-spec-webapp/src/main/config/modules/demo-spec.mod | 1 - jetty-home/src/main/resources/modules/demo.mod | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/demo-spec-webapp/src/main/config/modules/demo-spec.mod b/demos/demo-spec-webapp/src/main/config/modules/demo-spec.mod index 9f4be92cea31..9f3de374b769 100644 --- a/demos/demo-spec-webapp/src/main/config/modules/demo-spec.mod +++ b/demos/demo-spec-webapp/src/main/config/modules/demo-spec.mod @@ -14,7 +14,6 @@ jsp annotations ext demo-realm -demo-jndi [files] basehome:modules/demo.d/demo-spec.xml|webapps/demo-spec.xml diff --git a/jetty-home/src/main/resources/modules/demo.mod b/jetty-home/src/main/resources/modules/demo.mod index e30ff9fb233f..7da68ac6ce7a 100644 --- a/jetty-home/src/main/resources/modules/demo.mod +++ b/jetty-home/src/main/resources/modules/demo.mod @@ -19,6 +19,7 @@ demo-moved-context demo-proxy demo-rewrite demo-root +demo-jndi demo-spec [ini-template]