From 36cdc12ab7216c7cb664a60c63462afb3463a02c Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Wed, 22 May 2024 12:18:12 +0200 Subject: [PATCH] Fixed JPMS declarations. Some require transitive was missing, and has been added. In other cases, making a field private (e.g. for log instances) made the warning go away. In another case, removed explicit dependency on websocket core exception, as it was not necessary. Clean up the POMs for jetty-eeN-annotations, that had unnecessary dependencies. Signed-off-by: Simone Bordet --- .../jetty-deploy/src/main/java/module-info.java | 2 +- .../java/org/eclipse/jetty/http/CookieCache.java | 7 ++----- .../java/org/eclipse/jetty/http/CookieCutter.java | 2 +- .../java/org/eclipse/jetty/http/HttpParser.java | 2 +- .../eclipse/jetty/http/RFC6265CookieParser.java | 4 ---- .../org/eclipse/jetty/io/SelectorManager.java | 2 +- .../jetty-plus/src/main/java/module-info.java | 4 ++-- .../jetty-security/src/main/java/module-info.java | 2 +- .../eclipse/jetty/server/HttpConnectionTest.java | 6 +++--- .../jetty-session/src/main/java/module-info.java | 2 +- .../jetty-util/src/main/java/module-info.java | 2 +- .../org/eclipse/jetty/util/Utf8StringBuilder.java | 2 +- .../jetty/util/preventers/AWTLeakPreventer.java | 1 - .../util/preventers/AbstractLeakPreventer.java | 2 +- .../util/preventers/AppContextLeakPreventer.java | 1 - .../preventers/DriverManagerLeakPreventer.java | 1 - .../server/ServerWebSocketContainer.java | 4 ++-- jetty-ee10/jetty-ee10-annotations/pom.xml | 15 --------------- .../src/main/java/module-info.java | 4 ++-- .../src/main/java/module-info.java | 2 +- .../src/main/java/module-info.java | 4 ++-- .../eclipse/jetty/ee10/plus/jndi/Transaction.java | 4 ---- .../src/main/java/module-info.java | 2 +- .../src/main/java/module-info.java | 2 +- jetty-ee8/jetty-ee8-annotations/pom.xml | 5 ----- jetty-ee9/jetty-ee9-annotations/pom.xml | 5 ----- .../src/main/java/module-info.java | 4 ++-- .../jetty-ee9-jndi/src/main/java/module-info.java | 2 +- .../jetty-ee9-plus/src/main/java/module-info.java | 2 +- .../src/main/java/module-info.java | 2 +- 30 files changed, 30 insertions(+), 69 deletions(-) diff --git a/jetty-core/jetty-deploy/src/main/java/module-info.java b/jetty-core/jetty-deploy/src/main/java/module-info.java index 716c4213c236..73f5f3bb3e1b 100644 --- a/jetty-core/jetty-deploy/src/main/java/module-info.java +++ b/jetty-core/jetty-deploy/src/main/java/module-info.java @@ -15,7 +15,7 @@ { requires java.xml; requires org.eclipse.jetty.xml; - requires org.eclipse.jetty.server; + requires transitive org.eclipse.jetty.server; requires org.slf4j; // Only required if using JMX. diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/CookieCache.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/CookieCache.java index e7799d783dfb..4441d0830925 100644 --- a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/CookieCache.java +++ b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/CookieCache.java @@ -21,8 +21,6 @@ import java.util.Map; import org.eclipse.jetty.util.StringUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Cookie parser @@ -31,9 +29,8 @@ @Deprecated (forRemoval = true) public class CookieCache implements CookieParser.Handler, ComplianceViolation.Listener { - protected static final Logger LOG = LoggerFactory.getLogger(CookieCache.class); - protected final List _rawFields = new ArrayList<>(); - protected List _cookieList; + private final List _rawFields = new ArrayList<>(); + private List _cookieList; private final CookieParser _parser; private List _violations; diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/CookieCutter.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/CookieCutter.java index b81ceef8258b..38bb55e87855 100644 --- a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/CookieCutter.java +++ b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/CookieCutter.java @@ -33,7 +33,7 @@ @Deprecated public class CookieCutter implements CookieParser { - protected static final Logger LOG = LoggerFactory.getLogger(CookieCutter.class); + private static final Logger LOG = LoggerFactory.getLogger(CookieCutter.class); private final CookieParser.Handler _handler; private final CookieCompliance _complianceMode; diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java index ef1ba9f61da5..93be3478cb01 100644 --- a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java +++ b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java @@ -92,7 +92,7 @@ */ public class HttpParser { - public static final Logger LOG = LoggerFactory.getLogger(HttpParser.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpParser.class); public static final int INITIAL_URI_LENGTH = 256; private static final int MAX_CHUNK_LENGTH = Integer.MAX_VALUE / 16 - 16; private static final String UNMATCHED_VALUE = "\u0000"; diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/RFC6265CookieParser.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/RFC6265CookieParser.java index e64856a70233..8b54d16b0bc5 100644 --- a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/RFC6265CookieParser.java +++ b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/RFC6265CookieParser.java @@ -16,8 +16,6 @@ import java.util.Locale; import org.eclipse.jetty.util.StringUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import static org.eclipse.jetty.http.CookieCompliance.Violation.ATTRIBUTES; import static org.eclipse.jetty.http.CookieCompliance.Violation.ATTRIBUTE_VALUES; @@ -34,8 +32,6 @@ */ public class RFC6265CookieParser implements CookieParser { - protected static final Logger LOG = LoggerFactory.getLogger(RFC6265CookieParser.class); - private final CookieParser.Handler _handler; private final CookieCompliance _complianceMode; private final ComplianceViolation.Listener _complianceListener; diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java index fab730916228..157cd4a3eca5 100644 --- a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java +++ b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java @@ -53,7 +53,7 @@ public abstract class SelectorManager extends ContainerLifeCycle implements Dumpable { public static final int DEFAULT_CONNECT_TIMEOUT = 15000; - protected static final Logger LOG = LoggerFactory.getLogger(SelectorManager.class); + private static final Logger LOG = LoggerFactory.getLogger(SelectorManager.class); private final Executor executor; private final Scheduler scheduler; diff --git a/jetty-core/jetty-plus/src/main/java/module-info.java b/jetty-core/jetty-plus/src/main/java/module-info.java index 2d4517de1724..2f4980985c23 100644 --- a/jetty-core/jetty-plus/src/main/java/module-info.java +++ b/jetty-core/jetty-plus/src/main/java/module-info.java @@ -13,13 +13,13 @@ module org.eclipse.jetty.plus { - requires org.eclipse.jetty.security; + requires transitive org.eclipse.jetty.security; requires org.eclipse.jetty.util; requires org.slf4j; requires transitive java.naming; // Only required if using DataSourceLoginService. - requires static java.sql; + requires static transitive java.sql; exports org.eclipse.jetty.plus.annotation; exports org.eclipse.jetty.plus.jndi; diff --git a/jetty-core/jetty-security/src/main/java/module-info.java b/jetty-core/jetty-security/src/main/java/module-info.java index 196434d475ec..41c65cd694a4 100644 --- a/jetty-core/jetty-security/src/main/java/module-info.java +++ b/jetty-core/jetty-security/src/main/java/module-info.java @@ -17,7 +17,7 @@ requires transitive org.eclipse.jetty.util; requires transitive org.slf4j; requires static java.security.jgss; - requires static java.sql; + requires static transitive java.sql; exports org.eclipse.jetty.security; exports org.eclipse.jetty.security.authentication; diff --git a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java index 885bc213560c..cef0156fddca 100644 --- a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java +++ b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java @@ -251,7 +251,7 @@ public static Stream contentLengths() @MethodSource("contentLengths") public void testHttp11MultipleContentLength(int[] clen) throws Exception { - HttpParser.LOG.info("badMessage: 400 Bad messages EXPECTED..."); + LOG.info("badMessage: 400 Bad messages EXPECTED..."); StringBuilder request = new StringBuilder(); request.append("POST / HTTP/1.1\r\n"); request.append("Host: local\r\n"); @@ -298,7 +298,7 @@ public static Stream http11ContentLengthAndChunkedData() @MethodSource("http11ContentLengthAndChunkedData") public void testHttp11ContentLengthAndChunk(int[] contentLengths) throws Exception { - HttpParser.LOG.info("badMessage: 400 Bad messages EXPECTED..."); + LOG.info("badMessage: 400 Bad messages EXPECTED..."); StringBuilder request = new StringBuilder(); request.append("POST / HTTP/1.1\r\n"); @@ -405,7 +405,7 @@ public static Stream http11TransferEncodingInvalidChunked() @MethodSource("http11TransferEncodingInvalidChunked") public void testHttp11TransferEncodingInvalidChunked(List tokens) throws Exception { - HttpParser.LOG.info("badMessage: 400 Bad messages EXPECTED..."); + LOG.info("badMessage: 400 Bad messages EXPECTED..."); StringBuilder request = new StringBuilder(); request.append("POST / HTTP/1.1\r\n"); request.append("Host: local\r\n"); diff --git a/jetty-core/jetty-session/src/main/java/module-info.java b/jetty-core/jetty-session/src/main/java/module-info.java index 4aa53da31bbe..6fe9df07406c 100644 --- a/jetty-core/jetty-session/src/main/java/module-info.java +++ b/jetty-core/jetty-session/src/main/java/module-info.java @@ -18,7 +18,7 @@ requires transitive org.slf4j; // Only required if using DatabaseAdaptor/JDBCSessionDataStore. - requires static java.sql; + requires static transitive java.sql; requires static java.naming; exports org.eclipse.jetty.session; diff --git a/jetty-core/jetty-util/src/main/java/module-info.java b/jetty-core/jetty-util/src/main/java/module-info.java index 470d3f8394c6..f84729d200f3 100644 --- a/jetty-core/jetty-util/src/main/java/module-info.java +++ b/jetty-core/jetty-util/src/main/java/module-info.java @@ -14,7 +14,7 @@ module org.eclipse.jetty.util { // Standard Jetty Logging now. - requires org.slf4j; + requires transitive org.slf4j; // Required by SSL code (for X509). requires transitive java.naming; diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java index 77c17b673ffe..90a0dbe17c60 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java @@ -41,7 +41,7 @@ */ public class Utf8StringBuilder implements CharsetStringBuilder { - protected static final Logger LOG = LoggerFactory.getLogger(Utf8StringBuilder.class); + private static final Logger LOG = LoggerFactory.getLogger(Utf8StringBuilder.class); public static final char REPLACEMENT = '�'; private static final int UTF8_ACCEPT = 0; private static final int UTF8_REJECT = 12; diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AWTLeakPreventer.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AWTLeakPreventer.java index 2647f30e1a2b..b35f71f8067e 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AWTLeakPreventer.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AWTLeakPreventer.java @@ -26,7 +26,6 @@ */ public class AWTLeakPreventer extends AbstractLeakPreventer { - @Override public void prevent(ClassLoader loader) { diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AbstractLeakPreventer.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AbstractLeakPreventer.java index d57f175ce2b2..38b366cc8406 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AbstractLeakPreventer.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AbstractLeakPreventer.java @@ -30,7 +30,7 @@ */ public abstract class AbstractLeakPreventer extends AbstractLifeCycle { - protected static final Logger LOG = LoggerFactory.getLogger(AbstractLeakPreventer.class); + static final Logger LOG = LoggerFactory.getLogger(AbstractLeakPreventer.class); public abstract void prevent(ClassLoader loader); diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AppContextLeakPreventer.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AppContextLeakPreventer.java index 4453c77a55da..edee3211d20a 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AppContextLeakPreventer.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AppContextLeakPreventer.java @@ -25,7 +25,6 @@ */ public class AppContextLeakPreventer extends AbstractLeakPreventer { - @Override public void prevent(ClassLoader loader) { diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DriverManagerLeakPreventer.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DriverManagerLeakPreventer.java index c6d9a71ff413..6682f5748053 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DriverManagerLeakPreventer.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DriverManagerLeakPreventer.java @@ -24,7 +24,6 @@ */ public class DriverManagerLeakPreventer extends AbstractLeakPreventer { - @Override public void prevent(ClassLoader loader) { diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/ServerWebSocketContainer.java b/jetty-core/jetty-websocket/jetty-websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/ServerWebSocketContainer.java index 12b23489b02f..cf8a1755fad3 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/ServerWebSocketContainer.java +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/ServerWebSocketContainer.java @@ -322,7 +322,7 @@ public void addMapping(PathSpec pathSpec, WebSocketCreator creator) * @see #upgrade(WebSocketCreator, Request, Response, Callback) */ @Override - public boolean handle(Request request, Response response, Callback callback) throws WebSocketException + public boolean handle(Request request, Response response, Callback callback) { return mappings.upgrade(request, response, callback, configuration); } @@ -346,7 +346,7 @@ public boolean handle(Request request, Response response, Callback callback) thr * @throws WebSocketException there is an error during the upgrade * @see #handle(Request, Response, Callback) */ - public boolean upgrade(WebSocketCreator creator, Request request, Response response, Callback callback) throws WebSocketException + public boolean upgrade(WebSocketCreator creator, Request request, Response response, Callback callback) { var coreCreator = newWebSocketCreator(creator); WebSocketNegotiator negotiator = WebSocketNegotiator.from(coreCreator, factory); diff --git a/jetty-ee10/jetty-ee10-annotations/pom.xml b/jetty-ee10/jetty-ee10-annotations/pom.xml index 34d5b1e214fc..1ba90c083ce0 100644 --- a/jetty-ee10/jetty-ee10-annotations/pom.xml +++ b/jetty-ee10/jetty-ee10-annotations/pom.xml @@ -44,21 +44,6 @@ org.slf4j slf4j-api - - jakarta.enterprise - jakarta.enterprise.cdi-api - test - - - jakarta.interceptor - jakarta.interceptor-api - test - - - jakarta.transaction - jakarta.transaction-api - test - org.eclipse.jetty jetty-slf4j-impl diff --git a/jetty-ee10/jetty-ee10-apache-jsp/src/main/java/module-info.java b/jetty-ee10/jetty-ee10-apache-jsp/src/main/java/module-info.java index 0ebafec01bde..374b985e9cbd 100644 --- a/jetty-ee10/jetty-ee10-apache-jsp/src/main/java/module-info.java +++ b/jetty-ee10/jetty-ee10-apache-jsp/src/main/java/module-info.java @@ -14,9 +14,9 @@ module org.eclipse.jetty.ee10.apache.jsp { requires java.xml; - requires jakarta.servlet; + requires transitive jakarta.servlet; requires org.eclipse.jetty.util; - requires org.mortbay.apache.jasper; + requires transitive org.mortbay.apache.jasper; requires org.slf4j; exports org.eclipse.jetty.ee10.apache.jsp; diff --git a/jetty-ee10/jetty-ee10-jndi/src/main/java/module-info.java b/jetty-ee10/jetty-ee10-jndi/src/main/java/module-info.java index bfeae887a918..e16b10ff709e 100644 --- a/jetty-ee10/jetty-ee10-jndi/src/main/java/module-info.java +++ b/jetty-ee10/jetty-ee10-jndi/src/main/java/module-info.java @@ -19,7 +19,7 @@ requires transitive java.naming; // Only required if using MailSessionReference. - requires static jakarta.mail; + requires static transitive jakarta.mail; exports org.eclipse.jetty.ee10.jndi.factories; } diff --git a/jetty-ee10/jetty-ee10-plus/src/main/java/module-info.java b/jetty-ee10/jetty-ee10-plus/src/main/java/module-info.java index 06e2c7ddf6bf..d4fc7b583129 100644 --- a/jetty-ee10/jetty-ee10-plus/src/main/java/module-info.java +++ b/jetty-ee10/jetty-ee10-plus/src/main/java/module-info.java @@ -16,13 +16,13 @@ module org.eclipse.jetty.ee10.plus { - requires org.eclipse.jetty.plus; + requires transitive org.eclipse.jetty.plus; requires org.slf4j; requires transitive org.eclipse.jetty.ee10.webapp; // Only required if using Transaction. - requires static jakarta.transaction; + requires static transitive jakarta.transaction; exports org.eclipse.jetty.ee10.plus.jndi; exports org.eclipse.jetty.ee10.plus.webapp; diff --git a/jetty-ee10/jetty-ee10-plus/src/main/java/org/eclipse/jetty/ee10/plus/jndi/Transaction.java b/jetty-ee10/jetty-ee10-plus/src/main/java/org/eclipse/jetty/ee10/plus/jndi/Transaction.java index 5b1fa5a9b265..81955962de3b 100644 --- a/jetty-ee10/jetty-ee10-plus/src/main/java/org/eclipse/jetty/ee10/plus/jndi/Transaction.java +++ b/jetty-ee10/jetty-ee10-plus/src/main/java/org/eclipse/jetty/ee10/plus/jndi/Transaction.java @@ -16,8 +16,6 @@ import javax.naming.NamingException; import jakarta.transaction.UserTransaction; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Transaction @@ -26,8 +24,6 @@ */ public class Transaction extends org.eclipse.jetty.plus.jndi.Transaction { - private static final Logger LOG = LoggerFactory.getLogger(Transaction.class); - /** * @param scope the scope, usually an environment like ee9, ee10 * @param userTransaction the UserTransaction diff --git a/jetty-ee10/jetty-ee10-proxy/src/main/java/module-info.java b/jetty-ee10/jetty-ee10-proxy/src/main/java/module-info.java index c21390fcd8cb..2daec578a0c0 100644 --- a/jetty-ee10/jetty-ee10-proxy/src/main/java/module-info.java +++ b/jetty-ee10/jetty-ee10-proxy/src/main/java/module-info.java @@ -13,7 +13,7 @@ module org.eclipse.jetty.ee10.proxy { - requires jakarta.servlet; + requires transitive jakarta.servlet; requires transitive org.eclipse.jetty.client; requires transitive org.eclipse.jetty.server; requires transitive org.slf4j; diff --git a/jetty-ee10/jetty-ee10-servlets/src/main/java/module-info.java b/jetty-ee10/jetty-ee10-servlets/src/main/java/module-info.java index 2a13da07a538..4f8695470bea 100644 --- a/jetty-ee10/jetty-ee10-servlets/src/main/java/module-info.java +++ b/jetty-ee10/jetty-ee10-servlets/src/main/java/module-info.java @@ -26,7 +26,7 @@ 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; + requires static transitive org.eclipse.jetty.util; exports org.eclipse.jetty.ee10.servlets; } diff --git a/jetty-ee8/jetty-ee8-annotations/pom.xml b/jetty-ee8/jetty-ee8-annotations/pom.xml index 76ac2d4b8403..31538429ed1f 100644 --- a/jetty-ee8/jetty-ee8-annotations/pom.xml +++ b/jetty-ee8/jetty-ee8-annotations/pom.xml @@ -49,11 +49,6 @@ org.slf4j slf4j-api - - jakarta.transaction - jakarta.transaction-api - test - org.eclipse.jetty jetty-slf4j-impl diff --git a/jetty-ee9/jetty-ee9-annotations/pom.xml b/jetty-ee9/jetty-ee9-annotations/pom.xml index c5fb5e7d1467..ca153fab5c1c 100644 --- a/jetty-ee9/jetty-ee9-annotations/pom.xml +++ b/jetty-ee9/jetty-ee9-annotations/pom.xml @@ -48,11 +48,6 @@ org.slf4j slf4j-api - - jakarta.transaction - jakarta.transaction-api - test - org.eclipse.jetty jetty-slf4j-impl diff --git a/jetty-ee9/jetty-ee9-apache-jsp/src/main/java/module-info.java b/jetty-ee9/jetty-ee9-apache-jsp/src/main/java/module-info.java index 30b202638e3f..12488a568d05 100644 --- a/jetty-ee9/jetty-ee9-apache-jsp/src/main/java/module-info.java +++ b/jetty-ee9/jetty-ee9-apache-jsp/src/main/java/module-info.java @@ -14,9 +14,9 @@ module org.eclipse.jetty.ee9.apache.jsp { requires java.xml; - requires jetty.servlet.api; + requires transitive jetty.servlet.api; requires org.eclipse.jetty.util; - requires org.mortbay.apache.jasper; + requires transitive org.mortbay.apache.jasper; requires org.slf4j; exports org.eclipse.jetty.ee9.apache.jsp; diff --git a/jetty-ee9/jetty-ee9-jndi/src/main/java/module-info.java b/jetty-ee9/jetty-ee9-jndi/src/main/java/module-info.java index 390544350cff..994e28ce0f9b 100644 --- a/jetty-ee9/jetty-ee9-jndi/src/main/java/module-info.java +++ b/jetty-ee9/jetty-ee9-jndi/src/main/java/module-info.java @@ -19,7 +19,7 @@ requires transitive java.naming; // Only required if using MailSessionReference. - requires static jakarta.mail; + requires static transitive jakarta.mail; exports org.eclipse.jetty.ee9.jndi.factories; } diff --git a/jetty-ee9/jetty-ee9-plus/src/main/java/module-info.java b/jetty-ee9/jetty-ee9-plus/src/main/java/module-info.java index 779305bf2cdb..98ddffbfac05 100644 --- a/jetty-ee9/jetty-ee9-plus/src/main/java/module-info.java +++ b/jetty-ee9/jetty-ee9-plus/src/main/java/module-info.java @@ -23,7 +23,7 @@ requires transitive org.eclipse.jetty.plus; // Only required if using Transaction. - requires static jakarta.transaction; + requires static transitive jakarta.transaction; exports org.eclipse.jetty.ee9.plus.jndi; exports org.eclipse.jetty.ee9.plus.webapp; diff --git a/jetty-ee9/jetty-ee9-servlets/src/main/java/module-info.java b/jetty-ee9/jetty-ee9-servlets/src/main/java/module-info.java index 8284e687c415..c52b27b022de 100644 --- a/jetty-ee9/jetty-ee9-servlets/src/main/java/module-info.java +++ b/jetty-ee9/jetty-ee9-servlets/src/main/java/module-info.java @@ -26,7 +26,7 @@ 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; + requires static transitive org.eclipse.jetty.util; // Only required if using DataRateLimitedServlet requires static org.eclipse.jetty.ee9.nested;