Merge pull request #3342 from eclipse/jetty-10.0.x-3320-review_module_info

Fixes #3320 - Review Jetty 10 module-info.java.
This commit is contained in:
Simone Bordet 2019-02-12 21:51:36 +01:00 committed by GitHub
commit 477d7cf1da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 139 additions and 96 deletions

View File

@ -24,13 +24,13 @@ import org.eclipse.jetty.apache.jsp.JuliLog;
module org.eclipse.jetty.apache.jsp
{
exports org.eclipse.jetty.jsp;
exports org.eclipse.jetty.apache.jsp;
exports org.eclipse.jetty.jsp;
requires java.xml;
requires jetty.servlet.api;
requires org.eclipse.jetty.util;
requires org.mortbay.apache.jasper;
requires static jetty.servlet.api;
provides Log with JuliLog;
provides ServletContainerInitializer with JettyJasperInitializer;

View File

@ -22,8 +22,8 @@ module org.eclipse.jetty.alpn.client
{
exports org.eclipse.jetty.alpn.client;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.util;
uses ALPNProcessor.Client;
}

View File

@ -21,10 +21,10 @@ import org.eclipse.jetty.io.ssl.ALPNProcessor;
module org.eclipse.jetty.alpn.conscrypt.client
{
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.alpn.client;
requires org.conscrypt;
requires org.eclipse.jetty.alpn.client;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.util;
provides ALPNProcessor.Client with ConscryptClientALPNProcessor;
}

View File

@ -21,10 +21,10 @@ import org.eclipse.jetty.io.ssl.ALPNProcessor;
module org.eclipse.jetty.alpn.conscrypt.server
{
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.alpn.server;
requires org.conscrypt;
requires org.eclipse.jetty.alpn.server;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.util;
provides ALPNProcessor.Server with ConscryptServerALPNProcessor;
}

View File

@ -21,9 +21,9 @@ import org.eclipse.jetty.io.ssl.ALPNProcessor;
module org.eclipse.jetty.alpn.java.client
{
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.alpn.client;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.util;
provides ALPNProcessor.Client with JDK9ClientALPNProcessor;
}

View File

@ -21,9 +21,9 @@ import org.eclipse.jetty.io.ssl.ALPNProcessor;
module org.eclipse.jetty.alpn.java.server
{
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.alpn.server;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.util;
provides ALPNProcessor.Server with JDK9ServerALPNProcessor;
}

View File

@ -22,9 +22,9 @@ module org.eclipse.jetty.alpn.server
{
exports org.eclipse.jetty.alpn.server;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.util;
uses ALPNProcessor.Server;
}

View File

@ -25,17 +25,17 @@ module org.eclipse.jetty.annotations
{
exports org.eclipse.jetty.annotations;
requires java.naming;
requires java.annotation;
requires java.naming;
requires jetty.servlet.api;
requires org.objectweb.asm;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.plus;
requires org.eclipse.jetty.security;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.servlet;
requires org.eclipse.jetty.security;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.webapp;
requires org.objectweb.asm;
uses ServletContainerInitializer;

View File

@ -20,13 +20,16 @@ module org.eclipse.jetty.client
{
exports org.eclipse.jetty.client;
exports org.eclipse.jetty.client.api;
exports org.eclipse.jetty.client.util;
exports org.eclipse.jetty.client.jmx to org.eclipse.jetty.jmx;
exports org.eclipse.jetty.client.http;
exports org.eclipse.jetty.client.jmx to org.eclipse.jetty.jmx;
exports org.eclipse.jetty.client.util;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.util;
// Only required if using SPNEGO.
requires static java.security.jgss;
// Only required if using JMX.
requires static org.eclipse.jetty.jmx;
}

View File

@ -28,5 +28,7 @@ module org.eclipse.jetty.deploy
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.webapp;
requires org.eclipse.jetty.xml;
// Only required if using JMX.
requires static org.eclipse.jetty.jmx;
}

View File

@ -23,8 +23,8 @@ module org.eclipse.jetty.fcgi.client
exports org.eclipse.jetty.fcgi.generator to org.eclipse.jetty.fcgi.server;
exports org.eclipse.jetty.fcgi.parser to org.eclipse.jetty.fcgi.server;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.client;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.client;
requires org.eclipse.jetty.util;
}

View File

@ -14,15 +14,11 @@
<bundle-symbolic-name>${project.groupId}.server</bundle-symbolic-name>
</properties>
<build>
<plugins>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>

View File

@ -21,12 +21,14 @@ module org.eclipse.jetty.fcgi.server
exports org.eclipse.jetty.fcgi.server;
exports org.eclipse.jetty.fcgi.server.proxy;
requires jetty.servlet.api;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.client;
requires org.eclipse.jetty.fcgi.client;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.client;
requires org.eclipse.jetty.proxy;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.fcgi.client;
requires org.eclipse.jetty.util;
// Only required if using the proxy features.
requires static jetty.servlet.api;
}

View File

@ -29,7 +29,7 @@
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>

View File

@ -24,8 +24,10 @@ module org.eclipse.jetty.http
exports org.eclipse.jetty.http;
exports org.eclipse.jetty.http.pathmap;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.util;
// Only required if using the MultiPart classes.
requires static jetty.servlet.api;
uses HttpFieldPreEncoder;

View File

@ -20,9 +20,9 @@ module org.eclipse.jetty.http2.client
{
exports org.eclipse.jetty.http2.client;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.alpn.client;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.http2.common;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.util;
}

View File

@ -25,8 +25,8 @@ module org.eclipse.jetty.http2.common
exports org.eclipse.jetty.http2.generator;
exports org.eclipse.jetty.http2.parser;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.http2.hpack;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.util;
}

View File

@ -23,8 +23,8 @@ module org.eclipse.jetty.http2.hpack
{
exports org.eclipse.jetty.http2.hpack;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.util;
provides HttpFieldPreEncoder with HpackFieldPreEncoder;
}

View File

@ -20,11 +20,11 @@ module org.eclipse.jetty.http2.http.client.transport
{
exports org.eclipse.jetty.http2.client.http;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.client;
requires org.eclipse.jetty.http2.common;
requires org.eclipse.jetty.http2.client;
requires org.eclipse.jetty.alpn.client;
requires org.eclipse.jetty.client;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.http2.client;
requires org.eclipse.jetty.http2.common;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.util;
}

View File

@ -20,9 +20,9 @@ module org.eclipse.jetty.http2.server
{
exports org.eclipse.jetty.http2.server;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.http2.common;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.http2.common;
requires org.eclipse.jetty.util;
}

View File

@ -24,8 +24,10 @@ module org.eclipse.jetty.jaas
requires java.naming;
requires jetty.servlet.api;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.security;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.util;
// Only required if using JDBCLoginModule.
requires static java.sql;
}

View File

@ -22,10 +22,10 @@ module org.eclipse.jetty.security.jaspi
exports org.eclipse.jetty.security.jaspi.callback;
exports org.eclipse.jetty.security.jaspi.modules;
requires jetty.servlet.api;
requires javax.security.auth.message;
requires org.eclipse.jetty.util;
requires jetty.servlet.api;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.security;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.util;
}

View File

@ -20,8 +20,12 @@ module org.eclipse.jetty.jmx
{
exports org.eclipse.jetty.jmx;
requires transitive java.management;
requires org.eclipse.jetty.util;
// Only required if using ConnectorServer.
requires static java.management.rmi;
requires static java.rmi;
requires org.eclipse.jetty.util;
// Applications that use ObjectMBean must use JMX classes too.
requires transitive java.management;
}

View File

@ -24,9 +24,12 @@ module org.eclipse.jetty.jndi
exports org.eclipse.jetty.jndi.local;
requires java.naming;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.util;
// Only required if using DataSourceCloser.
requires static java.sql;
// Only required if using MailSessionReference.
requires static javax.mail.glassfish;
requires static org.eclipse.jetty.security;
}

View File

@ -29,14 +29,17 @@ module org.eclipse.jetty.plus
requires java.naming;
requires java.transaction;
requires org.eclipse.jetty.util;
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;
requires static jetty.servlet.api;
requires static org.eclipse.jetty.server;
// Only required if using RunAs.
requires static org.eclipse.jetty.servlet;
provides Configuration with EnvConfiguration, PlusConfiguration;

View File

@ -21,9 +21,9 @@ module org.eclipse.jetty.proxy
exports org.eclipse.jetty.proxy;
requires jetty.servlet.api;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.client;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.client;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.util;
}

View File

@ -22,12 +22,12 @@ module org.eclipse.jetty.quickstart
requires jetty.servlet.api;
requires org.eclipse.jetty.annotations;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.xml;
requires org.eclipse.jetty.plus;
requires org.eclipse.jetty.security;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.servlet;
requires org.eclipse.jetty.security;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.webapp;
requires org.eclipse.jetty.xml;
}

View File

@ -22,8 +22,8 @@ module org.eclipse.jetty.rewrite
exports org.eclipse.jetty.rewrite.handler;
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.util;
}

View File

@ -22,9 +22,12 @@ module org.eclipse.jetty.security
exports org.eclipse.jetty.security.authentication;
requires jetty.servlet.api;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.util;
// Only required if using JDBCLoginService.
requires static java.sql;
// Only required if using SPNEGO.
requires static java.security.jgss;
}

View File

@ -19,17 +19,20 @@
module org.eclipse.jetty.server
{
exports org.eclipse.jetty.server;
exports org.eclipse.jetty.server.jmx to org.eclipse.jetty.jmx;
exports org.eclipse.jetty.server.handler;
exports org.eclipse.jetty.server.handler.gzip;
exports org.eclipse.jetty.server.handler.jmx to org.eclipse.jetty.jmx;
exports org.eclipse.jetty.server.jmx to org.eclipse.jetty.jmx;
exports org.eclipse.jetty.server.session;
requires jetty.servlet.api;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.util;
// Only required if using DatabaseAdaptor/JDBCSessionDataStore.
requires static java.sql;
requires static java.naming;
// Only required if using JMX.
requires static org.eclipse.jetty.jmx;
}

View File

@ -25,10 +25,14 @@ 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;
// Only required if using StatisticsServlet.
requires static java.management;
// Only required if using IntrospectorCleaner.
requires static java.desktop;
requires static org.eclipse.jetty.io;
// Only required if using JMX.
requires static org.eclipse.jetty.jmx;
}

View File

@ -16,13 +16,20 @@
// ========================================================================
//
// This module is a mixed bag of things.
// There are some utility classes that only depend on Servlet APIs,
// but other utility classes that depend on some Jetty module.
module org.eclipse.jetty.servlets
{
exports org.eclipse.jetty.servlets;
requires static jetty.servlet.api;
requires static org.eclipse.jetty.util;
requires jetty.servlet.api;
// Only required if using CloseableDoSFilter.
requires static org.eclipse.jetty.io;
// Only required if using DoSFilter, PushCacheFilter, etc.
requires static org.eclipse.jetty.http;
requires static org.eclipse.jetty.server;
// Only required if using CrossOriginFilter, DoSFilter, etc.
requires static org.eclipse.jetty.util;
}

View File

@ -32,12 +32,17 @@ module org.eclipse.jetty.util
exports org.eclipse.jetty.util.thread;
exports org.eclipse.jetty.util.thread.strategy;
// Only required if using AppContextLeakPreventer/AWTLeakPreventer.
requires static java.desktop;
// Only required if using X509.
requires static java.naming;
// Only required if using JavaUtilLog.
requires static java.logging;
// Only required if using DriverManagerLeakPreventer.
requires static java.sql;
// Only required if using DOMLeakPreventer.
requires static java.xml;
requires static jetty.servlet.api;
// Only required if using Slf4jLog.
requires static org.slf4j;
uses CredentialProvider;

View File

@ -25,19 +25,19 @@ module org.eclipse.jetty.webapp
requires java.instrument;
requires java.xml;
requires jetty.servlet.api;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.security;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.servlet;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.xml;
uses Configuration;
provides Configuration with
org.eclipse.jetty.webapp.FragmentConfiguration,
org.eclipse.jetty.webapp.JettyWebXmlConfiguration,
org.eclipse.jetty.webapp.JaasConfiguration,
org.eclipse.jetty.webapp.JettyWebXmlConfiguration,
org.eclipse.jetty.webapp.JmxConfiguration,
org.eclipse.jetty.webapp.JndiConfiguration,
org.eclipse.jetty.webapp.JspConfiguration,

View File

@ -25,10 +25,10 @@ module org.eclipse.jetty.websocket.javax.client
exports org.eclipse.jetty.websocket.javax.client;
requires javax.websocket.api;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.client;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.client;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.websocket.core;
requires org.eclipse.jetty.websocket.javax.common;

View File

@ -25,8 +25,8 @@ module org.eclipse.jetty.websocket.javax.common
exports org.eclipse.jetty.websocket.javax.common.util;
requires javax.websocket.api;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.websocket.core;
}

View File

@ -30,16 +30,16 @@ module org.eclipse.jetty.websocket.javax.server
requires jetty.servlet.api;
requires javax.websocket.api;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.client;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.client;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.servlet;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.webapp;
requires org.eclipse.jetty.websocket.core;
requires org.eclipse.jetty.websocket.javax.common;
requires org.eclipse.jetty.websocket.javax.client;
requires org.eclipse.jetty.websocket.javax.common;
requires org.eclipse.jetty.websocket.servlet;
provides ServletContainerInitializer with JavaxWebSocketServletContainerInitializer;

View File

@ -20,12 +20,14 @@ module org.eclipse.jetty.websocket.jetty.client
{
exports org.eclipse.jetty.websocket.client;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.client;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.client;
requires static org.eclipse.jetty.xml;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.websocket.jetty.api;
requires org.eclipse.jetty.websocket.core;
requires org.eclipse.jetty.websocket.jetty.common;
// Only required if using XmlBasedHttpClientProvider.
requires static org.eclipse.jetty.xml;
}

View File

@ -23,8 +23,8 @@ module org.eclipse.jetty.websocket.jetty.common
exports org.eclipse.jetty.websocket.common.message;
exports org.eclipse.jetty.websocket.common.util;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.websocket.core;
requires org.eclipse.jetty.websocket.jetty.api;
}

View File

@ -36,7 +36,7 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>

View File

@ -27,17 +27,19 @@ module org.eclipse.jetty.websocket.jetty.server
exports org.eclipse.jetty.websocket.server;
requires jetty.servlet.api;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.server;
requires static org.eclipse.jetty.jmx;
requires org.eclipse.jetty.servlet;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.webapp;
requires org.eclipse.jetty.websocket.jetty.api;
requires org.eclipse.jetty.websocket.core;
requires org.eclipse.jetty.websocket.jetty.api;
requires org.eclipse.jetty.websocket.jetty.common;
requires org.eclipse.jetty.websocket.servlet;
// Only required if using JMX.
requires static org.eclipse.jetty.jmx;
provides ServletContainerInitializer with JettyWebSocketServletContainerInitializer;
provides Configuration with JettyWebSocketConfiguration;
}

View File

@ -33,19 +33,19 @@ module org.eclipse.jetty.websocket.core
exports org.eclipse.jetty.websocket.core.internal.compress to org.eclipse.jetty.util;
requires jetty.servlet.api;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.client;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.client;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.util;
uses Extension;
provides Extension with
IdentityExtension,
FragmentExtension,
ValidationExtension,
PerMessageDeflateExtension,
DeflateFrameExtension,
FragmentExtension,
IdentityExtension,
PerMessageDeflateExtension,
ValidationExtension,
XWebkitDeflateFrameExtension;
}

View File

@ -21,10 +21,10 @@ module org.eclipse.jetty.websocket.servlet
exports org.eclipse.jetty.websocket.servlet;
requires jetty.servlet.api;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.http;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.io;
requires org.eclipse.jetty.server;
requires org.eclipse.jetty.servlet;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.websocket.core;
}