Skip to content

Commit 0269117

Browse files
kabutzsbordet
kabutz
authored and
sbordet
committed
Changed order of entries in module-info.java to be canonical
1 parent 8c283a7 commit 0269117

File tree

55 files changed

+301
-290
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+301
-290
lines changed

‎apache-jsp/src/main/java/module-info.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,20 @@
1111
// ========================================================================
1212
//
1313

14-
import jakarta.servlet.ServletContainerInitializer;
15-
import org.apache.juli.logging.Log;
16-
import org.eclipse.jetty.apache.jsp.JettyJasperInitializer;
17-
import org.eclipse.jetty.apache.jsp.JuliLog;
18-
1914
module org.eclipse.jetty.apache.jsp
2015
{
21-
exports org.eclipse.jetty.apache.jsp;
22-
exports org.eclipse.jetty.jsp;
23-
2416
requires java.xml;
2517
requires jetty.servlet.api;
2618
requires org.eclipse.jetty.util;
2719
requires org.mortbay.apache.jasper;
2820
requires org.slf4j;
2921

30-
provides Log with JuliLog;
31-
provides ServletContainerInitializer with JettyJasperInitializer;
22+
exports org.eclipse.jetty.apache.jsp;
23+
exports org.eclipse.jetty.jsp;
24+
25+
provides org.apache.juli.logging.Log with
26+
org.eclipse.jetty.apache.jsp.JuliLog;
27+
28+
provides jakarta.servlet.ServletContainerInitializer with
29+
org.eclipse.jetty.apache.jsp.JettyJasperInitializer;
3230
}

‎jetty-alpn/jetty-alpn-client/src/main/java/module-info.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@
1111
// ========================================================================
1212
//
1313

14-
import org.eclipse.jetty.io.ssl.ALPNProcessor;
15-
1614
module org.eclipse.jetty.alpn.client
1715
{
18-
exports org.eclipse.jetty.alpn.client;
16+
requires org.slf4j;
1917

2018
requires transitive org.eclipse.jetty.io;
21-
requires org.slf4j;
2219

23-
uses ALPNProcessor.Client;
20+
exports org.eclipse.jetty.alpn.client;
21+
22+
uses org.eclipse.jetty.io.ssl.ALPNProcessor.Client;
2423
}

‎jetty-alpn/jetty-alpn-conscrypt-client/src/main/java/module-info.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@
1111
// ========================================================================
1212
//
1313

14-
import org.eclipse.jetty.alpn.conscrypt.client.ConscryptClientALPNProcessor;
15-
import org.eclipse.jetty.io.ssl.ALPNProcessor;
16-
1714
module org.eclipse.jetty.alpn.conscrypt.client
1815
{
1916
requires org.conscrypt;
20-
requires transitive org.eclipse.jetty.alpn.client;
2117
requires org.slf4j;
2218

23-
provides ALPNProcessor.Client with ConscryptClientALPNProcessor;
19+
requires transitive org.eclipse.jetty.alpn.client;
20+
21+
provides org.eclipse.jetty.io.ssl.ALPNProcessor.Client with
22+
org.eclipse.jetty.alpn.conscrypt.client.ConscryptClientALPNProcessor;
2423
}

‎jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/module-info.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@
1111
// ========================================================================
1212
//
1313

14-
import org.eclipse.jetty.alpn.conscrypt.server.ConscryptServerALPNProcessor;
15-
import org.eclipse.jetty.io.ssl.ALPNProcessor;
16-
1714
module org.eclipse.jetty.alpn.conscrypt.server
1815
{
1916
requires org.conscrypt;
2017
requires org.slf4j;
18+
2119
requires transitive org.eclipse.jetty.alpn.server;
2220

23-
provides ALPNProcessor.Server with ConscryptServerALPNProcessor;
21+
provides org.eclipse.jetty.io.ssl.ALPNProcessor.Server with
22+
org.eclipse.jetty.alpn.conscrypt.server.ConscryptServerALPNProcessor;
2423
}

‎jetty-alpn/jetty-alpn-java-client/src/main/java/module-info.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@
1111
// ========================================================================
1212
//
1313

14-
import org.eclipse.jetty.alpn.java.client.JDK9ClientALPNProcessor;
15-
import org.eclipse.jetty.io.ssl.ALPNProcessor;
16-
1714
module org.eclipse.jetty.alpn.java.client
1815
{
19-
requires transitive org.eclipse.jetty.alpn.client;
2016
requires org.slf4j;
2117

22-
provides ALPNProcessor.Client with JDK9ClientALPNProcessor;
18+
requires transitive org.eclipse.jetty.alpn.client;
19+
20+
provides org.eclipse.jetty.io.ssl.ALPNProcessor.Client with
21+
org.eclipse.jetty.alpn.java.client.JDK9ClientALPNProcessor;
2322
}

‎jetty-alpn/jetty-alpn-java-server/src/main/java/module-info.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@
1111
// ========================================================================
1212
//
1313

14-
import org.eclipse.jetty.alpn.java.server.JDK9ServerALPNProcessor;
15-
import org.eclipse.jetty.io.ssl.ALPNProcessor;
16-
1714
module org.eclipse.jetty.alpn.java.server
1815
{
1916
requires org.slf4j;
17+
2018
requires transitive org.eclipse.jetty.alpn.server;
2119

22-
provides ALPNProcessor.Server with JDK9ServerALPNProcessor;
20+
provides org.eclipse.jetty.io.ssl.ALPNProcessor.Server with
21+
org.eclipse.jetty.alpn.java.server.JDK9ServerALPNProcessor;
2322
}

‎jetty-alpn/jetty-alpn-server/src/main/java/module-info.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@
1111
// ========================================================================
1212
//
1313

14-
import org.eclipse.jetty.io.ssl.ALPNProcessor;
15-
1614
module org.eclipse.jetty.alpn.server
1715
{
18-
exports org.eclipse.jetty.alpn.server;
16+
requires org.slf4j;
1917

2018
requires transitive org.eclipse.jetty.server;
21-
requires org.slf4j;
2219

23-
uses ALPNProcessor.Server;
20+
exports org.eclipse.jetty.alpn.server;
21+
22+
uses org.eclipse.jetty.io.ssl.ALPNProcessor.Server;
2423
}

‎jetty-annotations/src/main/java/module-info.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,19 @@
1111
// ========================================================================
1212
//
1313

14-
import jakarta.servlet.ServletContainerInitializer;
15-
import org.eclipse.jetty.annotations.AnnotationConfiguration;
16-
import org.eclipse.jetty.webapp.Configuration;
17-
1814
module org.eclipse.jetty.annotations
1915
{
20-
exports org.eclipse.jetty.annotations;
21-
2216
requires jakarta.annotation;
2317
requires java.naming;
18+
requires org.slf4j;
19+
2420
requires transitive org.eclipse.jetty.plus;
2521
requires transitive org.objectweb.asm;
26-
requires org.slf4j;
2722

28-
uses ServletContainerInitializer;
23+
exports org.eclipse.jetty.annotations;
24+
25+
uses jakarta.servlet.ServletContainerInitializer;
2926

30-
provides Configuration with AnnotationConfiguration;
27+
provides org.eclipse.jetty.webapp.Configuration with
28+
org.eclipse.jetty.annotations.AnnotationConfiguration;
3129
}

‎jetty-cdi/src/main/java/module-info.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
module org.eclipse.jetty.cdi
1515
{
1616
requires org.eclipse.jetty.annotations;
17+
1718
requires transitive org.eclipse.jetty.webapp;
1819

1920
exports org.eclipse.jetty.cdi;
20-
}
21+
}

‎jetty-client/src/main/java/module-info.java

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,23 @@
1313

1414
module org.eclipse.jetty.client
1515
{
16-
exports org.eclipse.jetty.client;
17-
exports org.eclipse.jetty.client.api;
18-
exports org.eclipse.jetty.client.dynamic;
19-
exports org.eclipse.jetty.client.http;
20-
exports org.eclipse.jetty.client.jmx to org.eclipse.jetty.jmx;
21-
exports org.eclipse.jetty.client.util;
22-
2316
requires org.eclipse.jetty.alpn.client;
24-
requires transitive org.eclipse.jetty.http;
2517
requires org.slf4j;
2618

27-
// Only required if using SPNEGO.
28-
requires static java.security.jgss;
19+
requires transitive org.eclipse.jetty.http;
20+
2921
// Only required if using JMX.
3022
requires static java.management;
23+
// Only required if using SPNEGO.
24+
requires static java.security.jgss;
3125
requires static org.eclipse.jetty.jmx;
26+
27+
exports org.eclipse.jetty.client;
28+
exports org.eclipse.jetty.client.api;
29+
exports org.eclipse.jetty.client.dynamic;
30+
exports org.eclipse.jetty.client.http;
31+
exports org.eclipse.jetty.client.util;
32+
33+
exports org.eclipse.jetty.client.jmx to
34+
org.eclipse.jetty.jmx;
3235
}

‎jetty-deploy/src/main/java/module-info.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,20 @@
1313

1414
module org.eclipse.jetty.deploy
1515
{
16-
exports org.eclipse.jetty.deploy;
17-
exports org.eclipse.jetty.deploy.bindings;
18-
exports org.eclipse.jetty.deploy.graph;
19-
exports org.eclipse.jetty.deploy.jmx to org.eclipse.jetty.jmx;
20-
exports org.eclipse.jetty.deploy.providers;
21-
2216
requires java.xml;
23-
requires transitive org.eclipse.jetty.webapp;
2417
requires org.eclipse.jetty.xml;
2518
requires org.slf4j;
2619

20+
requires transitive org.eclipse.jetty.webapp;
21+
2722
// Only required if using JMX.
2823
requires static org.eclipse.jetty.jmx;
24+
25+
exports org.eclipse.jetty.deploy;
26+
exports org.eclipse.jetty.deploy.bindings;
27+
exports org.eclipse.jetty.deploy.graph;
28+
exports org.eclipse.jetty.deploy.providers;
29+
30+
exports org.eclipse.jetty.deploy.jmx to
31+
org.eclipse.jetty.jmx;
2932
}

‎jetty-fcgi/fcgi-client/src/main/java/module-info.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313

1414
module org.eclipse.jetty.fcgi.client
1515
{
16+
requires org.slf4j;
17+
18+
requires transitive org.eclipse.jetty.client;
19+
1620
exports org.eclipse.jetty.fcgi;
1721
exports org.eclipse.jetty.fcgi.client.http;
1822
exports org.eclipse.jetty.fcgi.generator;
1923
exports org.eclipse.jetty.fcgi.parser;
20-
21-
requires transitive org.eclipse.jetty.client;
22-
requires org.slf4j;
2324
}

‎jetty-fcgi/fcgi-server/src/main/java/module-info.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313

1414
module org.eclipse.jetty.fcgi.server
1515
{
16-
exports org.eclipse.jetty.fcgi.server;
17-
exports org.eclipse.jetty.fcgi.server.proxy;
16+
requires org.slf4j;
1817

1918
requires transitive org.eclipse.jetty.fcgi.client;
2019
requires transitive org.eclipse.jetty.proxy;
21-
requires org.slf4j;
2220

2321
// Only required if using the proxy features.
2422
requires static jetty.servlet.api;
23+
24+
exports org.eclipse.jetty.fcgi.server;
25+
exports org.eclipse.jetty.fcgi.server.proxy;
2526
}

‎jetty-http/src/main/java/module-info.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,17 @@
1111
// ========================================================================
1212
//
1313

14-
import org.eclipse.jetty.http.Http1FieldPreEncoder;
15-
import org.eclipse.jetty.http.HttpFieldPreEncoder;
16-
1714
module org.eclipse.jetty.http
1815
{
19-
exports org.eclipse.jetty.http;
20-
exports org.eclipse.jetty.http.pathmap;
16+
requires org.slf4j;
2117

2218
requires transitive org.eclipse.jetty.io;
23-
requires org.slf4j;
2419

25-
uses HttpFieldPreEncoder;
20+
exports org.eclipse.jetty.http;
21+
exports org.eclipse.jetty.http.pathmap;
22+
23+
uses org.eclipse.jetty.http.HttpFieldPreEncoder;
2624

27-
provides HttpFieldPreEncoder with Http1FieldPreEncoder;
25+
provides org.eclipse.jetty.http.HttpFieldPreEncoder with
26+
org.eclipse.jetty.http.Http1FieldPreEncoder;
2827
}

‎jetty-http2/http2-client/src/main/java/module-info.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313

1414
module org.eclipse.jetty.http2.client
1515
{
16-
exports org.eclipse.jetty.http2.client;
17-
1816
requires org.eclipse.jetty.alpn.client;
19-
requires transitive org.eclipse.jetty.http2.common;
2017
requires org.slf4j;
18+
19+
requires transitive org.eclipse.jetty.http2.common;
20+
21+
exports org.eclipse.jetty.http2.client;
2122
}

‎jetty-http2/http2-common/src/main/java/module-info.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313

1414
module org.eclipse.jetty.http2.common
1515
{
16+
requires org.slf4j;
17+
18+
requires transitive org.eclipse.jetty.http2.hpack;
19+
1620
exports org.eclipse.jetty.http2;
1721
exports org.eclipse.jetty.http2.api;
1822
exports org.eclipse.jetty.http2.api.server;
1923
exports org.eclipse.jetty.http2.frames;
2024
exports org.eclipse.jetty.http2.generator;
2125
exports org.eclipse.jetty.http2.parser;
22-
23-
requires transitive org.eclipse.jetty.http2.hpack;
24-
requires org.slf4j;
2526
}

‎jetty-http2/http2-hpack/src/main/java/module-info.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@
1111
// ========================================================================
1212
//
1313

14-
import org.eclipse.jetty.http.HttpFieldPreEncoder;
15-
import org.eclipse.jetty.http2.hpack.HpackFieldPreEncoder;
16-
1714
module org.eclipse.jetty.http2.hpack
1815
{
19-
exports org.eclipse.jetty.http2.hpack;
16+
requires org.slf4j;
2017

2118
requires transitive org.eclipse.jetty.http;
22-
requires org.slf4j;
2319

24-
provides HttpFieldPreEncoder with HpackFieldPreEncoder;
20+
exports org.eclipse.jetty.http2.hpack;
21+
22+
provides org.eclipse.jetty.http.HttpFieldPreEncoder with
23+
org.eclipse.jetty.http2.hpack.HpackFieldPreEncoder;
2524
}

‎jetty-http2/http2-http-client-transport/src/main/java/module-info.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313

1414
module org.eclipse.jetty.http2.http.client.transport
1515
{
16-
exports org.eclipse.jetty.http2.client.http;
17-
1816
requires org.eclipse.jetty.alpn.client;
17+
requires org.slf4j;
18+
1919
requires transitive org.eclipse.jetty.client;
2020
requires transitive org.eclipse.jetty.http2.client;
21-
requires org.slf4j;
21+
22+
exports org.eclipse.jetty.http2.client.http;
2223
}

‎jetty-http2/http2-server/src/main/java/module-info.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313

1414
module org.eclipse.jetty.http2.server
1515
{
16-
exports org.eclipse.jetty.http2.server;
16+
requires org.slf4j;
1717

1818
requires transitive org.eclipse.jetty.http2.common;
1919
requires transitive org.eclipse.jetty.server;
20-
requires org.slf4j;
20+
21+
exports org.eclipse.jetty.http2.server;
2122
}

0 commit comments

Comments
 (0)