diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-datastore.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-datastore.mod index 7c7d26edecb..ddf9a94d3e8 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-datastore.mod +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-datastore.mod @@ -8,7 +8,6 @@ gcloud [depends] gcloud jcl-slf4j -slf4j-impl [files] maven://com.google.cloud/google-cloud-datastore/0.4.0|lib/gcloud/google-cloud-datastore-0.4.0.jar diff --git a/jetty-util/src/main/config/modules/jcl-slf4j.mod b/jetty-util/src/main/config/modules/jcl-slf4j.mod index 786e52d6f6b..8b498060ec8 100644 --- a/jetty-util/src/main/config/modules/jcl-slf4j.mod +++ b/jetty-util/src/main/config/modules/jcl-slf4j.mod @@ -8,7 +8,7 @@ slf4j internal [depends] -slf4j-api +slf4j-impl [provides] jcl-api diff --git a/jetty-util/src/main/config/modules/jul-impl.mod b/jetty-util/src/main/config/modules/jul-impl.mod index eecbf0830cc..bcb61de4b5c 100644 --- a/jetty-util/src/main/config/modules/jul-impl.mod +++ b/jetty-util/src/main/config/modules/jul-impl.mod @@ -14,7 +14,7 @@ jul-api jul-impl [files] -basehome:modules/jul/java-util-logging.properties|etc/java-util-logging.properties +basehome:modules/jul-impl/java-util-logging.properties|etc/java-util-logging.properties logs/ [exec] diff --git a/jetty-util/src/main/config/modules/jul/java-util-logging.properties b/jetty-util/src/main/config/modules/jul-impl/java-util-logging.properties similarity index 100% rename from jetty-util/src/main/config/modules/jul/java-util-logging.properties rename to jetty-util/src/main/config/modules/jul-impl/java-util-logging.properties diff --git a/jetty-util/src/main/config/modules/jul-slf4j.mod b/jetty-util/src/main/config/modules/jul-slf4j.mod new file mode 100644 index 00000000000..34406813e26 --- /dev/null +++ b/jetty-util/src/main/config/modules/jul-slf4j.mod @@ -0,0 +1,24 @@ +[description] +Provides a Java Util Loggin binding to SLF4J logging. + +[tags] +logging +slf4j +internal + +[depend] +slf4j-impl + +[provide] +jul-impl + +[files] +maven://org.slf4j/jul-to-slf4j/${slf4j.version}|lib/slf4j/jul-to-slf4j-${slf4j.version}.jar +basehome:modules/jul-slf4j/java-util-logging.properties|etc/java-util-logging.properties + +[lib] +lib/slf4j/jul-to-slf4j-${slf4j.version}.jar + +[exec] +-Djava.util.logging.config.file=etc/java-util-logging.properties + diff --git a/jetty-util/src/main/config/modules/jul-slf4j/java-util-logging.properties b/jetty-util/src/main/config/modules/jul-slf4j/java-util-logging.properties new file mode 100644 index 00000000000..9c03ec8420d --- /dev/null +++ b/jetty-util/src/main/config/modules/jul-slf4j/java-util-logging.properties @@ -0,0 +1,2 @@ +handlers = org.slf4j.bridge.SLF4JBridgeHandler +.level = INFO diff --git a/jetty-util/src/main/config/modules/slf4j-simple-impl.mod b/jetty-util/src/main/config/modules/slf4j-simple-impl.mod index ef21516ae7d..20738e8d909 100644 --- a/jetty-util/src/main/config/modules/slf4j-simple-impl.mod +++ b/jetty-util/src/main/config/modules/slf4j-simple-impl.mod @@ -11,6 +11,9 @@ internal slf4j-api resources +[provide] +slf4j-impl + [files] maven://org.slf4j/slf4j-simple/${slf4j.version}|lib/slf4j/slf4j-simple-${slf4j.version}.jar basehome:modules/slf4j/simplelogger.properties|resources/simplelogger.properties