Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changed order of entries in module-info.java to be canonical #6937

Merged
merged 1 commit into from Sep 30, 2021
Merged

Changed order of entries in module-info.java to be canonical #6937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 8 additions & 10 deletions apache-jsp/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -11,22 +11,20 @@
// ========================================================================
//

import jakarta.servlet.ServletContainerInitializer;
import org.apache.juli.logging.Log;
import org.eclipse.jetty.apache.jsp.JettyJasperInitializer;
import org.eclipse.jetty.apache.jsp.JuliLog;

module org.eclipse.jetty.apache.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 org.slf4j;

provides Log with JuliLog;
provides ServletContainerInitializer with JettyJasperInitializer;
exports org.eclipse.jetty.apache.jsp;
exports org.eclipse.jetty.jsp;

provides org.apache.juli.logging.Log with
org.eclipse.jetty.apache.jsp.JuliLog;

provides jakarta.servlet.ServletContainerInitializer with
org.eclipse.jetty.apache.jsp.JettyJasperInitializer;
}
9 changes: 4 additions & 5 deletions jetty-alpn/jetty-alpn-client/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -11,14 +11,13 @@
// ========================================================================
//

import org.eclipse.jetty.io.ssl.ALPNProcessor;

module org.eclipse.jetty.alpn.client
{
exports org.eclipse.jetty.alpn.client;
requires org.slf4j;

requires transitive org.eclipse.jetty.io;
requires org.slf4j;

uses ALPNProcessor.Client;
exports org.eclipse.jetty.alpn.client;

uses org.eclipse.jetty.io.ssl.ALPNProcessor.Client;
}
9 changes: 4 additions & 5 deletions jetty-alpn/jetty-alpn-conscrypt-client/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -11,14 +11,13 @@
// ========================================================================
//

import org.eclipse.jetty.alpn.conscrypt.client.ConscryptClientALPNProcessor;
import org.eclipse.jetty.io.ssl.ALPNProcessor;

module org.eclipse.jetty.alpn.conscrypt.client
{
requires org.conscrypt;
requires transitive org.eclipse.jetty.alpn.client;
requires org.slf4j;

provides ALPNProcessor.Client with ConscryptClientALPNProcessor;
requires transitive org.eclipse.jetty.alpn.client;

provides org.eclipse.jetty.io.ssl.ALPNProcessor.Client with
org.eclipse.jetty.alpn.conscrypt.client.ConscryptClientALPNProcessor;
}
7 changes: 3 additions & 4 deletions jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -11,14 +11,13 @@
// ========================================================================
//

import org.eclipse.jetty.alpn.conscrypt.server.ConscryptServerALPNProcessor;
import org.eclipse.jetty.io.ssl.ALPNProcessor;

module org.eclipse.jetty.alpn.conscrypt.server
{
requires org.conscrypt;
requires org.slf4j;

requires transitive org.eclipse.jetty.alpn.server;

provides ALPNProcessor.Server with ConscryptServerALPNProcessor;
provides org.eclipse.jetty.io.ssl.ALPNProcessor.Server with
org.eclipse.jetty.alpn.conscrypt.server.ConscryptServerALPNProcessor;
}
9 changes: 4 additions & 5 deletions jetty-alpn/jetty-alpn-java-client/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -11,13 +11,12 @@
// ========================================================================
//

import org.eclipse.jetty.alpn.java.client.JDK9ClientALPNProcessor;
import org.eclipse.jetty.io.ssl.ALPNProcessor;

module org.eclipse.jetty.alpn.java.client
{
requires transitive org.eclipse.jetty.alpn.client;
requires org.slf4j;

provides ALPNProcessor.Client with JDK9ClientALPNProcessor;
requires transitive org.eclipse.jetty.alpn.client;

provides org.eclipse.jetty.io.ssl.ALPNProcessor.Client with
org.eclipse.jetty.alpn.java.client.JDK9ClientALPNProcessor;
}
7 changes: 3 additions & 4 deletions jetty-alpn/jetty-alpn-java-server/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -11,13 +11,12 @@
// ========================================================================
//

import org.eclipse.jetty.alpn.java.server.JDK9ServerALPNProcessor;
import org.eclipse.jetty.io.ssl.ALPNProcessor;

module org.eclipse.jetty.alpn.java.server
{
requires org.slf4j;

requires transitive org.eclipse.jetty.alpn.server;

provides ALPNProcessor.Server with JDK9ServerALPNProcessor;
provides org.eclipse.jetty.io.ssl.ALPNProcessor.Server with
org.eclipse.jetty.alpn.java.server.JDK9ServerALPNProcessor;
}
9 changes: 4 additions & 5 deletions jetty-alpn/jetty-alpn-server/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -11,14 +11,13 @@
// ========================================================================
//

import org.eclipse.jetty.io.ssl.ALPNProcessor;

module org.eclipse.jetty.alpn.server
{
exports org.eclipse.jetty.alpn.server;
requires org.slf4j;

requires transitive org.eclipse.jetty.server;
requires org.slf4j;

uses ALPNProcessor.Server;
exports org.eclipse.jetty.alpn.server;

uses org.eclipse.jetty.io.ssl.ALPNProcessor.Server;
}
16 changes: 7 additions & 9 deletions jetty-annotations/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -11,21 +11,19 @@
// ========================================================================
//

import jakarta.servlet.ServletContainerInitializer;
import org.eclipse.jetty.annotations.AnnotationConfiguration;
import org.eclipse.jetty.webapp.Configuration;

module org.eclipse.jetty.annotations
{
exports org.eclipse.jetty.annotations;

requires jakarta.annotation;
requires java.naming;
requires org.slf4j;

requires transitive org.eclipse.jetty.plus;
requires transitive org.objectweb.asm;
requires org.slf4j;

uses ServletContainerInitializer;
exports org.eclipse.jetty.annotations;

uses jakarta.servlet.ServletContainerInitializer;

provides Configuration with AnnotationConfiguration;
provides org.eclipse.jetty.webapp.Configuration with
org.eclipse.jetty.annotations.AnnotationConfiguration;
}
3 changes: 2 additions & 1 deletion jetty-cdi/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -14,7 +14,8 @@
module org.eclipse.jetty.cdi
{
requires org.eclipse.jetty.annotations;

requires transitive org.eclipse.jetty.webapp;

exports org.eclipse.jetty.cdi;
}
}
23 changes: 13 additions & 10 deletions jetty-client/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -13,20 +13,23 @@

module org.eclipse.jetty.client
{
exports org.eclipse.jetty.client;
exports org.eclipse.jetty.client.api;
exports org.eclipse.jetty.client.dynamic;
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.alpn.client;
requires transitive org.eclipse.jetty.http;
requires org.slf4j;

// Only required if using SPNEGO.
requires static java.security.jgss;
requires transitive org.eclipse.jetty.http;

// Only required if using JMX.
requires static java.management;
// Only required if using SPNEGO.
requires static java.security.jgss;
requires static org.eclipse.jetty.jmx;

exports org.eclipse.jetty.client;
exports org.eclipse.jetty.client.api;
exports org.eclipse.jetty.client.dynamic;
exports org.eclipse.jetty.client.http;
exports org.eclipse.jetty.client.util;

exports org.eclipse.jetty.client.jmx to
org.eclipse.jetty.jmx;
}
17 changes: 10 additions & 7 deletions jetty-deploy/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -13,17 +13,20 @@

module org.eclipse.jetty.deploy
{
exports org.eclipse.jetty.deploy;
exports org.eclipse.jetty.deploy.bindings;
exports org.eclipse.jetty.deploy.graph;
exports org.eclipse.jetty.deploy.jmx to org.eclipse.jetty.jmx;
exports org.eclipse.jetty.deploy.providers;

requires java.xml;
requires transitive org.eclipse.jetty.webapp;
requires org.eclipse.jetty.xml;
requires org.slf4j;

requires transitive org.eclipse.jetty.webapp;

// Only required if using JMX.
requires static org.eclipse.jetty.jmx;

exports org.eclipse.jetty.deploy;
exports org.eclipse.jetty.deploy.bindings;
exports org.eclipse.jetty.deploy.graph;
exports org.eclipse.jetty.deploy.providers;

exports org.eclipse.jetty.deploy.jmx to
org.eclipse.jetty.jmx;
}
7 changes: 4 additions & 3 deletions jetty-fcgi/fcgi-client/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -13,11 +13,12 @@

module org.eclipse.jetty.fcgi.client
{
requires org.slf4j;

requires transitive org.eclipse.jetty.client;

exports org.eclipse.jetty.fcgi;
exports org.eclipse.jetty.fcgi.client.http;
exports org.eclipse.jetty.fcgi.generator;
exports org.eclipse.jetty.fcgi.parser;

requires transitive org.eclipse.jetty.client;
requires org.slf4j;
}
7 changes: 4 additions & 3 deletions jetty-fcgi/fcgi-server/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -13,13 +13,14 @@

module org.eclipse.jetty.fcgi.server
{
exports org.eclipse.jetty.fcgi.server;
exports org.eclipse.jetty.fcgi.server.proxy;
requires org.slf4j;

requires transitive org.eclipse.jetty.fcgi.client;
requires transitive org.eclipse.jetty.proxy;
requires org.slf4j;

// Only required if using the proxy features.
requires static jetty.servlet.api;

exports org.eclipse.jetty.fcgi.server;
exports org.eclipse.jetty.fcgi.server.proxy;
}
15 changes: 7 additions & 8 deletions jetty-http/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -11,18 +11,17 @@
// ========================================================================
//

import org.eclipse.jetty.http.Http1FieldPreEncoder;
import org.eclipse.jetty.http.HttpFieldPreEncoder;

module org.eclipse.jetty.http
{
exports org.eclipse.jetty.http;
exports org.eclipse.jetty.http.pathmap;
requires org.slf4j;

requires transitive org.eclipse.jetty.io;
requires org.slf4j;

uses HttpFieldPreEncoder;
exports org.eclipse.jetty.http;
exports org.eclipse.jetty.http.pathmap;

uses org.eclipse.jetty.http.HttpFieldPreEncoder;

provides HttpFieldPreEncoder with Http1FieldPreEncoder;
provides org.eclipse.jetty.http.HttpFieldPreEncoder with
org.eclipse.jetty.http.Http1FieldPreEncoder;
}
7 changes: 4 additions & 3 deletions jetty-http2/http2-client/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -13,9 +13,10 @@

module org.eclipse.jetty.http2.client
{
exports org.eclipse.jetty.http2.client;

requires org.eclipse.jetty.alpn.client;
requires transitive org.eclipse.jetty.http2.common;
requires org.slf4j;

requires transitive org.eclipse.jetty.http2.common;

exports org.eclipse.jetty.http2.client;
}
7 changes: 4 additions & 3 deletions jetty-http2/http2-common/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -13,13 +13,14 @@

module org.eclipse.jetty.http2.common
{
requires org.slf4j;

requires transitive org.eclipse.jetty.http2.hpack;

exports org.eclipse.jetty.http2;
exports org.eclipse.jetty.http2.api;
exports org.eclipse.jetty.http2.api.server;
exports org.eclipse.jetty.http2.frames;
exports org.eclipse.jetty.http2.generator;
exports org.eclipse.jetty.http2.parser;

requires transitive org.eclipse.jetty.http2.hpack;
requires org.slf4j;
}
11 changes: 5 additions & 6 deletions jetty-http2/http2-hpack/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -11,15 +11,14 @@
// ========================================================================
//

import org.eclipse.jetty.http.HttpFieldPreEncoder;
import org.eclipse.jetty.http2.hpack.HpackFieldPreEncoder;

module org.eclipse.jetty.http2.hpack
{
exports org.eclipse.jetty.http2.hpack;
requires org.slf4j;

requires transitive org.eclipse.jetty.http;
requires org.slf4j;

provides HttpFieldPreEncoder with HpackFieldPreEncoder;
exports org.eclipse.jetty.http2.hpack;

provides org.eclipse.jetty.http.HttpFieldPreEncoder with
org.eclipse.jetty.http2.hpack.HpackFieldPreEncoder;
}
7 changes: 4 additions & 3 deletions jetty-http2/http2-http-client-transport/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -13,10 +13,11 @@

module org.eclipse.jetty.http2.http.client.transport
{
exports org.eclipse.jetty.http2.client.http;

requires org.eclipse.jetty.alpn.client;
requires org.slf4j;

requires transitive org.eclipse.jetty.client;
requires transitive org.eclipse.jetty.http2.client;
requires org.slf4j;

exports org.eclipse.jetty.http2.client.http;
}
5 changes: 3 additions & 2 deletions jetty-http2/http2-server/src/main/java/module-info.java
View file
Open in desktop
Expand Up @@ -13,9 +13,10 @@

module org.eclipse.jetty.http2.server
{
exports org.eclipse.jetty.http2.server;
requires org.slf4j;

requires transitive org.eclipse.jetty.http2.common;
requires transitive org.eclipse.jetty.server;
requires org.slf4j;

exports org.eclipse.jetty.http2.server;
}