Merge branch 'jetty-9.4.x' into issues/logging

2016-10-24 12:45:39 -04:00 · 2016-10-24 12:45:39 -04:00 · 7432db90c5
parent 7d4b46cef4 1e76c99442
commit 7432db90c5
2 changed files with 1 additions and 4 deletions
--- a/jetty-util/src/main/config/modules/jul-impl.mod
+++ b/jetty-util/src/main/config/modules/jul-impl.mod
@ -6,9 +6,6 @@ logging
 jul
 internal

-[depends]
-resources
-
 [provides]
 jul-api
 jul-impl
--- a/jetty-util/src/main/config/modules/slf4j-simple-impl.mod
+++ b/jetty-util/src/main/config/modules/slf4j-simple-impl.mod
@ -16,7 +16,7 @@ slf4j-impl

 [files]
 maven://org.slf4j/slf4j-simple/${slf4j.version}|lib/slf4j/slf4j-simple-${slf4j.version}.jar
-basehome:modules/slf4j-impl
+basehome:modules/slf4j-simple-impl

 [lib]
 lib/slf4j/slf4j-simple-${slf4j.version}.jar