Fixes #3320 - Review Jetty 10 module-info.java.

After review, keeping "requires static" only if the
module tree can be built without the static module.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2019-02-12 21:17:58 +01:00
parent b9f89af847
commit ae207bd6dc
3 changed files with 4 additions and 7 deletions

View File

@ -29,18 +29,16 @@ module org.eclipse.jetty.plus
requires java.naming;
requires java.transaction;
requires jetty.servlet.api;
requires org.eclipse.jetty.jndi;
requires org.eclipse.jetty.security;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.webapp;
requires org.eclipse.jetty.xml;
// Only required if using DataSourceLoginService.
requires static java.sql;
// Only required if using ContainerInitializer.
requires static jetty.servlet.api;
// Only required if using DataSourceLoginService.
requires static org.eclipse.jetty.server;
// Only required if using RunAs.
requires static org.eclipse.jetty.servlet;

View File

@ -25,6 +25,7 @@ module org.eclipse.jetty.servlet
requires jetty.servlet.api;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.security;
@ -32,8 +33,6 @@ module org.eclipse.jetty.servlet
requires static java.management;
// Only required if using IntrospectorCleaner.
requires static java.desktop;
// Only required if using StatisticsServlet.
requires static org.eclipse.jetty.io;
// Only required if using JMX.
requires static org.eclipse.jetty.jmx;
}

View File

@ -42,7 +42,7 @@ module org.eclipse.jetty.util
requires static java.sql;
// Only required if using DOMLeakPreventer.
requires static java.xml;
// Only required when using Jetty logging.
// Only required if using Slf4jLog.
requires static org.slf4j;
uses CredentialProvider;