Issue #9293 - Jetty 12 - Relax JPMS dependencies (quic) (#9307)

Relaxed jetty-quic JPMS dependencies. Signed-off-by: Simone Bordet <[email protected]>
jetty · Feb 4, 2023 · 9916706 · 9916706
1 parent c18194b
commit 9916706
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 9 deletions.
diff --git a/.../jetty-quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientProtocolSession.java b/.../jetty-quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientProtocolSession.java
@@ -14,9 +14,9 @@
 package org.eclipse.jetty.quic.client;
 
 import org.eclipse.jetty.quic.common.ProtocolSession;
+import org.eclipse.jetty.quic.common.QuicErrorCode;
 import org.eclipse.jetty.quic.common.QuicStreamEndPoint;
 import org.eclipse.jetty.quic.common.StreamType;
-import org.eclipse.jetty.quic.common.internal.QuicErrorCode;
 import org.eclipse.jetty.util.thread.Invocable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/jetty-core/jetty-quic/jetty-quic-common/src/main/java/module-info.java b/jetty-core/jetty-quic/jetty-quic-common/src/main/java/module-info.java
@@ -19,8 +19,4 @@
     requires transitive org.eclipse.jetty.quic.quiche;
 
     exports org.eclipse.jetty.quic.common;
-
-    exports org.eclipse.jetty.quic.common.internal to
-        org.eclipse.jetty.quic.client,
-        org.eclipse.jetty.quic.server;
 }
diff --git a/...y-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/ProtocolSession.java b/...y-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/ProtocolSession.java
@@ -21,7 +21,6 @@
 import java.util.function.Consumer;
 
 import org.eclipse.jetty.io.Connection;
-import org.eclipse.jetty.quic.common.internal.QuicErrorCode;
 import org.eclipse.jetty.util.component.ContainerLifeCycle;
 import org.eclipse.jetty.util.thread.AutoLock;
 import org.eclipse.jetty.util.thread.ExecutionStrategy;

diff --git a/...ty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicConnection.java b/...ty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicConnection.java
@@ -32,7 +32,6 @@
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.io.RetainableByteBuffer;
 import org.eclipse.jetty.io.RetainableByteBufferPool;
-import org.eclipse.jetty.quic.common.internal.QuicErrorCode;
 import org.eclipse.jetty.quic.quiche.QuicheConnectionId;
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.Callback;

diff --git a/...y/quic/common/internal/QuicErrorCode.java → ...ipse/jetty/quic/common/QuicErrorCode.java b/...y/quic/common/internal/QuicErrorCode.java → ...ipse/jetty/quic/common/QuicErrorCode.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.quic.common.internal;
+package org.eclipse.jetty.quic.common;
 
 public enum QuicErrorCode
 {

diff --git a/...jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicSession.java b/...jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicSession.java
@@ -35,7 +35,6 @@
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.io.RetainableByteBuffer;
 import org.eclipse.jetty.io.RetainableByteBufferPool;
-import org.eclipse.jetty.quic.common.internal.QuicErrorCode;
 import org.eclipse.jetty.quic.quiche.QuicheConnection;
 import org.eclipse.jetty.quic.quiche.QuicheConnectionId;
 import org.eclipse.jetty.util.BufferUtil;