From 8331809c4020d7762b4d0507d64b21851f3dc0c3 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Tue, 3 Oct 2023 03:45:40 +0200 Subject: [PATCH 01/31] Fix getCharacterEncoding issue with #10563 (#10650) Do not persist a defaulted charset used in the request. Throw `UnsupportedEncodingException` from `getReader` --- .../org/eclipse/jetty/http/MimeTypes.java | 8 ++- .../org/eclipse/jetty/server/Request.java | 11 +++- .../jetty/ee10/servlet/ServletApiRequest.java | 51 +++++++++++++---- .../jetty/ee10/servlet/RequestTest.java | 57 +++++++++++++++++++ .../eclipse/jetty/ee9/nested/RequestTest.java | 49 ++++++++++++++++ 5 files changed, 163 insertions(+), 13 deletions(-) diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java index c663130beb10..12eecc601452 100644 --- a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java +++ b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java @@ -18,6 +18,7 @@ import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; +import java.nio.charset.IllegalCharsetNameException; import java.nio.charset.StandardCharsets; import java.nio.charset.UnsupportedCharsetException; import java.util.Arrays; @@ -329,8 +330,13 @@ public MimeTypes(MimeTypes defaults) * Get the explicit, assumed, or inferred Charset for a mime type * @param mimeType String form or a mimeType * @return A {@link Charset} or null; + * @throws IllegalCharsetNameException + * If the given charset name is illegal + * @throws UnsupportedCharsetException + * If no support for the named charset is available + * in this instance of the Java virtual machine */ - public Charset getCharset(String mimeType) + public Charset getCharset(String mimeType) throws IllegalCharsetNameException, UnsupportedCharsetException { if (mimeType == null) return null; diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java index c8fa53efedd0..93c8112c4091 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java @@ -19,6 +19,8 @@ import java.net.SocketAddress; import java.nio.ByteBuffer; import java.nio.charset.Charset; +import java.nio.charset.IllegalCharsetNameException; +import java.nio.charset.UnsupportedCharsetException; import java.security.Principal; import java.util.ArrayList; import java.util.List; @@ -501,7 +503,14 @@ static InputStream asInputStream(Request request) return Content.Source.asInputStream(request); } - static Charset getCharset(Request request) + /** + * Get a {@link Charset} from the request {@link HttpHeader#CONTENT_TYPE}, if any. + * @param request The request. + * @return A {@link Charset} or null + * @throws IllegalCharsetNameException If the charset name is illegal + * @throws UnsupportedCharsetException If no support for the charset is available + */ + static Charset getCharset(Request request) throws IllegalCharsetNameException, UnsupportedCharsetException { String contentType = request.getHeaders().get(HttpHeader.CONTENT_TYPE); return Objects.requireNonNullElse(request.getContext().getMimeTypes(), MimeTypes.DEFAULTS).getCharset(contentType); diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java index b051b89cc34c..986bcb6a663d 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java +++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java @@ -19,7 +19,9 @@ import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; +import java.nio.charset.IllegalCharsetNameException; import java.nio.charset.StandardCharsets; +import java.nio.charset.UnsupportedCharsetException; import java.security.Principal; import java.util.AbstractList; import java.util.Collection; @@ -717,8 +719,15 @@ public Enumeration getAttributeNames() @Override public String getCharacterEncoding() { - if (_charset == null) - _charset = Request.getCharset(getRequest()); + try + { + if (_charset == null) + _charset = Request.getCharset(getRequest()); + } + catch (IllegalCharsetNameException | UnsupportedCharsetException e) + { + return MimeTypes.getCharsetFromContentType(getRequest().getHeaders().get(HttpHeader.CONTENT_TYPE)); + } if (_charset == null) return getServletRequestInfo().getServletContext().getServletContext().getRequestCharacterEncoding(); @@ -1027,18 +1036,38 @@ public BufferedReader getReader() throws IOException if (_inputState == ServletContextRequest.INPUT_READER) return _reader; - if (_charset == null) - _charset = Request.getCharset(getRequest()); - if (_charset == null) - _charset = getRequest().getContext().getMimeTypes().getCharset(getServletRequestInfo().getServletContext().getServletContextHandler().getDefaultRequestCharacterEncoding()); - if (_charset == null) - _charset = StandardCharsets.ISO_8859_1; + Charset charset = _charset; + try + { + if (charset == null) + { + charset = _charset = Request.getCharset(getRequest()); + if (charset == null) + charset = StandardCharsets.ISO_8859_1; + } + + } + catch (IllegalCharsetNameException | UnsupportedCharsetException e) + { + throw new UnsupportedEncodingException(e.getMessage()) + { + { + initCause(e); + } + + @Override + public String toString() + { + return "%s@%x:%s".formatted(UnsupportedEncodingException.class.getName(), hashCode(), getMessage()); + } + }; + } - if (_reader == null || !_charset.equals(_readerCharset)) + if (_reader == null || !charset.equals(_readerCharset)) { ServletInputStream in = getInputStream(); - _readerCharset = _charset; - _reader = new BufferedReader(new InputStreamReader(in, _charset)) + _readerCharset = charset; + _reader = new BufferedReader(new InputStreamReader(in, charset)) { @Override public void close() throws IOException diff --git a/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/RequestTest.java b/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/RequestTest.java index 0f7bc853d9ef..af7d74676e32 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/RequestTest.java +++ b/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/RequestTest.java @@ -14,6 +14,7 @@ package org.eclipse.jetty.ee10.servlet; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -33,6 +34,7 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.component.LifeCycle; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -41,6 +43,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.sameInstance; public class RequestTest @@ -282,4 +285,58 @@ protected void service(HttpServletRequest request, HttpServletResponse resp) assertThat(cookieHistory.get(0), sameInstance(cookieHistory.get(2))); assertThat(cookieHistory.get(2), not(sameInstance(cookieHistory.get(4)))); } + + @Test + public void testGetCharacterEncoding() throws Exception + { + startServer(new HttpServlet() + { + @Override + protected void service(HttpServletRequest request, HttpServletResponse resp) throws IOException + { + // No character encoding specified + request.getReader(); + // Try setting after read has been obtained + request.setCharacterEncoding("ISO-8859-2"); + assertThat(request.getCharacterEncoding(), nullValue()); + } + }); + + String rawResponse = _connector.getResponse( + """ + GET /test HTTP/1.1\r + Host: host\r + Connection: close\r + \r + """); + HttpTester.Response response = HttpTester.parseResponse(rawResponse); + assertThat(response.getStatus(), is(HttpStatus.OK_200)); + } + + @Test + public void testUnknownCharacterEncoding() throws Exception + { + startServer(new HttpServlet() + { + @Override + protected void service(HttpServletRequest request, HttpServletResponse resp) throws IOException + { + assertThat(request.getCharacterEncoding(), is("Unknown")); + Assertions.assertThrows(UnsupportedEncodingException.class, request::getReader); + } + }); + + String rawResponse = _connector.getResponse( + """ + POST /test HTTP/1.1\r + Host: host\r + Content-Type:text/plain; charset=Unknown\r + Content-Length: 10\r + Connection: close\r + \r + 1234567890\r + """); + HttpTester.Response response = HttpTester.parseResponse(rawResponse); + assertThat(response.getStatus(), is(HttpStatus.OK_200)); + } } diff --git a/jetty-ee9/jetty-ee9-nested/src/test/java/org/eclipse/jetty/ee9/nested/RequestTest.java b/jetty-ee9/jetty-ee9-nested/src/test/java/org/eclipse/jetty/ee9/nested/RequestTest.java index 2380c258f1cb..64451816d1bd 100644 --- a/jetty-ee9/jetty-ee9-nested/src/test/java/org/eclipse/jetty/ee9/nested/RequestTest.java +++ b/jetty-ee9/jetty-ee9-nested/src/test/java/org/eclipse/jetty/ee9/nested/RequestTest.java @@ -88,6 +88,7 @@ import org.eclipse.jetty.util.NanoTime; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -2493,4 +2494,52 @@ private static void checkCookieResult(String containedCookie, String[] notContai } } } + + @Test + public void testGetCharacterEncoding() throws Exception + { + _handler._checker = (request, response) -> + { + // No character encoding specified + request.getReader(); + // Try setting after read has been obtained + request.setCharacterEncoding("ISO-8859-2"); + assertThat(request.getCharacterEncoding(), nullValue()); + return true; + }; + + String rawResponse = _connector.getResponse( + """ + GET /test HTTP/1.1\r + Host: host\r + Connection: close\r + \r + """); + HttpTester.Response response = HttpTester.parseResponse(rawResponse); + assertThat(response.getStatus(), is(HttpStatus.OK_200)); + } + + @Test + public void testUnknownCharacterEncoding() throws Exception + { + _handler._checker = (request, response) -> + { + assertThat(request.getCharacterEncoding(), is("Unknown")); + Assertions.assertThrows(UnsupportedEncodingException.class, request::getReader); + return true; + }; + + String rawResponse = _connector.getResponse( + """ + POST /test HTTP/1.1\r + Host: host\r + Content-Type:multipart/form-data; charset=Unknown\r + Content-Length: 10\r + Connection: close\r + \r + 1234567890\r + """); + HttpTester.Response response = HttpTester.parseResponse(rawResponse); + assertThat(response.getStatus(), is(HttpStatus.OK_200)); + } } From ff25dd8948179c7df2256cab4bcf5cfe564918eb Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 3 Oct 2023 17:20:12 +1000 Subject: [PATCH 02/31] fix failing fast profile (#10615) * fix failing fast profile --------- Signed-off-by: Olivier Lamy --- documentation/jetty-documentation/pom.xml | 3 +++ pom.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index 24ad0150f8d2..e0658bab62d3 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -251,6 +251,9 @@ org.apache.maven.plugins maven-assembly-plugin + + ${asciidoctor.skip} src/main/assembly/html.xml diff --git a/pom.xml b/pom.xml index 1a2eec7eecbe..95bdcec94847 100644 --- a/pom.xml +++ b/pom.xml @@ -206,7 +206,7 @@ you will get thanks from Eclipse IDE users --> 11.0.14.Final - + false 2023-06-05T23:12:49Z From 53de4c82984e143284405704110c2bbaa6aba715 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Wed, 4 Oct 2023 14:47:26 +0200 Subject: [PATCH 03/31] Fixes #10611 - Flaky StreamResetTest.testClientResetConsumesQueuedData() (#10655) Fixed test case that was racy. When the DATA frames arrived at the server before the call to consumeAvailable(), they were read and the client flow control window re-opened. If it happened that the DATA frames arrived at the server after the call to consumeAvailable(), the client flow control window was not re-opened, making the test flaky. Fixed by avoiding the race in the test. Added over-release buffer tracking, add leak tracking to H2 tests, fix client leaks in tests. Also reviewed the places that required re-opening of the flow control window in case the DATA frames are not read. Signed-off-by: Simone Bordet Signed-off-by: Ludovic Orban Co-authored-by: Ludovic Orban --- .../org/eclipse/jetty/http2/HTTP2Stream.java | 62 ++++++++-- .../jetty/http2/tests/AbstractTest.java | 26 ++++- .../jetty/http2/tests/PrefaceTest.java | 1 + .../jetty/http2/tests/RawHTTP2ProxyTest.java | 45 ++++++-- .../http2/tests/RequestTrailersTest.java | 16 +++ .../jetty/http2/tests/SettingsTest.java | 2 +- .../jetty/http2/tests/StreamCountTest.java | 2 +- .../jetty/http2/tests/StreamResetTest.java | 108 +++++++++++++++--- .../eclipse/jetty/io/ArrayByteBufferPool.java | 29 +++-- .../transport/HttpClientDemandTest.java | 5 - 10 files changed, 251 insertions(+), 45 deletions(-) diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java index e17b2cc305b9..feda6c9d9be8 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java @@ -162,6 +162,7 @@ public void data(DataFrame frame, Callback callback) @Override public void reset(ResetFrame frame, Callback callback) { + int flowControlLength; Throwable resetFailure = null; try (AutoLock ignored = lock.lock()) { @@ -174,7 +175,9 @@ public void reset(ResetFrame frame, Callback callback) localReset = true; failure = new EOFException("reset"); } + flowControlLength = drain(); } + session.dataConsumed(this, flowControlLength); if (resetFailure != null) callback.failed(resetFailure); else @@ -340,6 +343,8 @@ public Listener getListener() public void setListener(Listener listener) { this.listener = listener; + if (listener == null) + demand(); } public void process(Frame frame, Callback callback) @@ -418,11 +423,14 @@ private void onHeaders(HeadersFrame frame, Callback callback) private void onData(Data data) { + DataFrame frame = data.frame(); + // SPEC: remotely closed streams must be replied with a reset. if (isRemotelyClosed()) { if (LOG.isDebugEnabled()) LOG.debug("Data {} for already closed {}", data, this); + session.dataConsumed(this, data.frame().flowControlLength()); reset(new ResetFrame(streamId, ErrorCode.STREAM_CLOSED_ERROR.code), Callback.NOOP); return; } @@ -432,28 +440,25 @@ private void onData(Data data) // Just drop the frame. if (LOG.isDebugEnabled()) LOG.debug("Data {} for already reset {}", data, this); + session.dataConsumed(this, data.frame().flowControlLength()); return; } if (dataLength >= 0) { - DataFrame frame = data.frame(); dataLength -= frame.remaining(); if (dataLength < 0 || (frame.isEndStream() && dataLength != 0)) { if (LOG.isDebugEnabled()) LOG.debug("Invalid data length {} for {}", data, this); + session.dataConsumed(this, data.frame().flowControlLength()); reset(new ResetFrame(streamId, ErrorCode.PROTOCOL_ERROR.code), Callback.NOOP); return; } } - boolean listenerPresent = getListener() != null; - boolean endStream = data.frame().isEndStream(); - if ((listenerPresent || endStream) && offer(data)) + if (offer(data)) processData(); - if (!listenerPresent && updateClose(endStream, CloseState.Event.RECEIVED)) - session.removeStream(this); } private boolean offer(Data data) @@ -555,15 +560,29 @@ private int dataSize() } } + public long getDataLength() + { + try (AutoLock ignored = lock.lock()) + { + return dataQueue.stream() + .mapToLong(data -> data.frame().remaining()) + .sum(); + } + } + private void onReset(ResetFrame frame, Callback callback) { + int flowControlLength; try (AutoLock ignored = lock.lock()) { remoteReset = true; failure = new EofException("reset"); + flowControlLength = drain(); } close(); - if (session.removeStream(this)) + boolean removed = session.removeStream(this); + session.dataConsumed(this, flowControlLength); + if (removed) notifyReset(this, frame, callback); else callback.succeeded(); @@ -584,17 +603,44 @@ private void onWindowUpdate(WindowUpdateFrame frame, Callback callback) private void onFailure(FailureFrame frame, Callback callback) { + int flowControlLength; try (AutoLock ignored = lock.lock()) { failure = frame.getFailure(); + flowControlLength = drain(); } close(); - if (session.removeStream(this)) + boolean removed = session.removeStream(this); + session.dataConsumed(this, flowControlLength); + if (removed) notifyFailure(this, frame, callback); else callback.succeeded(); } + private int drain() + { + assert lock.isHeldByCurrentThread(); + int length = 0; + while (true) + { + Data data = dataQueue.poll(); + if (data == null) + break; + data.release(); + DataFrame frame = data.frame(); + length += frame.flowControlLength(); + if (frame.isEndStream()) + { + dataQueue.offer(Data.eof(getId())); + break; + } + } + if (LOG.isDebugEnabled()) + LOG.debug("Drained {} bytes for {}", length, this); + return length; + } + public boolean updateClose(boolean update, CloseState.Event event) { if (LOG.isDebugEnabled()) diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/AbstractTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/AbstractTest.java index 36bcfbcdeb08..90bc346b4ce9 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/AbstractTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/AbstractTest.java @@ -31,6 +31,7 @@ import org.eclipse.jetty.http2.server.AbstractHTTP2ServerConnectionFactory; import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory; import org.eclipse.jetty.http2.server.RawHTTP2ServerConnectionFactory; +import org.eclipse.jetty.io.ArrayByteBufferPool; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.server.ConnectionFactory; import org.eclipse.jetty.server.Handler; @@ -42,12 +43,18 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.jupiter.api.AfterEach; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + public class AbstractTest { protected Server server; protected ServerConnector connector; protected HTTP2Client http2Client; protected HttpClient httpClient; + private ArrayByteBufferPool.Tracking serverBufferPool; + private ArrayByteBufferPool.Tracking clientBufferPool; protected void start(Handler handler) throws Exception { @@ -84,7 +91,8 @@ protected void prepareServer(ConnectionFactory... connectionFactories) { QueuedThreadPool serverExecutor = new QueuedThreadPool(); serverExecutor.setName("server"); - server = new Server(serverExecutor); + serverBufferPool = new ArrayByteBufferPool.Tracking(); + server = new Server(serverExecutor, null, serverBufferPool); connector = new ServerConnector(server, 1, 1, connectionFactories); server.addConnector(connector); } @@ -92,6 +100,8 @@ protected void prepareServer(ConnectionFactory... connectionFactories) protected void prepareClient() { ClientConnector connector = new ClientConnector(); + clientBufferPool = new ArrayByteBufferPool.Tracking(); + connector.setByteBufferPool(clientBufferPool); QueuedThreadPool clientExecutor = new QueuedThreadPool(); clientExecutor.setName("client"); connector.setExecutor(clientExecutor); @@ -128,7 +138,17 @@ protected MetaData.Request newRequest(String method, String path, HttpFields fie @AfterEach public void dispose() throws Exception { - LifeCycle.stop(httpClient); - LifeCycle.stop(server); + try + { + if (serverBufferPool != null) + await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> assertThat("Server leaks: " + serverBufferPool.dumpLeaks(), serverBufferPool.getLeaks().size(), is(0))); + if (clientBufferPool != null) + await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> assertThat("Client leaks: " + clientBufferPool.dumpLeaks(), clientBufferPool.getLeaks().size(), is(0))); + } + finally + { + LifeCycle.stop(httpClient); + LifeCycle.stop(server); + } } } diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/PrefaceTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/PrefaceTest.java index 1a16a298bd00..48c82d4bc532 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/PrefaceTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/PrefaceTest.java @@ -164,6 +164,7 @@ public void onPing(Session session, PingFrame frame) List buffers = accumulator.getByteBuffers(); socket.write(buffers.toArray(new ByteBuffer[0])); + accumulator.release(); Queue settings = new ArrayDeque<>(); AtomicBoolean closed = new AtomicBoolean(); diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/RawHTTP2ProxyTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/RawHTTP2ProxyTest.java index e8db27522da8..2df4ab107615 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/RawHTTP2ProxyTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/RawHTTP2ProxyTest.java @@ -43,6 +43,7 @@ import org.eclipse.jetty.http2.frames.PushPromiseFrame; import org.eclipse.jetty.http2.frames.ResetFrame; import org.eclipse.jetty.http2.server.RawHTTP2ServerConnectionFactory; +import org.eclipse.jetty.io.ArrayByteBufferPool; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; @@ -57,6 +58,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -66,12 +70,16 @@ public class RawHTTP2ProxyTest private final List servers = new ArrayList<>(); private final List clients = new ArrayList<>(); + private final List serverBufferPools = new ArrayList<>(); + private final List clientBufferPools = new ArrayList<>(); private Server startServer(String name, ServerSessionListener listener) throws Exception { QueuedThreadPool serverExecutor = new QueuedThreadPool(); serverExecutor.setName(name); - Server server = new Server(serverExecutor); + ArrayByteBufferPool.Tracking pool = new ArrayByteBufferPool.Tracking(); + serverBufferPools.add(pool); + Server server = new Server(serverExecutor, null, pool); RawHTTP2ServerConnectionFactory connectionFactory = new RawHTTP2ServerConnectionFactory(new HttpConfiguration(), listener); ServerConnector connector = new ServerConnector(server, 1, 1, connectionFactory); server.addConnector(connector); @@ -88,6 +96,9 @@ private HTTP2Client startClient(String name) throws Exception clientExecutor.setName(name); client.setExecutor(clientExecutor); clients.add(client); + ArrayByteBufferPool.Tracking pool = new ArrayByteBufferPool.Tracking(); + clientBufferPools.add(pool); + client.setByteBufferPool(pool); client.start(); return client; } @@ -95,15 +106,35 @@ private HTTP2Client startClient(String name) throws Exception @AfterEach public void dispose() throws Exception { - for (int i = clients.size() - 1; i >= 0; i--) + try { - HTTP2Client client = clients.get(i); - client.stop(); + for (int i = 0; i < serverBufferPools.size(); i++) + { + ArrayByteBufferPool.Tracking serverBufferPool = serverBufferPools.get(i); + int idx = i; + await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> assertThat("Server #" + idx + " leaks: " + serverBufferPool.dumpLeaks(), serverBufferPool.getLeaks().size(), is(0))); + } + for (int i = 0; i < clientBufferPools.size(); i++) + { + ArrayByteBufferPool.Tracking clientBufferPool = clientBufferPools.get(i); + int idx = i; + await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> assertThat("Client #" + idx + " leaks: " + clientBufferPool.dumpLeaks(), clientBufferPool.getLeaks().size(), is(0))); + } } - for (int i = servers.size() - 1; i >= 0; i--) + finally { - Server server = servers.get(i); - server.stop(); + serverBufferPools.clear(); + clientBufferPools.clear(); + for (int i = clients.size() - 1; i >= 0; i--) + { + HTTP2Client client = clients.get(i); + client.stop(); + } + for (int i = servers.size() - 1; i >= 0; i--) + { + Server server = servers.get(i); + server.stop(); + } } } diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/RequestTrailersTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/RequestTrailersTest.java index f1e79da4fec5..6ddff4571e55 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/RequestTrailersTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/RequestTrailersTest.java @@ -61,8 +61,24 @@ public Stream.Listener onNewStream(Stream stream, HeadersFrame frame) MetaData.Response response = new MetaData.Response(HttpStatus.OK_200, null, HttpVersion.HTTP_2, HttpFields.EMPTY); HeadersFrame responseFrame = new HeadersFrame(stream.getId(), response, null, true); stream.headers(responseFrame, Callback.NOOP); + stream.demand(); return new Stream.Listener() { + @Override + public void onDataAvailable(Stream stream) + { + while (true) + { + Stream.Data data = stream.readData(); + if (data != null) + data.release(); + if (data == null || !data.frame().isEndStream()) + stream.demand(); + if (data == null || data.frame().isEndStream()) + break; + } + } + @Override public void onHeaders(Stream stream, HeadersFrame frame) { diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/SettingsTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/SettingsTest.java index 6d0d7383f60e..8a1033b957c5 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/SettingsTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/SettingsTest.java @@ -324,7 +324,7 @@ public Stream.Listener onNewStream(Stream stream, HeadersFrame frame) MetaData.Request push = newRequest("GET", "/push", HttpFields.EMPTY); PushPromiseFrame pushFrame = new PushPromiseFrame(stream.getId(), 2, push); session.getGenerator().control(accumulator, pushFrame); - session.getEndPoint().write(Callback.NOOP, accumulator.getByteBuffers().toArray(ByteBuffer[]::new)); + session.getEndPoint().write(Callback.from(accumulator::release), accumulator.getByteBuffers().toArray(ByteBuffer[]::new)); return null; } catch (HpackException x) diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/StreamCountTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/StreamCountTest.java index 5dfc84b525b9..510da57b82d6 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/StreamCountTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/StreamCountTest.java @@ -204,7 +204,7 @@ public void onReset(Stream stream, ResetFrame frame, Callback callback) ByteBufferPool.Accumulator accumulator = new ByteBufferPool.Accumulator(); generator.control(accumulator, frame3); generator.data(accumulator, data3, data3.remaining()); - ((HTTP2Session)session).getEndPoint().write(Callback.NOOP, accumulator.getByteBuffers().toArray(ByteBuffer[]::new)); + ((HTTP2Session)session).getEndPoint().write(Callback.from(accumulator::release), accumulator.getByteBuffers().toArray(ByteBuffer[]::new)); // Expect 2 RST_STREAM frames. assertTrue(sessionResetLatch.await(5, TimeUnit.SECONDS)); diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/StreamResetTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/StreamResetTest.java index 15e17a05b816..a5de54689e02 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/StreamResetTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/StreamResetTest.java @@ -84,6 +84,7 @@ import org.junit.jupiter.api.Test; import static org.awaitility.Awaitility.await; +import static org.hamcrest.Matchers.greaterThan; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -417,29 +418,38 @@ public void onHeaders(Stream stream, HeadersFrame frame) @Test public void testClientResetConsumesQueuedData() throws Exception { - CountDownLatch dataLatch = new CountDownLatch(1); - start(new Handler.Abstract() + AtomicReference serverStreamRef = new AtomicReference<>(); + start(new ServerSessionListener() { @Override - public boolean handle(Request request, Response response, Callback callback) throws Exception + public Stream.Listener onNewStream(Stream stream, HeadersFrame frame) { - // Wait for the data to be sent. - assertTrue(dataLatch.await(5, TimeUnit.SECONDS)); - callback.succeeded(); - return true; + stream.demand(); + return new Stream.Listener() + { + @Override + public void onDataAvailable(Stream stream) + { + // Do not read the data. + serverStreamRef.set((HTTP2Stream)stream); + } + }; } }); Session client = newClientSession(new Session.Listener() {}); MetaData.Request request = newRequest("GET", HttpFields.EMPTY); HeadersFrame frame = new HeadersFrame(request, null, false); - FuturePromise promise = new FuturePromise<>(); - client.newStream(frame, promise, null); - Stream stream = promise.get(5, TimeUnit.SECONDS); + Stream stream = client.newStream(frame, null).get(5, TimeUnit.SECONDS); ByteBuffer data = ByteBuffer.allocate(FlowControlStrategy.DEFAULT_WINDOW_SIZE); - stream.data(new DataFrame(stream.getId(), data, false), Callback.from(dataLatch::countDown)); - // The server does not read the data, so the flow control window should be zero. - assertTrue(dataLatch.await(5, TimeUnit.SECONDS)); + stream.data(new DataFrame(stream.getId(), data, false), Callback.NOOP); + + // Wait for the server to receive all the data. + await().atMost(5, TimeUnit.SECONDS).until(() -> serverStreamRef.get() != null); + HTTP2Stream serverStream = serverStreamRef.get(); + await().atMost(5, TimeUnit.SECONDS).until(() -> serverStream.getDataLength() == FlowControlStrategy.DEFAULT_WINDOW_SIZE); + + // The server does not read the data, so the client flow control window should be zero. assertEquals(0, ((HTTP2Session)client).updateSendWindow(0)); // Now reset the stream. @@ -913,6 +923,7 @@ public boolean handle(Request request, Response response, Callback callback) generator.control(accumulator, new ResetFrame(streamId, ErrorCode.CANCEL_STREAM_ERROR.code)); buffers = accumulator.getByteBuffers(); socket.write(buffers.toArray(new ByteBuffer[0])); + accumulator.release(); assertTrue(writeLatch1.await(5, TimeUnit.SECONDS)); assertTrue(writeLatch2.await(5, TimeUnit.SECONDS)); @@ -1011,6 +1022,7 @@ private void service2(Response response, Callback callback) throws Exception generator.control(accumulator, new ResetFrame(streamId, ErrorCode.CANCEL_STREAM_ERROR.code)); buffers = accumulator.getByteBuffers(); socket.write(buffers.toArray(new ByteBuffer[0])); + accumulator.release(); // Wait to be sure that the server processed the reset. Thread.sleep(1000); // Let the request write, it should not block. @@ -1076,6 +1088,76 @@ public void onFailure(Session session, Throwable failure, Callback callback) assertFalse(failureLatch.await(1, TimeUnit.SECONDS)); } + @Test + public void testStreamResetDrainsData() throws Exception + { + AtomicReference serverStreamRef = new AtomicReference<>(); + start(new ServerSessionListener() + { + @Override + public Stream.Listener onNewStream(Stream stream, HeadersFrame frame) + { + serverStreamRef.set((HTTP2Stream)stream); + stream.demand(); + return new Stream.Listener() + { + @Override + public void onDataAvailable(Stream stream) + { + // Do not read DATA frames. + stream.reset(new ResetFrame(stream.getId(), ErrorCode.CANCEL_STREAM_ERROR.code)); + } + }; + } + }); + + CountDownLatch resetLatch = new CountDownLatch(1); + Session client = newClientSession(new Session.Listener() {}); + MetaData.Request request = newRequest("GET", HttpFields.EMPTY); + HeadersFrame requestFrame = new HeadersFrame(request, null, false); + Stream stream = client.newStream(requestFrame, new Stream.Listener() + { + @Override + public void onReset(Stream stream, ResetFrame frame, Callback callback) + { + resetLatch.countDown(); + } + }).get(5, TimeUnit.SECONDS); + stream.data(new DataFrame(stream.getId(), ByteBuffer.allocate(1024), true)); + + assertTrue(resetLatch.await(5, TimeUnit.SECONDS)); + + // After the reset, the server stream should be drained. + assertEquals(0, serverStreamRef.get().getDataLength()); + } + + @Test + public void testDataAfterLastFrameResets() throws Exception + { + start(new ServerSessionListener() {}); + + CountDownLatch resetLatch = new CountDownLatch(1); + Session client = newClientSession(new Session.Listener() {}); + MetaData.Request request = newRequest("GET", HttpFields.EMPTY); + HeadersFrame requestFrame = new HeadersFrame(request, null, true); + Stream stream = client.newStream(requestFrame, new Stream.Listener() + { + @Override + public void onReset(Stream stream, ResetFrame frame, Callback callback) + { + resetLatch.countDown(); + } + }).get(5, TimeUnit.SECONDS); + + // The HEADERS frame had endStream=true, send a DATA frame with endStream=true, expect RST_STREAM. + stream.data(new DataFrame(stream.getId(), ByteBuffer.allocate(FlowControlStrategy.DEFAULT_WINDOW_SIZE), true)); + + assertTrue(resetLatch.await(5, TimeUnit.SECONDS)); + + // The client session window should be open. + await().atMost(5, TimeUnit.SECONDS).until(() -> ((HTTP2Session)stream.getSession()).updateSendWindow(0), greaterThan(0)); + } + private void waitUntilTCPCongested(WriteFlusher flusher) throws TimeoutException, InterruptedException { long start = NanoTime.now(); diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ArrayByteBufferPool.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ArrayByteBufferPool.java index d5a9fae126ee..46a1c73eb733 100644 --- a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ArrayByteBufferPool.java +++ b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ArrayByteBufferPool.java @@ -631,6 +631,7 @@ public class Buffer extends RetainableByteBuffer.Wrapper private final Throwable acquireStack; private final List retainStacks = new CopyOnWriteArrayList<>(); private final List releaseStacks = new CopyOnWriteArrayList<>(); + private final List overReleaseStacks = new CopyOnWriteArrayList<>(); private Buffer(RetainableByteBuffer wrapped, int size) { @@ -665,15 +666,24 @@ public void retain() @Override public boolean release() { - boolean released = super.release(); - if (released) + try { - buffers.remove(this); - if (LOG.isDebugEnabled()) - LOG.debug("released {}", this); + boolean released = super.release(); + if (released) + { + buffers.remove(this); + if (LOG.isDebugEnabled()) + LOG.debug("released {}", this); + } + releaseStacks.add(new Throwable()); + return released; + } + catch (IllegalStateException e) + { + buffers.add(this); + overReleaseStacks.add(new Throwable()); + throw e; } - releaseStacks.add(new Throwable()); - return released; } public String dump() @@ -691,6 +701,11 @@ public String dump() { releaseStack.printStackTrace(pw); } + pw.println("\n" + overReleaseStacks.size() + " over-release(s)"); + for (Throwable overReleaseStack : overReleaseStacks) + { + overReleaseStack.printStackTrace(pw); + } return "%s@%x of %d bytes on %s wrapping %s acquired at %s".formatted(getClass().getSimpleName(), hashCode(), getSize(), getAcquireInstant(), getWrapped(), w); } } diff --git a/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/HttpClientDemandTest.java b/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/HttpClientDemandTest.java index 5c181775d886..2403239119fb 100644 --- a/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/HttpClientDemandTest.java +++ b/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/HttpClientDemandTest.java @@ -55,7 +55,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -285,10 +284,6 @@ public boolean handle(Request request, org.eclipse.jetty.server.Response respons // Demand once more to trigger response success. demanderRef.get().run(); assertTrue(resultLatch.await(5, TimeUnit.SECONDS)); - - // Make sure the chunks were not leaked. - assertThrows(IllegalStateException.class, c1::release); - assertThrows(IllegalStateException.class, c2::release); } private static String asStringAndRelease(Content.Chunk chunk) From da4cf2eb605f3b9260e2dca51d09fbec022e2241 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 4 Oct 2023 22:57:43 +0200 Subject: [PATCH 04/31] Issue #9157 reduce javadoc tool too verbose (#10663) Signed-off-by: Olivier Lamy --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95bdcec94847..a6be0d7dcffe 100644 --- a/pom.xml +++ b/pom.xml @@ -208,6 +208,7 @@ 11.0.14.Final false 2023-06-05T23:12:49Z + false @@ -674,7 +675,7 @@ maven-javadoc-plugin ${maven.javadoc.plugin.version} - true + ${javadoc.verbose} true 17 UTF-8 From 90fdd4236dbb5d8d090da7763895e05e14b6c7ee Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 5 Oct 2023 02:12:23 +0200 Subject: [PATCH 05/31] Update details on how to include dependabot PRs in a release (#10659) Signed-off-by: Olivier Lamy --- .github/ISSUE_TEMPLATE/release-template.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/release-template.md b/.github/ISSUE_TEMPLATE/release-template.md index f445ee4fa40c..6b95b988a653 100644 --- a/.github/ISSUE_TEMPLATE/release-template.md +++ b/.github/ISSUE_TEMPLATE/release-template.md @@ -25,6 +25,7 @@ This release process will produce releases: + [ ] Freeze the target [GitHub Project(s)](https://github.com/eclipse/jetty.project/projects) by editing their names to "Jetty X.Y.Z FROZEN" + [ ] Review the issues/PRs assigned to the target [GitHub Project(s)](https://github.com/eclipse/jetty.project/projects). Any tasks that are not-yet-started are moved to next releases. - [ ] Review dependabot status. [Manually](https://github.com/eclipse/jetty.project/network/updates) run dependabot if needed and review resulting PRs for inclusion. + Such updates should only be included in the week before a release if there is a compelling security or stability reason to do so. - [ ] Wait 24 hours from last change to the issues/PRs included in FROZEN GitHub Project(s). - [ ] Verify target [project(s)](https://github.com/eclipse/jetty.project/projects) are complete. - [ ] Verify that branch `jetty-10.0.x` is merged to branch `jetty-11.0.x`. From 718f54215e741d8ab8cd0f08af2d50d64b26da35 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 5 Oct 2023 04:29:25 +0200 Subject: [PATCH 06/31] Update details on how to include dependabot PRs in a release (#10659) (#10670) Signed-off-by: Olivier Lamy --- .github/ISSUE_TEMPLATE/release-template.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/release-template.md b/.github/ISSUE_TEMPLATE/release-template.md index f445ee4fa40c..6b95b988a653 100644 --- a/.github/ISSUE_TEMPLATE/release-template.md +++ b/.github/ISSUE_TEMPLATE/release-template.md @@ -25,6 +25,7 @@ This release process will produce releases: + [ ] Freeze the target [GitHub Project(s)](https://github.com/eclipse/jetty.project/projects) by editing their names to "Jetty X.Y.Z FROZEN" + [ ] Review the issues/PRs assigned to the target [GitHub Project(s)](https://github.com/eclipse/jetty.project/projects). Any tasks that are not-yet-started are moved to next releases. - [ ] Review dependabot status. [Manually](https://github.com/eclipse/jetty.project/network/updates) run dependabot if needed and review resulting PRs for inclusion. + Such updates should only be included in the week before a release if there is a compelling security or stability reason to do so. - [ ] Wait 24 hours from last change to the issues/PRs included in FROZEN GitHub Project(s). - [ ] Verify target [project(s)](https://github.com/eclipse/jetty.project/projects) are complete. - [ ] Verify that branch `jetty-10.0.x` is merged to branch `jetty-11.0.x`. From fb3c2a0ebe324198aa7e7ac1d27e2a446a7c7a73 Mon Sep 17 00:00:00 2001 From: Ludovic Orban Date: Thu, 5 Oct 2023 14:44:53 +0200 Subject: [PATCH 07/31] Disable more flaky tests failing because of buffer leaks Signed-off-by: Ludovic Orban --- .../test/client/transport/HttpClientStreamTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/HttpClientStreamTest.java b/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/HttpClientStreamTest.java index 938935c5729e..08ca24c6e2df 100644 --- a/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/HttpClientStreamTest.java +++ b/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/HttpClientStreamTest.java @@ -481,9 +481,7 @@ public void testInputStreamResponseListenerFailedBeforeResponse(Transport transp @ParameterizedTest @MethodSource("transports") - @Tag("DisableLeakTracking:client:HTTP") - @Tag("DisableLeakTracking:client:HTTPS") - @Tag("DisableLeakTracking:client:UNIX_DOMAIN") + @Tag("DisableLeakTracking:client") @Tag("DisableLeakTracking:server:FCGI") public void testInputStreamContentProviderThrowingWhileReading(Transport transport) throws Exception { @@ -518,8 +516,11 @@ public int read() @ParameterizedTest @MethodSource("transports") + @Tag("DisableLeakTracking:client:HTTP") + @Tag("DisableLeakTracking:client:HTTPS") @Tag("DisableLeakTracking:client:H3") @Tag("DisableLeakTracking:client:FCGI") + @Tag("DisableLeakTracking:client:UNIX_DOMAIN") @Tag("flaky") public void testDownloadWithCloseBeforeContent(Transport transport) throws Exception { @@ -568,6 +569,7 @@ public boolean handle(Request request, org.eclipse.jetty.server.Response respons @ParameterizedTest @Tag("flaky") @Tag("DisableLeakTracking:client:HTTP") + @Tag("DisableLeakTracking:client:HTTPS") @Tag("DisableLeakTracking:client:FCGI") @Tag("DisableLeakTracking:client:UNIX_DOMAIN") @MethodSource("transports") @@ -996,7 +998,7 @@ public void close() throws IOException @MethodSource("transports") @Tag("DisableLeakTracking:server:HTTP") @Tag("DisableLeakTracking:server:HTTPS") - @Tag("DisableLeakTracking:client:H3") + @Tag("DisableLeakTracking:H3") @Tag("DisableLeakTracking:server:FCGI") @Tag("DisableLeakTracking:server:UNIX_DOMAIN") public void testUploadWithConcurrentServerCloseClosesStream(Transport transport) throws Exception From 2d959a60f21576f5dfc5142cc8c37c2642197f2b Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 5 Oct 2023 11:19:43 -0500 Subject: [PATCH 08/31] Fixes #10665 - correcting OSGI Manifest generation on Jetty 12 (#10666) * correcting OSGI Manifest generation on Jetty 12 * remove Bundle-RequiredExecutionEnvironment * remove _noee=true --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index a6be0d7dcffe..9fb0e770b732 100644 --- a/pom.xml +++ b/pom.xml @@ -840,7 +840,6 @@ ${bundle-symbolic-name} Jetty module for ${project.name} - JavaSE-11 ${jetty.url} Eclipse Jetty Project . @@ -851,7 +850,6 @@ <_provider-policy>]]> <_consumer-policy>]]> - <_noee>true From d8338124ee429876e5d667a95452d93832170c27 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 5 Oct 2023 18:47:30 +0200 Subject: [PATCH 09/31] Fixed flaky test `GoAwayTest.testServerGoAwayWithStalledStreamServerConsumesDataOfInFlightStream()`, that became flaky after #10554. Signed-off-by: Simone Bordet --- .../eclipse/jetty/http2/tests/GoAwayTest.java | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/GoAwayTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/GoAwayTest.java index 7935f50c92e6..1f3d4f90c02f 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/GoAwayTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/GoAwayTest.java @@ -15,12 +15,9 @@ import java.net.InetSocketAddress; import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jetty.client.Response; @@ -390,7 +387,6 @@ public void testServerGoAwayWithStalledStreamServerConsumesDataOfInFlightStream( { int flowControlWindow = 32 * 1024; - List dataList = new ArrayList<>(); AtomicReference serverSessionRef = new AtomicReference<>(); CountDownLatch serverGoAwayLatch = new CountDownLatch(1); CountDownLatch serverCloseLatch = new CountDownLatch(1); @@ -406,21 +402,14 @@ public void onAccept(Session session) public Stream.Listener onNewStream(Stream stream, HeadersFrame frame) { stream.demand(); - AtomicInteger dataFrames = new AtomicInteger(); return new Stream.Listener() { @Override public void onDataAvailable(Stream stream) { - Stream.Data data = stream.readData(); - dataList.add(data); - // Do not release the Data for this stream. - // Only send the response after reading the first DATA frame. - if (dataFrames.incrementAndGet() == 1) - { - MetaData.Response response = new MetaData.Response(HttpStatus.OK_200, null, HttpVersion.HTTP_2, HttpFields.EMPTY); - stream.headers(new HeadersFrame(stream.getId(), response, null, true), Callback.NOOP); - } + // Send the response, but do not read. + MetaData.Response response = new MetaData.Response(HttpStatus.OK_200, null, HttpVersion.HTTP_2, HttpFields.EMPTY); + stream.headers(new HeadersFrame(stream.getId(), response, null, true), Callback.NOOP); } }; } @@ -518,8 +507,6 @@ public void succeeded(Stream clientStream2) assertFalse(((HTTP2Session)serverSessionRef.get()).getEndPoint().isOpen()); assertFalse(((HTTP2Session)clientSession).getEndPoint().isOpen()); - - dataList.forEach(Stream.Data::release); } @Test From a4b55e6964049475dd0f31aefad1e76966c3879f Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 5 Oct 2023 19:47:28 +0200 Subject: [PATCH 10/31] Fixed flaky test `StreamResetTest.testResetAfterBlockingWrite()`, that became flaky after #10554. Signed-off-by: Simone Bordet --- .../jetty/http2/tests/StreamResetTest.java | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/StreamResetTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/StreamResetTest.java index a5de54689e02..45b5424a00c9 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/StreamResetTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/StreamResetTest.java @@ -85,6 +85,7 @@ import static org.awaitility.Awaitility.await; import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -710,29 +711,20 @@ public boolean handle(Request request, Response response, Callback callback) } }); - List dataList = new ArrayList<>(); - AtomicLong received = new AtomicLong(); - CountDownLatch latch = new CountDownLatch(1); Session client = newClientSession(new Session.Listener() {}); MetaData.Request request = newRequest("GET", HttpFields.EMPTY); HeadersFrame frame = new HeadersFrame(request, null, true); - FuturePromise promise = new FuturePromise<>(); - client.newStream(frame, promise, new Stream.Listener() + Stream stream = client.newStream(frame, new Stream.Listener() { @Override public void onDataAvailable(Stream stream) { - Stream.Data data = stream.readData(); - dataList.add(data); - // Do not release to stall the flow control window. - if (received.addAndGet(data.frame().getByteBuffer().remaining()) == windowSize) - latch.countDown(); - else - stream.demand(); + // Do not read to stall the flow control window. } - }); - Stream stream = promise.get(5, TimeUnit.SECONDS); - assertTrue(latch.await(5, TimeUnit.SECONDS)); + }).get(5, TimeUnit.SECONDS); + + // Wait until the flow control stalls. + await().atMost(5, TimeUnit.SECONDS).until(() -> ((HTTP2Stream)stream).getDataLength(), is((long)windowSize)); // Reset. stream.reset(new ResetFrame(stream.getId(), ErrorCode.CANCEL_STREAM_ERROR.code), Callback.NOOP); @@ -747,8 +739,6 @@ public void onDataAvailable(Stream stream) HTTP2Session session = (HTTP2Session)sessions.iterator().next(); HTTP2Flusher flusher = session.getBean(HTTP2Flusher.class); assertEquals(0, flusher.getFrameQueueSize()); - - dataList.forEach(Stream.Data::release); } @Test From ff5757428575d59a34af9b75484aecaa60b752cc Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 5 Oct 2023 20:08:53 +0200 Subject: [PATCH 11/31] Fixed test `FlowControlStrategyTest` after the changes of #10554. Signed-off-by: Simone Bordet --- .../http2/tests/FlowControlStrategyTest.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/FlowControlStrategyTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/FlowControlStrategyTest.java index 052a66fe921a..3cb44219e0b5 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/FlowControlStrategyTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/FlowControlStrategyTest.java @@ -723,7 +723,6 @@ public void onDataAvailable(Stream stream) public void testClientExceedingSessionWindow(FlowControlStrategyType type) throws Exception { // On server, we don't consume the data. - List dataList = new ArrayList<>(); CountDownLatch serverCloseLatch = new CountDownLatch(1); start(type, new ServerSessionListener() { @@ -735,11 +734,7 @@ public Stream.Listener onNewStream(Stream stream, HeadersFrame frame) @Override public void onDataAvailable(Stream stream) { - // Read but do not release the Data. - Stream.Data data = stream.readData(); - if (!data.frame().isEndStream()) - stream.demand(); - dataList.add(data); + // Do not read to stall the flow control. } }; } @@ -816,8 +811,6 @@ public void succeeded() assertTrue(clientGoAwayLatch.await(5, TimeUnit.SECONDS)); assertTrue(clientCloseLatch.await(5, TimeUnit.SECONDS)); assertTrue(serverCloseLatch.await(5, TimeUnit.SECONDS)); - - dataList.forEach(Stream.Data::release); } @ParameterizedTest @@ -825,7 +818,6 @@ public void succeeded() public void testClientExceedingStreamWindow(FlowControlStrategyType type) throws Exception { // On server, we don't consume the data. - List dataList = new ArrayList<>(); CountDownLatch serverCloseLatch = new CountDownLatch(1); start(type, new ServerSessionListener() { @@ -845,11 +837,7 @@ public Stream.Listener onNewStream(Stream stream, HeadersFrame frame) @Override public void onDataAvailable(Stream stream) { - // Read but do not release the Data. - Stream.Data data = stream.readData(); - if (!data.frame().isEndStream()) - stream.demand(); - dataList.add(data); + // Do not read to stall the flow control. } }; } @@ -922,8 +910,6 @@ public void succeeded() assertTrue(clientGoAwayLatch.await(5, TimeUnit.SECONDS)); assertTrue(clientCloseLatch.await(5, TimeUnit.SECONDS)); assertTrue(serverCloseLatch.await(5, TimeUnit.SECONDS)); - - dataList.forEach(Stream.Data::release); } @ParameterizedTest From 8bdf42f65264fccd6b6fec50ed600841836ca8f6 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 6 Oct 2023 02:10:07 +0200 Subject: [PATCH 12/31] Issue #7408 fix scope of Maven plugins dependencies and re enable some IT tests (#10660) * Issue #7408 fix scope of maven dependencies for ee10 * Issue #7408 fix scope of maven dependencies for ee10 jspc and restore it test which were disabled * Issue #7408 fix scope of maven dependencies for ee9 maven plugin * Issue #7408 fix scope of maven dependencies for ee9 jspc and restore it test which were disabled * Issue #7408 fix scope of maven dependencies for ee8 maven plugin * Issue #7408 fix scope of maven dependencies for ee8 jspc and restore it test which were disabled --------- Signed-off-by: Olivier Lamy --- .../jetty-ee10-jspc-maven-plugin/pom.xml | 13 ++++++++++- .../src/it/simple-jsp/postbuild.groovy | 2 ++ jetty-ee10/jetty-ee10-maven-plugin/pom.xml | 20 +++++++++++++++++ .../ee10/maven/plugin/JettyStopMojo.java | 5 ++++- jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml | 13 ++++++++++- jetty-ee8/jetty-ee8-maven-plugin/pom.xml | 20 +++++++++++++++++ jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml | 13 ++++++++++- .../src/it/simple-jsp/postbuild.groovy | 2 ++ jetty-ee9/jetty-ee9-maven-plugin/pom.xml | 22 +++++++++++++++++++ pom.xml | 5 +++++ 10 files changed, 111 insertions(+), 4 deletions(-) diff --git a/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml b/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml index c9838c0f02fb..0b34ee0a3b52 100644 --- a/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml +++ b/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml @@ -11,7 +11,6 @@ EE10 :: Jetty JSPC Maven Plugin ${project.groupId}.jspc.plugin - true true @@ -62,6 +61,7 @@ org.apache.maven maven-plugin-api + provided javax.annotation @@ -74,9 +74,20 @@ maven-plugin-annotations provided + + org.apache.maven + maven-core + provided + + + org.apache.maven + maven-model + provided + org.apache.maven maven-artifact + provided org.apache.maven.plugin-tools diff --git a/jetty-ee10/jetty-ee10-jspc-maven-plugin/src/it/simple-jsp/postbuild.groovy b/jetty-ee10/jetty-ee10-jspc-maven-plugin/src/it/simple-jsp/postbuild.groovy index 03f44370c6af..77118926cfdf 100644 --- a/jetty-ee10/jetty-ee10-jspc-maven-plugin/src/it/simple-jsp/postbuild.groovy +++ b/jetty-ee10/jetty-ee10-jspc-maven-plugin/src/it/simple-jsp/postbuild.groovy @@ -1,3 +1,5 @@ +import groovy.xml.XmlSlurper + System.out.println( "running postbuild.groovy" ) File webfrag = new File(basedir, 'target/webfrag.xml') diff --git a/jetty-ee10/jetty-ee10-maven-plugin/pom.xml b/jetty-ee10/jetty-ee10-maven-plugin/pom.xml index 6e7dde7f8009..ca8fbabf0d98 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/pom.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/pom.xml @@ -173,6 +173,18 @@ javax.annotation javax.annotation-api + + org.apache.maven + maven-xml-impl + + + org.apache.maven + maven-api-xml + + + org.apache.maven + maven-xml-meta + @@ -183,6 +195,7 @@ org.apache.maven maven-plugin-api + provided javax.annotation @@ -193,10 +206,17 @@ org.apache.maven maven-artifact + provided org.apache.maven maven-core + provided + + + org.apache.maven + maven-model + provided org.apache.maven.plugin-tools diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/JettyStopMojo.java b/jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/JettyStopMojo.java index 62b06e5af505..c7287a7d2378 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/JettyStopMojo.java +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/JettyStopMojo.java @@ -86,7 +86,10 @@ public void execute() throws MojoExecutionException, MojoFailureException } catch (NumberFormatException e) { - e.printStackTrace(); + if (getLog().isDebugEnabled()) + { + getLog().debug(e); + } getLog().info("Server returned bad pid"); } catch (ConnectException e) diff --git a/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml b/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml index 0b59597711fd..62bf3a5f7b03 100644 --- a/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml +++ b/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml @@ -12,7 +12,6 @@ ${project.groupId}.jspc.plugin jetty-ee9-jspc-maven-plugin - true true @@ -63,6 +62,7 @@ org.apache.maven maven-plugin-api + provided javax.annotation @@ -78,6 +78,17 @@ org.apache.maven maven-artifact + provided + + + org.apache.maven + maven-core + provided + + + org.apache.maven + maven-model + provided org.apache.maven.plugin-tools diff --git a/jetty-ee8/jetty-ee8-maven-plugin/pom.xml b/jetty-ee8/jetty-ee8-maven-plugin/pom.xml index 8d50ff39f2ff..e426e73c0aa3 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/pom.xml +++ b/jetty-ee8/jetty-ee8-maven-plugin/pom.xml @@ -132,6 +132,18 @@ javax.annotation javax.annotation-api + + org.apache.maven + maven-xml-impl + + + org.apache.maven + maven-api-xml + + + org.apache.maven + maven-xml-meta + @@ -142,6 +154,7 @@ org.apache.maven maven-plugin-api + provided javax.annotation @@ -152,10 +165,17 @@ org.apache.maven maven-artifact + provided org.apache.maven maven-core + provided + + + org.apache.maven + maven-model + provided org.apache.maven.plugin-tools diff --git a/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml b/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml index 4a26f4573198..f3770b4de837 100644 --- a/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml +++ b/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml @@ -11,7 +11,6 @@ EE9 :: Jetty JSPC Maven Plugin ${project.groupId}.jspc.plugin - true true @@ -62,6 +61,7 @@ org.apache.maven maven-plugin-api + provided javax.annotation @@ -69,6 +69,16 @@ + + org.apache.maven + maven-core + provided + + + org.apache.maven + maven-model + provided + org.apache.maven.plugin-tools maven-plugin-annotations @@ -77,6 +87,7 @@ org.apache.maven maven-artifact + provided org.apache.maven.plugin-tools diff --git a/jetty-ee9/jetty-ee9-jspc-maven-plugin/src/it/simple-jsp/postbuild.groovy b/jetty-ee9/jetty-ee9-jspc-maven-plugin/src/it/simple-jsp/postbuild.groovy index 03f44370c6af..77118926cfdf 100644 --- a/jetty-ee9/jetty-ee9-jspc-maven-plugin/src/it/simple-jsp/postbuild.groovy +++ b/jetty-ee9/jetty-ee9-jspc-maven-plugin/src/it/simple-jsp/postbuild.groovy @@ -1,3 +1,5 @@ +import groovy.xml.XmlSlurper + System.out.println( "running postbuild.groovy" ) File webfrag = new File(basedir, 'target/webfrag.xml') diff --git a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml index e48600010a1c..e64c56206d21 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml +++ b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml @@ -169,6 +169,7 @@ org.apache.maven maven-plugin-api + provided javax.annotation @@ -179,14 +180,35 @@ org.apache.maven maven-artifact + provided org.apache.maven maven-core + provided + + + org.apache.maven + maven-model + provided org.codehaus.plexus plexus-xml + + + org.apache.maven + maven-xml-impl + + + org.apache.maven + maven-api-xml + + + org.apache.maven + maven-xml-meta + + org.apache.maven.plugin-tools diff --git a/pom.xml b/pom.xml index 9fb0e770b732..7247067f1568 100644 --- a/pom.xml +++ b/pom.xml @@ -1096,6 +1096,11 @@ + + org.apache.maven + maven-model + ${maven.deps.version} + org.apache.maven maven-plugin-api From 4670d3e35b3b5899d21ac9a068effb4330581369 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 6 Oct 2023 07:09:35 -0500 Subject: [PATCH 13/31] Rollback JDK21 requirements during Compile + Jar creation. Only have JDK21 requirement for jetty-documentation in release script. Signed-off-by: Joakim Erdfelt --- documentation/jetty-documentation/pom.xml | 4 ++-- pom.xml | 4 ++-- scripts/release-jetty.sh | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index 6ee2cf30612d..ba8ec747fd6f 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -23,8 +23,8 @@ false - [21,) - [ERROR] OLD JDK [${java.version}] in use. Jetty documentation ${project.version} MUST use JDK 21 or newer + [17,) + [ERROR] OLD JDK [${java.version}] in use. Jetty documentation ${project.version} MUST use JDK 17 or newer diff --git a/pom.xml b/pom.xml index eb9f937ffb5d..b2d0d4567490 100644 --- a/pom.xml +++ b/pom.xml @@ -2216,8 +2216,8 @@ - [21,) - [ERROR] OLD JDK [${java.version}] in use. Jetty Release ${project.version} MUST use JDK 21 or newer + [17,) + [ERROR] OLD JDK [${java.version}] in use. Jetty Release ${project.version} MUST use JDK 17 or newer diff --git a/scripts/release-jetty.sh b/scripts/release-jetty.sh index 0e16b5599721..36af1fdcda97 100755 --- a/scripts/release-jetty.sh +++ b/scripts/release-jetty.sh @@ -163,6 +163,11 @@ if proceedyn "Are you sure you want to release using above? (y/N)" n; then # This is equivalent to 'mvn release:perform' if proceedyn "Build/Deploy from tag $TAG_NAME? (Y/n)" y; then mvn clean deploy -Peclipse-release $DEPLOY_OPTS + echo "IMPORTANT NOTICE: You will need to build+deploy jetty-documentation on JDK21 to make the documentation sane!" + echo "Switch to a new window, make sure you are using JDK21, and run the following command:" + echo "$ mvn clean deploy -Peclipse-release $DEPLOY_OPTS -pl :jetty-documentation" + if proceedyn "Did you build and deploy jetty-documentation in JDK21? (y/N)" n; then + fi fi if proceedyn "Update working directory for $VER_NEXT? (Y/n)" y; then echo "Update VERSION.txt for $VER_NEXT" From 3608ecf99936bd3ff8e4a6fd0dc1789ec0e3ebf6 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Fri, 6 Oct 2023 14:18:09 +0200 Subject: [PATCH 14/31] =?UTF-8?q?Changed=20default=20implementation=20of?= =?UTF-8?q?=20Session.Listener.onNewStream()=20and=20=E2=80=A6=20(#10672)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Changed default implementation of Session.Listener.onNewStream() and Stream.Listener.onDataAvailable() to auto-discard DATA frames. For normal cases, these methods are overridden and the application is in full control. For test cases, these methods may not be overridden and the default implementation conveniently avoids buffer leaks. Fixed flaky test RawHTTP2ProxyTest.testRawHTTP2Proxy() due to the bad assumption that the first DATA frame ends the stream (so an aggregator is needed), and a copy/paste error in ServerToProxyToClient while processing DATA frames. Signed-off-by: Simone Bordet --- .../org/eclipse/jetty/http2/HTTP2Stream.java | 24 +-- .../org/eclipse/jetty/http2/api/Session.java | 13 +- .../org/eclipse/jetty/http2/api/Stream.java | 36 +++- .../eclipse/jetty/http2/tests/GoAwayTest.java | 2 +- .../jetty/http2/tests/RawHTTP2ProxyTest.java | 194 ++++++++++-------- .../jetty/http2/tests/SettingsTest.java | 4 +- .../test/resources/jetty-logging.properties | 1 + 7 files changed, 160 insertions(+), 114 deletions(-) diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java index feda6c9d9be8..55584b7aae34 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java @@ -853,28 +853,14 @@ protected void notifyHeaders(Stream stream, HeadersFrame frame) private void notifyDataAvailable(Stream stream) { - Listener listener = this.listener; - if (listener != null) + Listener listener = Objects.requireNonNullElse(this.listener, Listener.AUTO_DISCARD); + try { - try - { - listener.onDataAvailable(stream); - } - catch (Throwable x) - { - LOG.info("Failure while notifying listener {}", listener, x); - } + listener.onDataAvailable(stream); } - else + catch (Throwable x) { - Data data = readData(); - if (data != null) - { - data.release(); - if (data.frame().isEndStream()) - return; - } - stream.demand(); + LOG.info("Failure while notifying listener {}", listener, x); } } diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/Session.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/Session.java index e6c5dadaf3f0..b0aa8efd26a0 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/Session.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/Session.java @@ -228,9 +228,14 @@ public default Map onPreface(Session session) *

Applications can detect whether request DATA frames will be arriving * by testing {@link HeadersFrame#isEndStream()}. If the application is * interested in processing the DATA frames, it must demand for DATA - * frames using {@link Stream#demand()} and return a + * frames using {@link Stream#demand()} and then return either a * {@link Stream.Listener} implementation that overrides - * {@link Stream.Listener#onDataAvailable(Stream)}.

+ * {@link Stream.Listener#onDataAvailable(Stream)} where applications can + * read from the {@link Stream} via {@link Stream#readData()}, or + * {@link Stream.Listener#AUTO_DISCARD} that automatically reads and + * discards DATA frames. + * Returning {@code null} is possible but discouraged, and has the + * same effect of demanding and discarding the DATA frames.

* * @param stream the newly created stream * @param frame the HEADERS frame received @@ -238,7 +243,9 @@ public default Map onPreface(Session session) */ public default Stream.Listener onNewStream(Stream stream, HeadersFrame frame) { - return null; + if (!frame.isEndStream()) + stream.demand(); + return Stream.Listener.AUTO_DISCARD; } /** diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/Stream.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/Stream.java index 446f459c6997..dc3ecf7d5275 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/Stream.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/Stream.java @@ -264,6 +264,14 @@ public default CompletableFuture reset(ResetFrame frame) */ public interface Listener { + /** + *

A convenient constant for a {@link Listener} implementation that + * demands and discards DATA frames, typically to be returned from + * {@link Session.Listener#onNewStream(Stream, HeadersFrame)} + * and {@link Listener#onPush(Stream, PushPromiseFrame)}.

+ */ + public static Listener AUTO_DISCARD = new Listener() {}; + /** *

Callback method invoked when a stream is created locally by * {@link Session#newStream(HeadersFrame, Promise, Listener)}.

@@ -282,11 +290,22 @@ public default void onNewStream(Stream stream) */ public default void onHeaders(Stream stream, HeadersFrame frame) { - stream.demand(); + if (!frame.isEndStream()) + stream.demand(); } /** *

Callback method invoked when a PUSH_PROMISE frame has been received.

+ *

Applications that override this method are typically interested in + * processing the pushed stream DATA frames, and must demand for pushed + * DATA frames via {@link Stream#demand()} and then return either a + * {@link Listener} implementation that overrides + * {@link #onDataAvailable(Stream)} where applications can + * read from the {@link Stream} via {@link Stream#readData()}, or + * {@link #AUTO_DISCARD} that automatically reads and + * discards DATA frames. + * Returning {@code null} is possible but discouraged, and has the + * same effect of demanding and discarding the pushed DATA frames.

* * @param stream the pushed stream * @param frame the PUSH_PROMISE frame received @@ -294,7 +313,8 @@ public default void onHeaders(Stream stream, HeadersFrame frame) */ public default Listener onPush(Stream stream, PushPromiseFrame frame) { - return null; + stream.demand(); + return AUTO_DISCARD; } /** @@ -352,6 +372,18 @@ public default Listener onPush(Stream stream, PushPromiseFrame frame) */ public default void onDataAvailable(Stream stream) { + while (true) + { + Data data = stream.readData(); + if (data == null) + { + stream.demand(); + return; + } + data.release(); + if (data.frame().isEndStream()) + return; + } } /** diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/GoAwayTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/GoAwayTest.java index 1f3d4f90c02f..b972a522893c 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/GoAwayTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/GoAwayTest.java @@ -496,7 +496,7 @@ public void succeeded(Stream clientStream2) // the server and be able to complete this stream. clientStream1.data(new DataFrame(clientStream1.getId(), ByteBuffer.allocate(flowControlWindow / 2), true), Callback.NOOP); } - }, new Stream.Listener() {}); + }, AUTO_DISCARD); } }); diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/RawHTTP2ProxyTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/RawHTTP2ProxyTest.java index 2df4ab107615..711e705ba55d 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/RawHTTP2ProxyTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/RawHTTP2ProxyTest.java @@ -44,11 +44,12 @@ import org.eclipse.jetty.http2.frames.ResetFrame; import org.eclipse.jetty.http2.server.RawHTTP2ServerConnectionFactory; import org.eclipse.jetty.io.ArrayByteBufferPool; +import org.eclipse.jetty.io.ByteBufferAggregator; +import org.eclipse.jetty.io.RetainableByteBuffer; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.FuturePromise; import org.eclipse.jetty.util.IteratingCallback; import org.eclipse.jetty.util.Promise; import org.eclipse.jetty.util.thread.AutoLock; @@ -62,6 +63,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; public class RawHTTP2ProxyTest @@ -86,6 +89,8 @@ private Server startServer(String name, ServerSessionListener listener) throws E server.setAttribute("connector", connector); servers.add(server); server.start(); + if (LOGGER.isDebugEnabled()) + LOGGER.debug("{}:{} started", name, connector.getLocalPort()); return server; } @@ -141,9 +146,13 @@ public void dispose() throws Exception @Test public void testRawHTTP2Proxy() throws Exception { + Random random = new Random(); byte[] data1 = new byte[1024]; - new Random().nextBytes(data1); + random.nextBytes(data1); ByteBuffer buffer1 = ByteBuffer.wrap(data1); + byte[] data2 = new byte[512]; + random.nextBytes(data2); + ByteBuffer buffer2 = ByteBuffer.wrap(data2); Server server1 = startServer("server1", new ServerSessionListener() { @Override @@ -164,16 +173,12 @@ public void onHeaders(Stream stream, HeadersFrame frame) HeadersFrame reply = new HeadersFrame(stream.getId(), response, null, false); if (LOGGER.isDebugEnabled()) LOGGER.debug("SERVER1 sending {}", reply); - stream.headers(reply, new Callback() + stream.headers(reply).thenAccept(s -> { - @Override - public void succeeded() - { - DataFrame data = new DataFrame(stream.getId(), buffer1.slice(), true); - if (LOGGER.isDebugEnabled()) - LOGGER.debug("SERVER1 sending {}", data); - stream.data(data, NOOP); - } + DataFrame data = new DataFrame(s.getId(), buffer1.slice(), true); + if (LOGGER.isDebugEnabled()) + LOGGER.debug("SERVER1 sending {}", data); + s.data(data); }); } } @@ -198,25 +203,28 @@ public void onDataAvailable(Stream stream) if (LOGGER.isDebugEnabled()) LOGGER.debug("SERVER2 received {}", data); data.release(); - MetaData.Response response = new MetaData.Response(HttpStatus.OK_200, null, HttpVersion.HTTP_2, HttpFields.EMPTY); - HeadersFrame reply = new HeadersFrame(stream.getId(), response, null, false); - if (LOGGER.isDebugEnabled()) - LOGGER.debug("SERVER2 sending {}", reply); - stream.headers(reply) - .thenCompose(s -> - { - DataFrame dataFrame = new DataFrame(s.getId(), buffer1.slice(), false); - if (LOGGER.isDebugEnabled()) - LOGGER.debug("SERVER2 sending {}", dataFrame); - return s.data(dataFrame); - }).thenAccept(s -> - { - MetaData trailer = new MetaData(HttpVersion.HTTP_2, HttpFields.EMPTY); - HeadersFrame end = new HeadersFrame(s.getId(), trailer, null, true); - if (LOGGER.isDebugEnabled()) - LOGGER.debug("SERVER2 sending {}", end); - s.headers(end); - }); + if (data.frame().isEndStream()) + { + MetaData.Response response = new MetaData.Response(HttpStatus.OK_200, null, HttpVersion.HTTP_2, HttpFields.EMPTY); + HeadersFrame reply = new HeadersFrame(stream.getId(), response, null, false); + if (LOGGER.isDebugEnabled()) + LOGGER.debug("SERVER2 sending {}", reply); + stream.headers(reply) + .thenCompose(s -> + { + DataFrame dataFrame = new DataFrame(s.getId(), buffer2.slice(), false); + if (LOGGER.isDebugEnabled()) + LOGGER.debug("SERVER2 sending {}", dataFrame); + return s.data(dataFrame); + }).thenAccept(s -> + { + MetaData trailers = new MetaData(HttpVersion.HTTP_2, HttpFields.EMPTY); + HeadersFrame end = new HeadersFrame(s.getId(), trailers, null, true); + if (LOGGER.isDebugEnabled()) + LOGGER.debug("SERVER2 sending {}", end); + s.headers(end); + }); + } } }; } @@ -228,23 +236,22 @@ public void onDataAvailable(Stream stream) InetSocketAddress proxyAddress = new InetSocketAddress("localhost", proxyConnector.getLocalPort()); HTTP2Client client = startClient("client"); - FuturePromise clientPromise = new FuturePromise<>(); - client.connect(proxyAddress, new Session.Listener() {}, clientPromise); - Session clientSession = clientPromise.get(5, TimeUnit.SECONDS); + Session clientSession = client.connect(proxyAddress, new Session.Listener() {}).get(5, TimeUnit.SECONDS); // Send a request with trailers for server1. HttpFields.Mutable fields1 = HttpFields.build(); fields1.put("X-Target", String.valueOf(connector1.getLocalPort())); MetaData.Request request1 = new MetaData.Request("GET", HttpURI.from("http://localhost/server1"), HttpVersion.HTTP_2, fields1); - FuturePromise streamPromise1 = new FuturePromise<>(); CountDownLatch latch1 = new CountDownLatch(1); - clientSession.newStream(new HeadersFrame(request1, null, false), streamPromise1, new Stream.Listener() + Stream stream1 = clientSession.newStream(new HeadersFrame(request1, null, false), new Stream.Listener() { + private final ByteBufferAggregator aggregator = new ByteBufferAggregator(client.getByteBufferPool(), true, data1.length, data1.length * 2); + @Override public void onHeaders(Stream stream, HeadersFrame frame) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("CLIENT received {}", frame); + LOGGER.debug("CLIENT1 received {}", frame); stream.demand(); } @@ -254,30 +261,35 @@ public void onDataAvailable(Stream stream) Stream.Data data = stream.readData(); DataFrame frame = data.frame(); if (LOGGER.isDebugEnabled()) - LOGGER.debug("CLIENT received {}", frame); - assertEquals(buffer1.slice(), frame.getByteBuffer()); + LOGGER.debug("CLIENT1 received {}", frame); + assertFalse(aggregator.aggregate(frame.getByteBuffer())); data.release(); - latch1.countDown(); if (!data.frame().isEndStream()) + { stream.demand(); + return; + } + RetainableByteBuffer buffer = aggregator.takeRetainableByteBuffer(); + assertNotNull(buffer); + assertEquals(buffer1.slice(), buffer.getByteBuffer()); + buffer.release(); + latch1.countDown(); } - }); - Stream stream1 = streamPromise1.get(5, TimeUnit.SECONDS); + }).get(5, TimeUnit.SECONDS); stream1.headers(new HeadersFrame(stream1.getId(), new MetaData(HttpVersion.HTTP_2, HttpFields.EMPTY), null, true), Callback.NOOP); // Send a request for server2. HttpFields.Mutable fields2 = HttpFields.build(); fields2.put("X-Target", String.valueOf(connector2.getLocalPort())); MetaData.Request request2 = new MetaData.Request("GET", HttpURI.from("http://localhost/server1"), HttpVersion.HTTP_2, fields2); - FuturePromise streamPromise2 = new FuturePromise<>(); CountDownLatch latch2 = new CountDownLatch(1); - clientSession.newStream(new HeadersFrame(request2, null, false), streamPromise2, new Stream.Listener() + Stream stream2 = clientSession.newStream(new HeadersFrame(request2, null, false), new Stream.Listener() { @Override public void onHeaders(Stream stream, HeadersFrame frame) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("CLIENT received {}", frame); + LOGGER.debug("CLIENT2 received {}", frame); if (frame.isEndStream()) latch2.countDown(); else @@ -289,13 +301,12 @@ public void onDataAvailable(Stream stream) { Stream.Data data = stream.readData(); if (LOGGER.isDebugEnabled()) - LOGGER.debug("CLIENT received {}", data.frame()); + LOGGER.debug("CLIENT2 received {}", data.frame()); data.release(); if (!data.frame().isEndStream()) stream.demand(); } - }); - Stream stream2 = streamPromise2.get(5, TimeUnit.SECONDS); + }).get(5, TimeUnit.SECONDS); stream2.data(new DataFrame(stream2.getId(), buffer1.slice(), true), Callback.NOOP); assertTrue(latch1.await(5, TimeUnit.SECONDS)); @@ -316,13 +327,13 @@ private ClientToProxySessionListener(HTTP2Client client) public Stream.Listener onNewStream(Stream stream, HeadersFrame frame) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("Received {} for {} on {}: {}", frame, stream, stream.getSession(), frame.getMetaData()); + LOGGER.debug("CP received {} for {} on {}: {}", frame, stream, stream.getSession(), frame.getMetaData()); // Forward to the right server. MetaData metaData = frame.getMetaData(); HttpFields fields = metaData.getHttpFields(); int port = Integer.parseInt(fields.get("X-Target")); ClientToProxyToServer clientToProxyToServer = forwarders.computeIfAbsent(port, p -> new ClientToProxyToServer("localhost", p, client)); - clientToProxyToServer.offer(stream, frame, Callback.NOOP); + clientToProxyToServer.offer(stream, frame, Callback.NOOP, true); stream.demand(); return clientToProxyToServer; } @@ -331,7 +342,7 @@ public Stream.Listener onNewStream(Stream stream, HeadersFrame frame) public void onClose(Session session, GoAwayFrame frame, Callback callback) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("Received {} on {}", frame, session); + LOGGER.debug("CP received {} on {}", frame, session); // TODO callback.succeeded(); } @@ -340,7 +351,7 @@ public void onClose(Session session, GoAwayFrame frame, Callback callback) public boolean onIdleTimeout(Session session) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("Idle timeout on {}", session); + LOGGER.debug("CP idle timeout on {}", session); // TODO return true; } @@ -349,7 +360,7 @@ public boolean onIdleTimeout(Session session) public void onFailure(Session session, Throwable failure, Callback callback) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("Failure on " + session, failure); + LOGGER.debug("CP failure on " + session, failure); // TODO callback.succeeded(); } @@ -360,10 +371,10 @@ private static class ClientToProxyToServer extends IteratingCallback implements private final AutoLock lock = new AutoLock(); private final Map> frames = new HashMap<>(); private final Map streams = new HashMap<>(); - private final ServerToProxyToClient serverToProxyToClient = new ServerToProxyToClient(); private final String host; private final int port; private final HTTP2Client client; + private final ServerToProxyToClient serverToProxyToClient; private Session proxyToServerSession; private FrameInfo frameInfo; private Stream clientToProxyStream; @@ -373,12 +384,13 @@ private ClientToProxyToServer(String host, int port, HTTP2Client client) this.host = host; this.port = port; this.client = client; + this.serverToProxyToClient = new ServerToProxyToClient(port); } - private void offer(Stream stream, Frame frame, Callback callback) + private void offer(Stream stream, Frame frame, Callback callback, boolean connect) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("CPS queueing {} for {} on {}", frame, stream, stream.getSession()); + LOGGER.debug("CPS:{} queueing (connect={}) {} for {} on {}", port, connect, frame, stream, stream.getSession()); boolean connected; try (AutoLock ignored = lock.lock()) { @@ -388,7 +400,7 @@ private void offer(Stream stream, Frame frame, Callback callback) } if (connected) iterate(); - else + else if (connect) connect(); } @@ -396,14 +408,14 @@ private void connect() { InetSocketAddress address = new InetSocketAddress(host, port); if (LOGGER.isDebugEnabled()) - LOGGER.debug("CPS connecting to {}", address); + LOGGER.debug("CPS:{} connecting to {}", port, address); client.connect(address, new ServerToProxySessionListener(), new Promise<>() { @Override public void succeeded(Session result) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("CPS connected to {} with {}", address, result); + LOGGER.debug("CPS:{} connected to {} with {}", port, address, result); try (AutoLock ignored = lock.lock()) { proxyToServerSession = result; @@ -415,14 +427,14 @@ public void succeeded(Session result) public void failed(Throwable x) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("CPS connect failed to {}", address); + LOGGER.debug("CPS:{} connect failed to {}", port, address); // TODO: drain the queue and fail the streams. } }); } @Override - protected Action process() throws Throwable + protected Action process() { Stream proxyToServerStream = null; Session proxyToServerSession = null; @@ -442,7 +454,7 @@ protected Action process() throws Throwable } if (LOGGER.isDebugEnabled()) - LOGGER.debug("CPS processing {} for {} to {}", frameInfo, clientToProxyStream, proxyToServerStream); + LOGGER.debug("CPS:{} processing {} for {} to {}", port, frameInfo, clientToProxyStream, proxyToServerStream); if (frameInfo == null) return Action.IDLE; @@ -459,7 +471,7 @@ public void succeeded(Stream result) try (AutoLock ignored = lock.lock()) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("CPS created {}", result); + LOGGER.debug("CPS:{} created {}", port, result); streams.put(clientToProxyStream, result); } serverToProxyToClient.link(result, clientToProxyStream); @@ -470,7 +482,7 @@ public void succeeded(Stream result) public void failed(Throwable failure) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("CPS create failed", failure); + LOGGER.debug("CPS:{} create failed", port, failure); // TODO: cannot open stream to server. ClientToProxyToServer.this.failed(failure); } @@ -480,7 +492,7 @@ public void failed(Throwable failure) else { if (LOGGER.isDebugEnabled()) - LOGGER.debug("CPS forwarding {} from {} to {}", frameInfo, clientToProxyStream, proxyToServerStream); + LOGGER.debug("CPS:{} forwarding {} from {} to {}", port, frameInfo, clientToProxyStream, proxyToServerStream); return switch (frameInfo.frame.getType()) { case HEADERS -> @@ -520,9 +532,10 @@ public void failed(Throwable failure) public void onHeaders(Stream stream, HeadersFrame frame) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("CPS received {} on {}", frame, stream); - offer(stream, frame, NOOP); - stream.demand(); + LOGGER.debug("CPS:{} received {} on {}", port, frame, stream); + offer(stream, frame, NOOP, false); + if (!frame.isEndStream()) + stream.demand(); } @Override @@ -537,8 +550,8 @@ public void onDataAvailable(Stream stream) { Stream.Data data = stream.readData(); if (LOGGER.isDebugEnabled()) - LOGGER.debug("CPS read {} on {}", data, stream); - offer(stream, data.frame(), Callback.from(data::release)); + LOGGER.debug("CPS:{} read {} on {}", port, data, stream); + offer(stream, data.frame(), Callback.from(data::release), false); if (!data.frame().isEndStream()) stream.demand(); } @@ -547,7 +560,7 @@ public void onDataAvailable(Stream stream) public void onReset(Stream stream, ResetFrame frame, Callback callback) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("CPS received {} on {}", frame, stream); + LOGGER.debug("CPS:{} received {} on {}", port, frame, stream); // TODO: drain the queue for that stream, and notify server. callback.succeeded(); } @@ -556,7 +569,7 @@ public void onReset(Stream stream, ResetFrame frame, Callback callback) public void onIdleTimeout(Stream stream, TimeoutException x, Promise promise) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("CPS idle timeout for {}", stream); + LOGGER.debug("CPS:{} idle timeout for {}", port, stream); // TODO: drain the queue for that stream, reset stream, and notify server. promise.succeeded(true); } @@ -568,7 +581,7 @@ private static class ServerToProxySessionListener implements Session.Listener public void onClose(Session session, GoAwayFrame frame, Callback callback) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("Received {} on {}", frame, session); + LOGGER.debug("SP received {} on {}", frame, session); // TODO callback.succeeded(); } @@ -577,7 +590,7 @@ public void onClose(Session session, GoAwayFrame frame, Callback callback) public boolean onIdleTimeout(Session session) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("Idle timeout on {}", session); + LOGGER.debug("SP idle timeout on {}", session); // TODO return true; } @@ -586,7 +599,7 @@ public boolean onIdleTimeout(Session session) public void onFailure(Session session, Throwable failure, Callback callback) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("Failure on " + session, failure); + LOGGER.debug("SP failure on " + session, failure); // TODO callback.succeeded(); } @@ -597,11 +610,17 @@ private static class ServerToProxyToClient extends IteratingCallback implements private final AutoLock lock = new AutoLock(); private final Map> frames = new HashMap<>(); private final Map streams = new HashMap<>(); + private final int port; private FrameInfo frameInfo; private Stream serverToProxyStream; + private ServerToProxyToClient(int port) + { + this.port = port; + } + @Override - protected Action process() throws Throwable + protected Action process() { Stream proxyToClientStream = null; try (AutoLock ignored = lock.lock()) @@ -619,7 +638,7 @@ protected Action process() throws Throwable } if (LOGGER.isDebugEnabled()) - LOGGER.debug("SPC processing {} for {} to {}", frameInfo, serverToProxyStream, proxyToClientStream); + LOGGER.debug("SPC:{} processing {} for {} to {}", port, frameInfo, serverToProxyStream, proxyToClientStream); // It may happen that we received a frame from the server, // but the proxyToClientStream is not linked yet. @@ -627,7 +646,7 @@ protected Action process() throws Throwable return Action.IDLE; if (LOGGER.isDebugEnabled()) - LOGGER.debug("SPC forwarding {} for {} to {}", frameInfo, serverToProxyStream, proxyToClientStream); + LOGGER.debug("SPC:{} forwarding {} for {} to {}", port, frameInfo, serverToProxyStream, proxyToClientStream); return switch (frameInfo.frame.getType()) { @@ -640,9 +659,9 @@ protected Action process() throws Throwable } case DATA -> { - DataFrame clientToProxyFrame = (DataFrame)frameInfo.frame; - DataFrame proxyToServerFrame = new DataFrame(serverToProxyStream.getId(), clientToProxyFrame.getByteBuffer(), clientToProxyFrame.isEndStream()); - proxyToClientStream.data(proxyToServerFrame, this); + DataFrame serverToProxyFrame = (DataFrame)frameInfo.frame; + DataFrame proxyToClientFrame = new DataFrame(proxyToClientStream.getId(), serverToProxyFrame.getByteBuffer(), serverToProxyFrame.isEndStream()); + proxyToClientStream.data(proxyToClientFrame, this); yield Action.SCHEDULED; } // TODO @@ -668,7 +687,7 @@ public void failed(Throwable failure) private void offer(Stream stream, Frame frame, Callback callback) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("SPC queueing {} for {} on {}", frame, stream, stream.getSession()); + LOGGER.debug("SPC:{} queueing {} for {} on {}", port, frame, stream, stream.getSession()); try (AutoLock ignored = lock.lock()) { Deque deque = frames.computeIfAbsent(stream, s -> new ArrayDeque<>()); @@ -681,16 +700,17 @@ private void offer(Stream stream, Frame frame, Callback callback) public void onHeaders(Stream stream, HeadersFrame frame) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("SPC received {} on {}", frame, stream); + LOGGER.debug("SPC:{} received {} on {}", port, frame, stream); offer(stream, frame, NOOP); - stream.demand(); + if (!frame.isEndStream()) + stream.demand(); } @Override public Stream.Listener onPush(Stream stream, PushPromiseFrame frame) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("SPC received {} on {}", frame, stream); + LOGGER.debug("SPC:{} received {} on {}", port, frame, stream); // TODO return null; } @@ -700,7 +720,7 @@ public void onDataAvailable(Stream stream) { Stream.Data data = stream.readData(); if (LOGGER.isDebugEnabled()) - LOGGER.debug("SPC read {} on {}", data, stream); + LOGGER.debug("SPC:{} read {} on {}", port, data, stream); offer(stream, data.frame(), Callback.from(data::release)); if (!data.frame().isEndStream()) stream.demand(); @@ -710,7 +730,7 @@ public void onDataAvailable(Stream stream) public void onReset(Stream stream, ResetFrame frame, Callback callback) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("SPC received {} on {}", frame, stream); + LOGGER.debug("SPC:{} received {} on {}", port, frame, stream); // TODO: drain queue, reset client stream. callback.succeeded(); } @@ -719,7 +739,7 @@ public void onReset(Stream stream, ResetFrame frame, Callback callback) public void onIdleTimeout(Stream stream, TimeoutException x, Promise promise) { if (LOGGER.isDebugEnabled()) - LOGGER.debug("SPC idle timeout for {}", stream); + LOGGER.debug("SPC:{} idle timeout for {}", port, stream); // TODO: promise.succeeded(true); } diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/SettingsTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/SettingsTest.java index 8a1033b957c5..ac461de250c3 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/SettingsTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/SettingsTest.java @@ -261,7 +261,7 @@ public Stream.Listener onNewStream(Stream stream, HeadersFrame frame) MetaData.Request push = newRequest("GET", "/push", HttpFields.EMPTY); try { - s.push(new PushPromiseFrame(s.getId(), push), new Stream.Listener() {}); + s.push(new PushPromiseFrame(s.getId(), push), Stream.Listener.AUTO_DISCARD); } catch (IllegalStateException x) { @@ -359,7 +359,7 @@ public void onFailure(Session session, Throwable failure, Callback callback) MetaData.Request request = newRequest("GET", HttpFields.EMPTY); HeadersFrame frame = new HeadersFrame(request, null, true); - clientSession.newStream(frame, new Stream.Listener() {}); + clientSession.newStream(frame, Stream.Listener.AUTO_DISCARD); Assertions.assertTrue(clientFailureLatch.await(5, TimeUnit.SECONDS)); } diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/resources/jetty-logging.properties b/jetty-core/jetty-http2/jetty-http2-tests/src/test/resources/jetty-logging.properties index 0e6467e2dcf6..2873bf36dc79 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/resources/jetty-logging.properties +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/resources/jetty-logging.properties @@ -1,4 +1,5 @@ #org.eclipse.jetty.LEVEL=DEBUG #org.eclipse.jetty.client.LEVEL=DEBUG #org.eclipse.jetty.http2.LEVEL=DEBUG +#org.eclipse.jetty.http2.tests.LEVEL=DEBUG org.eclipse.jetty.http2.hpack.LEVEL=INFO From c41509950b0d04292530114fb1aa4c40a50c4282 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Sat, 7 Oct 2023 15:14:23 +0200 Subject: [PATCH 15/31] Fixes #10657 - jetty-http-tools-12.0.1.jar is not well-formed Added Maven property . Signed-off-by: Simone Bordet --- jetty-core/jetty-http-tools/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jetty-core/jetty-http-tools/pom.xml b/jetty-core/jetty-http-tools/pom.xml index 88976097cc66..31741f2055fc 100644 --- a/jetty-core/jetty-http-tools/pom.xml +++ b/jetty-core/jetty-http-tools/pom.xml @@ -10,6 +10,10 @@ jetty-http-tools Core :: HTTP Tools + + ${project.groupId}.http.tools + + org.eclipse.jetty From dbb94514dc9d3fb21fe92080f57c314e7e06a148 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Mon, 9 Oct 2023 15:07:52 +0200 Subject: [PATCH 16/31] Fixes #10679 - Review HTTP/2 rate control. (#10681) * Bumped the rate control rate from 50 events/s to 128. * Added rate control for all CONTINUATION frames. * Added rate control for invalid PUSH_PROMISE frames. * Added rate control for RST_STREAM frames. * Added rate control for all SETTINGS frames. * Fixed growth of header block accumulation buffer. Signed-off-by: Simone Bordet --- .../jetty/http2/parser/BodyParser.java | 2 +- .../http2/parser/ContinuationBodyParser.java | 36 +++++++++---- .../http2/parser/HeaderBlockFragments.java | 35 ++++++++++--- .../jetty/http2/parser/HeadersBodyParser.java | 41 +++++++++++---- .../eclipse/jetty/http2/parser/Parser.java | 2 +- .../http2/parser/PushPromiseBodyParser.java | 13 +++-- .../jetty/http2/parser/ResetBodyParser.java | 8 +-- .../http2/parser/SettingsBodyParser.java | 11 ++-- .../jetty/http2/parser/UnknownBodyParser.java | 1 - .../http2/frames/ContinuationParseTest.java | 50 +++++++++++++++++++ .../jetty/http2/frames/FrameFloodTest.java | 31 ++++++++++-- .../AbstractHTTP2ServerConnectionFactory.java | 2 +- 12 files changed, 184 insertions(+), 48 deletions(-) diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/BodyParser.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/BodyParser.java index 3438ec5da81a..02da72d84840 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/BodyParser.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/BodyParser.java @@ -39,7 +39,7 @@ */ public abstract class BodyParser { - protected static final Logger LOG = LoggerFactory.getLogger(BodyParser.class); + private static final Logger LOG = LoggerFactory.getLogger(BodyParser.class); private final HeaderParser headerParser; private final Parser.Listener listener; diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/ContinuationBodyParser.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/ContinuationBodyParser.java index 60e5805b6101..0a4cfce519bd 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/ContinuationBodyParser.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/ContinuationBodyParser.java @@ -75,16 +75,28 @@ public boolean parse(ByteBuffer buffer) int remaining = buffer.remaining(); if (remaining < length) { - headerBlockFragments.storeFragment(buffer, remaining, false); + ContinuationFrame frame = new ContinuationFrame(getStreamId(), false); + if (!rateControlOnEvent(frame)) + return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_continuation_frame_rate"); + + if (!headerBlockFragments.storeFragment(buffer, remaining, false)) + return connectionFailure(buffer, ErrorCode.PROTOCOL_ERROR.code, "invalid_continuation_stream"); + length -= remaining; break; } else { - boolean last = hasFlag(Flags.END_HEADERS); - headerBlockFragments.storeFragment(buffer, length, last); + boolean endHeaders = hasFlag(Flags.END_HEADERS); + ContinuationFrame frame = new ContinuationFrame(getStreamId(), endHeaders); + if (!rateControlOnEvent(frame)) + return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_continuation_frame_rate"); + + if (!headerBlockFragments.storeFragment(buffer, length, endHeaders)) + return connectionFailure(buffer, ErrorCode.PROTOCOL_ERROR.code, "invalid_continuation_stream"); + reset(); - if (last) + if (endHeaders) return onHeaders(buffer); return true; } @@ -103,17 +115,21 @@ private boolean onHeaders(ByteBuffer buffer) ByteBuffer headerBlock = headerBlockFragments.complete(); MetaData metaData = headerBlockParser.parse(headerBlock, headerBlock.remaining()); headerBlockFragments.getByteBufferPool().release(headerBlock); - if (metaData == null) - return true; + HeadersFrame frame = new HeadersFrame(getStreamId(), metaData, headerBlockFragments.getPriorityFrame(), headerBlockFragments.isEndStream()); + headerBlockFragments.reset(); + if (metaData == HeaderBlockParser.SESSION_FAILURE) return false; - HeadersFrame frame = new HeadersFrame(getStreamId(), metaData, headerBlockFragments.getPriorityFrame(), headerBlockFragments.isEndStream()); - if (metaData == HeaderBlockParser.STREAM_FAILURE) + + if (metaData != HeaderBlockParser.STREAM_FAILURE) + { + notifyHeaders(frame); + } + else { if (!rateControlOnEvent(frame)) - return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_continuation_frame_rate"); + return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_headers_frame_rate"); } - notifyHeaders(frame); return true; } diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderBlockFragments.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderBlockFragments.java index 3de5c78555d7..6f6947247052 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderBlockFragments.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderBlockFragments.java @@ -21,14 +21,22 @@ public class HeaderBlockFragments { private final ByteBufferPool byteBufferPool; + private final int maxCapacity; private PriorityFrame priorityFrame; - private boolean endStream; private int streamId; + private boolean endStream; private ByteBuffer storage; + @Deprecated public HeaderBlockFragments(ByteBufferPool byteBufferPool) + { + this(byteBufferPool, 8192); + } + + public HeaderBlockFragments(ByteBufferPool byteBufferPool, int maxCapacity) { this.byteBufferPool = byteBufferPool; + this.maxCapacity = maxCapacity; } public ByteBufferPool getByteBufferPool() @@ -36,18 +44,30 @@ public ByteBufferPool getByteBufferPool() return byteBufferPool; } - public void storeFragment(ByteBuffer fragment, int length, boolean last) + void reset() + { + priorityFrame = null; + streamId = 0; + endStream = false; + storage = null; + } + + public boolean storeFragment(ByteBuffer fragment, int length, boolean last) { if (storage == null) { - int space = last ? length : length * 2; - storage = byteBufferPool.acquire(space, fragment.isDirect()); + if (length > maxCapacity) + return false; + int capacity = last ? length : length * 2; + storage = byteBufferPool.acquire(capacity, fragment.isDirect()); storage.clear(); } // Grow the storage if necessary. if (storage.remaining() < length) { + if (storage.position() + length > maxCapacity) + return false; int space = last ? length : length * 2; int capacity = storage.position() + space; ByteBuffer newStorage = byteBufferPool.acquire(capacity, storage.isDirect()); @@ -63,6 +83,7 @@ public void storeFragment(ByteBuffer fragment, int length, boolean last) fragment.limit(fragment.position() + length); storage.put(fragment); fragment.limit(limit); + return true; } public PriorityFrame getPriorityFrame() @@ -87,10 +108,8 @@ public void setEndStream(boolean endStream) public ByteBuffer complete() { - ByteBuffer result = storage; - storage = null; - result.flip(); - return result; + storage.flip(); + return storage; } public int getStreamId() diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeadersBodyParser.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeadersBodyParser.java index fbd4a0c50686..e63b6d5a6f5e 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeadersBodyParser.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeadersBodyParser.java @@ -22,9 +22,13 @@ import org.eclipse.jetty.http2.frames.HeadersFrame; import org.eclipse.jetty.http2.frames.PriorityFrame; import org.eclipse.jetty.util.BufferUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HeadersBodyParser extends BodyParser { + private static final Logger LOG = LoggerFactory.getLogger(HeadersBodyParser.class); + private final HeaderBlockParser headerBlockParser; private final HeaderBlockFragments headerBlockFragments; private State state = State.PREPARE; @@ -71,8 +75,15 @@ else if (hasFlag(Flags.END_HEADERS)) } else { - headerBlockFragments.setStreamId(getStreamId()); - headerBlockFragments.setEndStream(isEndStream()); + if (headerBlockFragments.getStreamId() != 0) + { + connectionFailure(buffer, ErrorCode.PROTOCOL_ERROR.code, "invalid_headers_frame"); + } + else + { + headerBlockFragments.setStreamId(getStreamId()); + headerBlockFragments.setEndStream(isEndStream()); + } } } @@ -167,6 +178,18 @@ else if (hasFlag(Flags.PRIORITY)) break; } case HEADERS: + { + if (!hasFlag(Flags.END_HEADERS)) + { + headerBlockFragments.setStreamId(getStreamId()); + headerBlockFragments.setEndStream(isEndStream()); + if (hasFlag(Flags.PRIORITY)) + headerBlockFragments.setPriorityFrame(new PriorityFrame(getStreamId(), parentStreamId, weight, exclusive)); + } + state = State.HEADER_BLOCK; + break; + } + case HEADER_BLOCK: { if (hasFlag(Flags.END_HEADERS)) { @@ -191,7 +214,7 @@ else if (hasFlag(Flags.PRIORITY)) { HeadersFrame frame = new HeadersFrame(getStreamId(), metaData, null, isEndStream()); if (!rateControlOnEvent(frame)) - connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_headers_frame_rate"); + return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_headers_frame_rate"); } } } @@ -200,16 +223,14 @@ else if (hasFlag(Flags.PRIORITY)) int remaining = buffer.remaining(); if (remaining < length) { - headerBlockFragments.storeFragment(buffer, remaining, false); + if (!headerBlockFragments.storeFragment(buffer, remaining, false)) + return connectionFailure(buffer, ErrorCode.PROTOCOL_ERROR.code, "invalid_headers_frame"); length -= remaining; } else { - headerBlockFragments.setStreamId(getStreamId()); - headerBlockFragments.setEndStream(isEndStream()); - if (hasFlag(Flags.PRIORITY)) - headerBlockFragments.setPriorityFrame(new PriorityFrame(getStreamId(), parentStreamId, weight, exclusive)); - headerBlockFragments.storeFragment(buffer, length, false); + if (!headerBlockFragments.storeFragment(buffer, length, false)) + return connectionFailure(buffer, ErrorCode.PROTOCOL_ERROR.code, "invalid_headers_frame"); state = State.PADDING; loop = paddingLength == 0; } @@ -253,6 +274,6 @@ private void onHeaders(HeadersFrame frame) private enum State { - PREPARE, PADDING_LENGTH, EXCLUSIVE, PARENT_STREAM_ID, PARENT_STREAM_ID_BYTES, WEIGHT, HEADERS, PADDING + PREPARE, PADDING_LENGTH, EXCLUSIVE, PARENT_STREAM_ID, PARENT_STREAM_ID_BYTES, WEIGHT, HEADERS, HEADER_BLOCK, PADDING } } diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java index fcae69d7d147..e43be18e6e4a 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java @@ -85,7 +85,7 @@ public void init(Listener listener) this.listener = listener; unknownBodyParser = new UnknownBodyParser(headerParser, listener); HeaderBlockParser headerBlockParser = new HeaderBlockParser(headerParser, byteBufferPool, hpackDecoder, unknownBodyParser); - HeaderBlockFragments headerBlockFragments = new HeaderBlockFragments(byteBufferPool); + HeaderBlockFragments headerBlockFragments = new HeaderBlockFragments(byteBufferPool, hpackDecoder.getMaxHeaderListSize()); bodyParsers[FrameType.DATA.getType()] = new DataBodyParser(headerParser, listener); bodyParsers[FrameType.HEADERS.getType()] = new HeadersBodyParser(headerParser, listener, headerBlockParser, headerBlockFragments); bodyParsers[FrameType.PRIORITY.getType()] = new PriorityBodyParser(headerParser, listener); diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/PushPromiseBodyParser.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/PushPromiseBodyParser.java index b1f2d8a5bac4..fa41e4a0b63b 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/PushPromiseBodyParser.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/PushPromiseBodyParser.java @@ -18,6 +18,7 @@ import org.eclipse.jetty.http.MetaData; import org.eclipse.jetty.http2.ErrorCode; import org.eclipse.jetty.http2.Flags; +import org.eclipse.jetty.http2.frames.HeadersFrame; import org.eclipse.jetty.http2.frames.PushPromiseFrame; public class PushPromiseBodyParser extends BodyParser @@ -65,13 +66,9 @@ public boolean parse(ByteBuffer buffer) length = getBodyLength(); if (isPadding()) - { state = State.PADDING_LENGTH; - } else - { state = State.STREAM_ID; - } break; } case PADDING_LENGTH: @@ -131,7 +128,15 @@ public boolean parse(ByteBuffer buffer) state = State.PADDING; loop = paddingLength == 0; if (metaData != HeaderBlockParser.STREAM_FAILURE) + { onPushPromise(streamId, metaData); + } + else + { + HeadersFrame frame = new HeadersFrame(getStreamId(), metaData, null, isEndStream()); + if (!rateControlOnEvent(frame)) + return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_headers_frame_rate"); + } } break; } diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/ResetBodyParser.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/ResetBodyParser.java index 937dfc387a72..fd5b640488fb 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/ResetBodyParser.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/ResetBodyParser.java @@ -58,7 +58,7 @@ public boolean parse(ByteBuffer buffer) { if (buffer.remaining() >= 4) { - return onReset(buffer.getInt()); + return onReset(buffer, buffer.getInt()); } else { @@ -73,7 +73,7 @@ public boolean parse(ByteBuffer buffer) --cursor; error += currByte << (8 * cursor); if (cursor == 0) - return onReset(error); + return onReset(buffer, error); break; } default: @@ -85,9 +85,11 @@ public boolean parse(ByteBuffer buffer) return false; } - private boolean onReset(int error) + private boolean onReset(ByteBuffer buffer, int error) { ResetFrame frame = new ResetFrame(getStreamId(), error); + if (!rateControlOnEvent(frame)) + return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_rst_stream_frame_rate"); reset(); notifyReset(frame); return true; diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/SettingsBodyParser.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/SettingsBodyParser.java index 99d914a07d7a..e2516f0c5490 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/SettingsBodyParser.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/SettingsBodyParser.java @@ -72,10 +72,7 @@ protected void emptyBody(ByteBuffer buffer) return; boolean isReply = hasFlag(Flags.ACK); SettingsFrame frame = new SettingsFrame(Collections.emptyMap(), isReply); - if (!isReply && !rateControlOnEvent(frame)) - connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_settings_frame_rate"); - else - onSettings(frame); + onSettings(buffer, frame); } private boolean validateFrame(ByteBuffer buffer, int streamId, int bodyLength) @@ -218,11 +215,13 @@ protected boolean onSettings(ByteBuffer buffer, Map settings) return connectionFailure(buffer, ErrorCode.PROTOCOL_ERROR.code, "invalid_settings_max_frame_size"); SettingsFrame frame = new SettingsFrame(settings, hasFlag(Flags.ACK)); - return onSettings(frame); + return onSettings(buffer, frame); } - private boolean onSettings(SettingsFrame frame) + private boolean onSettings(ByteBuffer buffer, SettingsFrame frame) { + if (!rateControlOnEvent(frame)) + return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_settings_frame_rate"); reset(); notifySettings(frame); return true; diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/UnknownBodyParser.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/UnknownBodyParser.java index 97aebcb90104..fb1b9707fd01 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/UnknownBodyParser.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/UnknownBodyParser.java @@ -35,7 +35,6 @@ public boolean parse(ByteBuffer buffer) boolean parsed = cursor == 0; if (parsed && !rateControlOnEvent(new UnknownFrame(getFrameType()))) return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_unknown_frame_rate"); - return parsed; } diff --git a/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/ContinuationParseTest.java b/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/ContinuationParseTest.java index b4604bc4c8d6..4443893c2669 100644 --- a/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/ContinuationParseTest.java +++ b/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/ContinuationParseTest.java @@ -16,6 +16,7 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; import org.eclipse.jetty.http.HostPortHttpField; import org.eclipse.jetty.http.HttpField; @@ -32,6 +33,8 @@ import org.eclipse.jetty.io.MappedByteBufferPool; import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -154,4 +157,51 @@ public void onConnectionFailure(int error, String reason) assertNull(priority); } } + + @Test + public void testLargeHeadersBlock() throws Exception + { + // Use a ByteBufferPool with a small factor, so that the accumulation buffer is not too large. + ByteBufferPool byteBufferPool = new MappedByteBufferPool(128); + // A small max headers size, used for both accumulation and decoding. + int maxHeadersSize = 512; + Parser parser = new Parser(byteBufferPool, maxHeadersSize); + // Specify headers block size to generate CONTINUATION frames. + int maxHeadersBlockFragment = 128; + HeadersGenerator generator = new HeadersGenerator(new HeaderGenerator(), new HpackEncoder(), maxHeadersBlockFragment); + + int streamId = 13; + HttpFields fields = HttpFields.build() + .put("Accept", "text/html") + // Large header that generates a large headers block. + .put("User-Agent", "Jetty".repeat(256)); + MetaData.Request metaData = new MetaData.Request("GET", HttpScheme.HTTP.asString(), new HostPortHttpField("localhost:8080"), "/path", HttpVersion.HTTP_2, fields, -1); + + ByteBufferPool.Lease lease = new ByteBufferPool.Lease(byteBufferPool); + generator.generateHeaders(lease, streamId, metaData, null, true); + List byteBuffers = lease.getByteBuffers(); + assertThat(byteBuffers.stream().mapToInt(ByteBuffer::remaining).sum(), greaterThan(maxHeadersSize)); + + AtomicBoolean failed = new AtomicBoolean(); + parser.init(new Parser.Listener.Adapter() + { + @Override + public void onConnectionFailure(int error, String reason) + { + failed.set(true); + } + }); + // Set a large max headers size for decoding, to ensure + // the failure is due to accumulation, not decoding. + parser.getHpackDecoder().setMaxHeaderListSize(10 * maxHeadersSize); + + for (ByteBuffer byteBuffer : byteBuffers) + { + parser.parse(byteBuffer); + if (failed.get()) + break; + } + + assertTrue(failed.get()); + } } diff --git a/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/FrameFloodTest.java b/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/FrameFloodTest.java index a5d51fc05cb2..adf3c07c666c 100644 --- a/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/FrameFloodTest.java +++ b/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/FrameFloodTest.java @@ -89,21 +89,29 @@ public void testPriorityFrameFlood() } @Test - public void testSettingsFrameFlood() + public void testEmptySettingsFrameFlood() { byte[] payload = new byte[0]; testFrameFlood(null, frameFrom(payload.length, FrameType.SETTINGS.getType(), 0, 0, payload)); } + @Test + public void testSettingsFrameFlood() + { + // | Key0 | Key1 | Value0 | Value1 | Value2 | Value3 | + byte[] payload = new byte[]{0, 8, 0, 0, 0, 1}; + testFrameFlood(null, frameFrom(payload.length, FrameType.SETTINGS.getType(), 0, 0, payload)); + } + @Test public void testPingFrameFlood() { byte[] payload = {0, 0, 0, 0, 0, 0, 0, 0}; testFrameFlood(null, frameFrom(payload.length, FrameType.PING.getType(), 0, 0, payload)); } - + @Test - public void testContinuationFrameFlood() + public void testEmptyContinuationFrameFlood() { int streamId = 13; byte[] headersPayload = new byte[0]; @@ -112,6 +120,23 @@ public void testContinuationFrameFlood() testFrameFlood(headersBytes, frameFrom(continuationPayload.length, FrameType.CONTINUATION.getType(), 0, streamId, continuationPayload)); } + @Test + public void testContinuationFrameFlood() + { + int streamId = 13; + byte[] headersPayload = new byte[0]; + byte[] headersBytes = frameFrom(headersPayload.length, FrameType.HEADERS.getType(), 0, streamId, headersPayload); + byte[] continuationPayload = new byte[1]; + testFrameFlood(headersBytes, frameFrom(continuationPayload.length, FrameType.CONTINUATION.getType(), 0, streamId, continuationPayload)); + } + + @Test + public void testResetStreamFrameFlood() + { + byte[] payload = {0, 0, 0, 0}; + testFrameFlood(null, frameFrom(payload.length, FrameType.RST_STREAM.getType(), 0, 13, payload)); + } + @Test public void testUnknownFrameFlood() { diff --git a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/AbstractHTTP2ServerConnectionFactory.java b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/AbstractHTTP2ServerConnectionFactory.java index b3deebbf1806..64e2f36d9458 100644 --- a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/AbstractHTTP2ServerConnectionFactory.java +++ b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/AbstractHTTP2ServerConnectionFactory.java @@ -63,7 +63,7 @@ public abstract class AbstractHTTP2ServerConnectionFactory extends AbstractConne private int maxFrameSize = Frame.DEFAULT_MAX_LENGTH; private int maxSettingsKeys = SettingsFrame.DEFAULT_MAX_KEYS; private boolean connectProtocolEnabled = true; - private RateControl.Factory rateControlFactory = new WindowRateControl.Factory(50); + private RateControl.Factory rateControlFactory = new WindowRateControl.Factory(128); private FlowControlStrategy.Factory flowControlStrategyFactory = () -> new BufferingFlowControlStrategy(0.5F); private long streamIdleTimeout; private boolean useInputDirectByteBuffers; From 7bd6c5211d617b1b957acd08320933c9bd2ab2d8 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Mon, 9 Oct 2023 15:19:00 +0200 Subject: [PATCH 17/31] Fixes #10679 - Review HTTP/2 rate control. (#10682) * Bumped the rate control rate from 50 events/s to 128. * Added rate control for all CONTINUATION frames. * Added rate control for invalid PUSH_PROMISE frames. * Added rate control for RST_STREAM frames. * Added rate control for all SETTINGS frames. * Fixed growth of header block accumulation buffer. Signed-off-by: Simone Bordet --- .../http2/parser/ContinuationBodyParser.java | 36 ++++++++---- .../http2/parser/HeaderBlockFragments.java | 31 +++++++--- .../jetty/http2/parser/HeadersBodyParser.java | 37 ++++++++---- .../eclipse/jetty/http2/parser/Parser.java | 2 +- .../http2/parser/PushPromiseBodyParser.java | 13 +++-- .../jetty/http2/parser/ResetBodyParser.java | 8 ++- .../http2/parser/SettingsBodyParser.java | 11 ++-- .../jetty/http2/parser/UnknownBodyParser.java | 1 - .../http2/frames/ContinuationParseTest.java | 56 ++++++++++++++++++- .../jetty/http2/frames/FrameFloodTest.java | 31 +++++++++- .../AbstractHTTP2ServerConnectionFactory.java | 2 +- 11 files changed, 179 insertions(+), 49 deletions(-) diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/ContinuationBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/ContinuationBodyParser.java index f069ea4a5d41..3a801aea21f0 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/ContinuationBodyParser.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/ContinuationBodyParser.java @@ -76,16 +76,28 @@ public boolean parse(ByteBuffer buffer) int remaining = buffer.remaining(); if (remaining < length) { - headerBlockFragments.storeFragment(buffer, remaining, false); + ContinuationFrame frame = new ContinuationFrame(getStreamId(), false); + if (!rateControlOnEvent(frame)) + return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_continuation_frame_rate"); + + if (!headerBlockFragments.storeFragment(buffer, remaining, false)) + return connectionFailure(buffer, ErrorCode.PROTOCOL_ERROR.code, "invalid_continuation_stream"); + length -= remaining; break; } else { - boolean last = hasFlag(Flags.END_HEADERS); - headerBlockFragments.storeFragment(buffer, length, last); + boolean endHeaders = hasFlag(Flags.END_HEADERS); + ContinuationFrame frame = new ContinuationFrame(getStreamId(), endHeaders); + if (!rateControlOnEvent(frame)) + return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_continuation_frame_rate"); + + if (!headerBlockFragments.storeFragment(buffer, length, endHeaders)) + return connectionFailure(buffer, ErrorCode.PROTOCOL_ERROR.code, "invalid_continuation_stream"); + reset(); - if (last) + if (endHeaders) return onHeaders(buffer); return true; } @@ -104,17 +116,21 @@ private boolean onHeaders(ByteBuffer buffer) RetainableByteBuffer headerBlock = headerBlockFragments.complete(); MetaData metaData = headerBlockParser.parse(headerBlock.getByteBuffer(), headerBlock.remaining()); headerBlock.release(); - if (metaData == null) - return true; + HeadersFrame frame = new HeadersFrame(getStreamId(), metaData, headerBlockFragments.getPriorityFrame(), headerBlockFragments.isEndStream()); + headerBlockFragments.reset(); + if (metaData == HeaderBlockParser.SESSION_FAILURE) return false; - HeadersFrame frame = new HeadersFrame(getStreamId(), metaData, headerBlockFragments.getPriorityFrame(), headerBlockFragments.isEndStream()); - if (metaData == HeaderBlockParser.STREAM_FAILURE) + + if (metaData != HeaderBlockParser.STREAM_FAILURE) + { + notifyHeaders(frame); + } + else { if (!rateControlOnEvent(frame)) - return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_continuation_frame_rate"); + return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_headers_frame_rate"); } - notifyHeaders(frame); return true; } diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderBlockFragments.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderBlockFragments.java index 9d098c0f8449..f9c76773dde0 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderBlockFragments.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderBlockFragments.java @@ -23,22 +23,34 @@ public class HeaderBlockFragments { private final ByteBufferPool bufferPool; + private final int maxCapacity; private PriorityFrame priorityFrame; - private boolean endStream; private int streamId; + private boolean endStream; private RetainableByteBuffer storage; - public HeaderBlockFragments(ByteBufferPool bufferPool) + public HeaderBlockFragments(ByteBufferPool bufferPool, int maxCapacity) { this.bufferPool = bufferPool; + this.maxCapacity = maxCapacity; + } + + void reset() + { + priorityFrame = null; + streamId = 0; + endStream = false; + storage = null; } - public void storeFragment(ByteBuffer fragment, int length, boolean last) + public boolean storeFragment(ByteBuffer fragment, int length, boolean last) { if (storage == null) { - int space = last ? length : length * 2; - storage = bufferPool.acquire(space, fragment.isDirect()); + if (length > maxCapacity) + return false; + int capacity = last ? length : length * 2; + storage = bufferPool.acquire(capacity, fragment.isDirect()); BufferUtil.flipToFill(storage.getByteBuffer()); } @@ -46,6 +58,8 @@ public void storeFragment(ByteBuffer fragment, int length, boolean last) if (storage.remaining() < length) { ByteBuffer byteBuffer = storage.getByteBuffer(); + if (byteBuffer.position() + length > maxCapacity) + return false; int space = last ? length : length * 2; int capacity = byteBuffer.position() + space; RetainableByteBuffer newStorage = bufferPool.acquire(capacity, storage.isDirect()); @@ -61,6 +75,7 @@ public void storeFragment(ByteBuffer fragment, int length, boolean last) fragment.limit(fragment.position() + length); storage.getByteBuffer().put(fragment); fragment.limit(limit); + return true; } public PriorityFrame getPriorityFrame() @@ -85,10 +100,8 @@ public void setEndStream(boolean endStream) public RetainableByteBuffer complete() { - RetainableByteBuffer result = storage; - storage = null; - result.getByteBuffer().flip(); - return result; + storage.getByteBuffer().flip(); + return storage; } public int getStreamId() diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeadersBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeadersBodyParser.java index e4bda6471ee1..e63b6d5a6f5e 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeadersBodyParser.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeadersBodyParser.java @@ -75,8 +75,15 @@ else if (hasFlag(Flags.END_HEADERS)) } else { - headerBlockFragments.setStreamId(getStreamId()); - headerBlockFragments.setEndStream(isEndStream()); + if (headerBlockFragments.getStreamId() != 0) + { + connectionFailure(buffer, ErrorCode.PROTOCOL_ERROR.code, "invalid_headers_frame"); + } + else + { + headerBlockFragments.setStreamId(getStreamId()); + headerBlockFragments.setEndStream(isEndStream()); + } } } @@ -171,6 +178,18 @@ else if (hasFlag(Flags.PRIORITY)) break; } case HEADERS: + { + if (!hasFlag(Flags.END_HEADERS)) + { + headerBlockFragments.setStreamId(getStreamId()); + headerBlockFragments.setEndStream(isEndStream()); + if (hasFlag(Flags.PRIORITY)) + headerBlockFragments.setPriorityFrame(new PriorityFrame(getStreamId(), parentStreamId, weight, exclusive)); + } + state = State.HEADER_BLOCK; + break; + } + case HEADER_BLOCK: { if (hasFlag(Flags.END_HEADERS)) { @@ -195,7 +214,7 @@ else if (hasFlag(Flags.PRIORITY)) { HeadersFrame frame = new HeadersFrame(getStreamId(), metaData, null, isEndStream()); if (!rateControlOnEvent(frame)) - connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_headers_frame_rate"); + return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_headers_frame_rate"); } } } @@ -204,16 +223,14 @@ else if (hasFlag(Flags.PRIORITY)) int remaining = buffer.remaining(); if (remaining < length) { - headerBlockFragments.storeFragment(buffer, remaining, false); + if (!headerBlockFragments.storeFragment(buffer, remaining, false)) + return connectionFailure(buffer, ErrorCode.PROTOCOL_ERROR.code, "invalid_headers_frame"); length -= remaining; } else { - headerBlockFragments.setStreamId(getStreamId()); - headerBlockFragments.setEndStream(isEndStream()); - if (hasFlag(Flags.PRIORITY)) - headerBlockFragments.setPriorityFrame(new PriorityFrame(getStreamId(), parentStreamId, weight, exclusive)); - headerBlockFragments.storeFragment(buffer, length, false); + if (!headerBlockFragments.storeFragment(buffer, length, false)) + return connectionFailure(buffer, ErrorCode.PROTOCOL_ERROR.code, "invalid_headers_frame"); state = State.PADDING; loop = paddingLength == 0; } @@ -257,6 +274,6 @@ private void onHeaders(HeadersFrame frame) private enum State { - PREPARE, PADDING_LENGTH, EXCLUSIVE, PARENT_STREAM_ID, PARENT_STREAM_ID_BYTES, WEIGHT, HEADERS, PADDING + PREPARE, PADDING_LENGTH, EXCLUSIVE, PARENT_STREAM_ID, PARENT_STREAM_ID_BYTES, WEIGHT, HEADERS, HEADER_BLOCK, PADDING } } diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java index 5c8aba5ce335..de213165d209 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java @@ -74,7 +74,7 @@ public void init(Listener listener) this.listener = listener; unknownBodyParser = new UnknownBodyParser(headerParser, listener); HeaderBlockParser headerBlockParser = new HeaderBlockParser(headerParser, bufferPool, hpackDecoder, unknownBodyParser); - HeaderBlockFragments headerBlockFragments = new HeaderBlockFragments(bufferPool); + HeaderBlockFragments headerBlockFragments = new HeaderBlockFragments(bufferPool, hpackDecoder.getMaxHeaderListSize()); bodyParsers[FrameType.DATA.getType()] = new DataBodyParser(headerParser, listener); bodyParsers[FrameType.HEADERS.getType()] = new HeadersBodyParser(headerParser, listener, headerBlockParser, headerBlockFragments); bodyParsers[FrameType.PRIORITY.getType()] = new PriorityBodyParser(headerParser, listener); diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/PushPromiseBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/PushPromiseBodyParser.java index b1f2d8a5bac4..fa41e4a0b63b 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/PushPromiseBodyParser.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/PushPromiseBodyParser.java @@ -18,6 +18,7 @@ import org.eclipse.jetty.http.MetaData; import org.eclipse.jetty.http2.ErrorCode; import org.eclipse.jetty.http2.Flags; +import org.eclipse.jetty.http2.frames.HeadersFrame; import org.eclipse.jetty.http2.frames.PushPromiseFrame; public class PushPromiseBodyParser extends BodyParser @@ -65,13 +66,9 @@ public boolean parse(ByteBuffer buffer) length = getBodyLength(); if (isPadding()) - { state = State.PADDING_LENGTH; - } else - { state = State.STREAM_ID; - } break; } case PADDING_LENGTH: @@ -131,7 +128,15 @@ public boolean parse(ByteBuffer buffer) state = State.PADDING; loop = paddingLength == 0; if (metaData != HeaderBlockParser.STREAM_FAILURE) + { onPushPromise(streamId, metaData); + } + else + { + HeadersFrame frame = new HeadersFrame(getStreamId(), metaData, null, isEndStream()); + if (!rateControlOnEvent(frame)) + return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_headers_frame_rate"); + } } break; } diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/ResetBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/ResetBodyParser.java index 937dfc387a72..fd5b640488fb 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/ResetBodyParser.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/ResetBodyParser.java @@ -58,7 +58,7 @@ public boolean parse(ByteBuffer buffer) { if (buffer.remaining() >= 4) { - return onReset(buffer.getInt()); + return onReset(buffer, buffer.getInt()); } else { @@ -73,7 +73,7 @@ public boolean parse(ByteBuffer buffer) --cursor; error += currByte << (8 * cursor); if (cursor == 0) - return onReset(error); + return onReset(buffer, error); break; } default: @@ -85,9 +85,11 @@ public boolean parse(ByteBuffer buffer) return false; } - private boolean onReset(int error) + private boolean onReset(ByteBuffer buffer, int error) { ResetFrame frame = new ResetFrame(getStreamId(), error); + if (!rateControlOnEvent(frame)) + return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_rst_stream_frame_rate"); reset(); notifyReset(frame); return true; diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/SettingsBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/SettingsBodyParser.java index 2641b4ad8bc0..b985a7b46ef3 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/SettingsBodyParser.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/SettingsBodyParser.java @@ -73,10 +73,7 @@ protected void emptyBody(ByteBuffer buffer) return; boolean isReply = hasFlag(Flags.ACK); SettingsFrame frame = new SettingsFrame(Collections.emptyMap(), isReply); - if (!isReply && !rateControlOnEvent(frame)) - connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_settings_frame_rate"); - else - onSettings(frame); + onSettings(buffer, frame); } private boolean validateFrame(ByteBuffer buffer, int streamId, int bodyLength) @@ -219,11 +216,13 @@ protected boolean onSettings(ByteBuffer buffer, Map settings) return connectionFailure(buffer, ErrorCode.PROTOCOL_ERROR.code, "invalid_settings_max_frame_size"); SettingsFrame frame = new SettingsFrame(settings, hasFlag(Flags.ACK)); - return onSettings(frame); + return onSettings(buffer, frame); } - private boolean onSettings(SettingsFrame frame) + private boolean onSettings(ByteBuffer buffer, SettingsFrame frame) { + if (!rateControlOnEvent(frame)) + return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_settings_frame_rate"); reset(); notifySettings(frame); return true; diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/UnknownBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/UnknownBodyParser.java index 97aebcb90104..fb1b9707fd01 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/UnknownBodyParser.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/UnknownBodyParser.java @@ -35,7 +35,6 @@ public boolean parse(ByteBuffer buffer) boolean parsed = cursor == 0; if (parsed && !rateControlOnEvent(new UnknownFrame(getFrameType()))) return connectionFailure(buffer, ErrorCode.ENHANCE_YOUR_CALM_ERROR.code, "invalid_unknown_frame_rate"); - return parsed; } diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/ContinuationParseTest.java b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/ContinuationParseTest.java index 4c18f0f77c5f..c98765fa97b1 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/ContinuationParseTest.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/ContinuationParseTest.java @@ -16,6 +16,7 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; import org.eclipse.jetty.http.HostPortHttpField; import org.eclipse.jetty.http.HttpField; @@ -32,6 +33,8 @@ import org.eclipse.jetty.io.ByteBufferPool; import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -41,7 +44,7 @@ public class ContinuationParseTest @Test public void testParseOneByteAtATime() throws Exception { - ByteBufferPool bufferPool = new ArrayByteBufferPool(); + ArrayByteBufferPool.Tracking bufferPool = new ArrayByteBufferPool.Tracking(); HeadersGenerator generator = new HeadersGenerator(new HeaderGenerator(bufferPool), new HpackEncoder()); final List frames = new ArrayList<>(); @@ -137,6 +140,7 @@ public void onConnectionFailure(int error, String reason) parser.parse(ByteBuffer.wrap(new byte[]{buffer.get()})); } } + accumulator.release(); assertEquals(1, frames.size()); HeadersFrame frame = frames.get(0); @@ -152,6 +156,56 @@ public void onConnectionFailure(int error, String reason) } PriorityFrame priority = frame.getPriority(); assertNull(priority); + + assertEquals(0, bufferPool.getLeaks().size(), bufferPool.dumpLeaks()); + } + } + + @Test + public void testLargeHeadersBlock() throws Exception + { + // Use a ByteBufferPool with a small factor, so that the accumulation buffer is not too large. + ByteBufferPool bufferPool = new ArrayByteBufferPool(0, 128, -1); + // A small max headers size, used for both accumulation and decoding. + int maxHeadersSize = 512; + Parser parser = new Parser(bufferPool, maxHeadersSize); + // Specify headers block size to generate CONTINUATION frames. + int maxHeadersBlockFragment = 128; + HeadersGenerator generator = new HeadersGenerator(new HeaderGenerator(bufferPool), new HpackEncoder(), maxHeadersBlockFragment); + + int streamId = 13; + HttpFields fields = HttpFields.build() + .put("Accept", "text/html") + // Large header that generates a large headers block. + .put("User-Agent", "Jetty".repeat(256)); + MetaData.Request metaData = new MetaData.Request("GET", HttpScheme.HTTP.asString(), new HostPortHttpField("localhost:8080"), "/path", HttpVersion.HTTP_2, fields, -1); + + ByteBufferPool.Accumulator accumulator = new ByteBufferPool.Accumulator(); + generator.generateHeaders(accumulator, streamId, metaData, null, true); + List byteBuffers = accumulator.getByteBuffers(); + assertThat(byteBuffers.stream().mapToInt(ByteBuffer::remaining).sum(), greaterThan(maxHeadersSize)); + + AtomicBoolean failed = new AtomicBoolean(); + parser.init(new Parser.Listener() + { + @Override + public void onConnectionFailure(int error, String reason) + { + failed.set(true); + } + }); + // Set a large max headers size for decoding, to ensure + // the failure is due to accumulation, not decoding. + parser.getHpackDecoder().setMaxHeaderListSize(10 * maxHeadersSize); + + for (ByteBuffer byteBuffer : byteBuffers) + { + parser.parse(byteBuffer); + if (failed.get()) + break; } + accumulator.release(); + + assertTrue(failed.get()); } } diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/FrameFloodTest.java b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/FrameFloodTest.java index ee514fc1361c..013fbe6ff1ea 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/FrameFloodTest.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/FrameFloodTest.java @@ -96,21 +96,29 @@ public void testPriorityFrameFlood() } @Test - public void testSettingsFrameFlood() + public void testEmptySettingsFrameFlood() { byte[] payload = new byte[0]; testFrameFlood(null, frameFrom(payload.length, FrameType.SETTINGS.getType(), 0, 0, payload)); } + @Test + public void testSettingsFrameFlood() + { + // | Key0 | Key1 | Value0 | Value1 | Value2 | Value3 | + byte[] payload = new byte[]{0, 8, 0, 0, 0, 1}; + testFrameFlood(null, frameFrom(payload.length, FrameType.SETTINGS.getType(), 0, 0, payload)); + } + @Test public void testPingFrameFlood() { byte[] payload = {0, 0, 0, 0, 0, 0, 0, 0}; testFrameFlood(null, frameFrom(payload.length, FrameType.PING.getType(), 0, 0, payload)); } - + @Test - public void testContinuationFrameFlood() + public void testEmptyContinuationFrameFlood() { int streamId = 13; byte[] headersPayload = new byte[0]; @@ -119,6 +127,23 @@ public void testContinuationFrameFlood() testFrameFlood(headersBytes, frameFrom(continuationPayload.length, FrameType.CONTINUATION.getType(), 0, streamId, continuationPayload)); } + @Test + public void testContinuationFrameFlood() + { + int streamId = 13; + byte[] headersPayload = new byte[0]; + byte[] headersBytes = frameFrom(headersPayload.length, FrameType.HEADERS.getType(), 0, streamId, headersPayload); + byte[] continuationPayload = new byte[1]; + testFrameFlood(headersBytes, frameFrom(continuationPayload.length, FrameType.CONTINUATION.getType(), 0, streamId, continuationPayload)); + } + + @Test + public void testResetStreamFrameFlood() + { + byte[] payload = {0, 0, 0, 0}; + testFrameFlood(null, frameFrom(payload.length, FrameType.RST_STREAM.getType(), 0, 13, payload)); + } + @Test public void testUnknownFrameFlood() { diff --git a/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/AbstractHTTP2ServerConnectionFactory.java b/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/AbstractHTTP2ServerConnectionFactory.java index 90a75035976c..bcd57d9172ec 100644 --- a/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/AbstractHTTP2ServerConnectionFactory.java +++ b/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/AbstractHTTP2ServerConnectionFactory.java @@ -73,7 +73,7 @@ private static boolean isProtocolSupported(String protocol) private int maxFrameSize = Frame.DEFAULT_MAX_SIZE; private int maxSettingsKeys = SettingsFrame.DEFAULT_MAX_KEYS; private boolean connectProtocolEnabled = true; - private RateControl.Factory rateControlFactory = new WindowRateControl.Factory(50); + private RateControl.Factory rateControlFactory = new WindowRateControl.Factory(128); private FlowControlStrategy.Factory flowControlStrategyFactory = () -> new BufferingFlowControlStrategy(0.5F); private long streamIdleTimeout; private boolean useInputDirectByteBuffers; From 67b077847ad1d360585bbeea30afa9e8432b5480 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Mon, 9 Oct 2023 20:00:16 +0200 Subject: [PATCH 18/31] Issue #9777 - CrossOriginFilter does not return Vary header on no-cors mode. Modified the fix introduced by #9779 to avoid usage of Jetty server classes, so that the CrossOriginFilter can be deployed in any web application. Signed-off-by: Simone Bordet --- .../org/eclipse/jetty/servlets/CrossOriginFilter.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java index 817c46dbbe1f..9c3053cd6881 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java @@ -31,10 +31,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.http.HttpField; -import org.eclipse.jetty.http.HttpHeader; -import org.eclipse.jetty.http.PreEncodedHttpField; -import org.eclipse.jetty.server.Response; import org.eclipse.jetty.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -153,7 +149,6 @@ public class CrossOriginFilter implements Filter private static final List SIMPLE_HTTP_METHODS = Arrays.asList("GET", "POST", "HEAD"); private static final List DEFAULT_ALLOWED_METHODS = Arrays.asList("GET", "POST", "HEAD"); private static final List DEFAULT_ALLOWED_HEADERS = Arrays.asList("X-Requested-With", "Content-Type", "Accept", "Origin"); - private static final HttpField VARY_ORIGIN = new PreEncodedHttpField(HttpHeader.VARY, HttpHeader.ORIGIN.asString()); private boolean anyOriginAllowed; private boolean anyTimingOriginAllowed; @@ -274,10 +269,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha private void handle(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException { - if (response instanceof Response) - ((Response)response).getHttpFields().add(VARY_ORIGIN); - else - response.addHeader(VARY_ORIGIN.getName(), VARY_ORIGIN.getValue()); + response.addHeader("Vary", ORIGIN_HEADER); String origin = request.getHeader(ORIGIN_HEADER); // Is it a cross origin request ? if (origin != null && isEnabled(request)) From af15f12297adf5c5083e1f2f8f4c5974438bca25 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 9 Oct 2023 13:21:53 -0500 Subject: [PATCH 19/31] Updating to version 10.0.17 --- VERSION.txt | 51 ++++-- apache-jsp/pom.xml | 2 +- apache-jstl/pom.xml | 2 +- build-resources/pom.xml | 2 +- .../demo-async-rest-jar/pom.xml | 2 +- .../demo-async-rest-server/pom.xml | 2 +- .../demo-async-rest-webapp/pom.xml | 2 +- demos/demo-async-rest/pom.xml | 2 +- demos/demo-jaas-webapp/pom.xml | 2 +- demos/demo-jetty-webapp/pom.xml | 2 +- demos/demo-jndi-webapp/pom.xml | 2 +- demos/demo-jsp-webapp/pom.xml | 2 +- demos/demo-mock-resources/pom.xml | 2 +- demos/demo-proxy-webapp/pom.xml | 2 +- demos/demo-simple-webapp/pom.xml | 2 +- .../demo-container-initializer/pom.xml | 2 +- demos/demo-spec/demo-spec-webapp/pom.xml | 2 +- demos/demo-spec/demo-web-fragment/pom.xml | 2 +- demos/demo-spec/pom.xml | 2 +- demos/embedded/pom.xml | 2 +- demos/pom.xml | 2 +- .../jetty-asciidoctor-extensions/pom.xml | 2 +- documentation/jetty-documentation/pom.xml | 2 +- documentation/pom.xml | 2 +- javadoc/pom.xml | 2 +- jetty-alpn/jetty-alpn-client/pom.xml | 2 +- .../jetty-alpn-conscrypt-client/pom.xml | 2 +- .../jetty-alpn-conscrypt-server/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-client/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-server/pom.xml | 2 +- jetty-alpn/jetty-alpn-server/pom.xml | 2 +- jetty-alpn/pom.xml | 2 +- jetty-annotations/pom.xml | 2 +- jetty-ant/pom.xml | 2 +- jetty-bom/pom.xml | 166 +++++++++--------- jetty-cdi/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-fcgi/fcgi-client/pom.xml | 2 +- jetty-fcgi/fcgi-server/pom.xml | 2 +- jetty-fcgi/pom.xml | 2 +- .../jetty-gcloud-session-manager/pom.xml | 2 +- jetty-gcloud/pom.xml | 2 +- jetty-hazelcast/pom.xml | 2 +- jetty-home/pom.xml | 2 +- jetty-http-spi/pom.xml | 2 +- jetty-http/pom.xml | 2 +- jetty-http2/http2-client/pom.xml | 2 +- jetty-http2/http2-common/pom.xml | 2 +- jetty-http2/http2-hpack/pom.xml | 2 +- .../http2-http-client-transport/pom.xml | 2 +- jetty-http2/http2-server/pom.xml | 2 +- jetty-http2/pom.xml | 2 +- jetty-http3/http3-client/pom.xml | 2 +- jetty-http3/http3-common/pom.xml | 2 +- .../http3-http-client-transport/pom.xml | 2 +- jetty-http3/http3-qpack/pom.xml | 2 +- jetty-http3/http3-server/pom.xml | 2 +- jetty-http3/http3-tests/pom.xml | 2 +- jetty-http3/pom.xml | 2 +- jetty-infinispan/infinispan-common/pom.xml | 2 +- .../infinispan-embedded-query/pom.xml | 2 +- jetty-infinispan/infinispan-embedded/pom.xml | 2 +- .../infinispan-remote-query/pom.xml | 2 +- jetty-infinispan/infinispan-remote/pom.xml | 2 +- jetty-infinispan/pom.xml | 2 +- jetty-io/pom.xml | 2 +- jetty-jaas/pom.xml | 2 +- jetty-jaspi/pom.xml | 2 +- jetty-jmx/pom.xml | 2 +- jetty-jndi/pom.xml | 2 +- jetty-jspc-maven-plugin/pom.xml | 2 +- jetty-keystore/pom.xml | 2 +- jetty-maven-plugin/pom.xml | 2 +- .../jetty-memcached-sessions/pom.xml | 2 +- jetty-memcached/pom.xml | 2 +- jetty-nosql/pom.xml | 2 +- jetty-openid/pom.xml | 2 +- jetty-osgi/jetty-osgi-alpn/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot/pom.xml | 2 +- jetty-osgi/jetty-osgi-httpservice/pom.xml | 2 +- jetty-osgi/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-context/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-fragment/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-server/pom.xml | 2 +- .../test-jetty-osgi-webapp-resources/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-webapp/pom.xml | 2 +- jetty-osgi/test-jetty-osgi/pom.xml | 2 +- jetty-p2/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-proxy/pom.xml | 2 +- jetty-quic/pom.xml | 2 +- jetty-quic/quic-client/pom.xml | 2 +- jetty-quic/quic-common/pom.xml | 2 +- jetty-quic/quic-quiche/pom.xml | 2 +- .../quic-quiche/quic-quiche-common/pom.xml | 2 +- .../quic-quiche-foreign-incubator/pom.xml | 2 +- .../quic-quiche/quic-quiche-jna/pom.xml | 2 +- jetty-quic/quic-server/pom.xml | 2 +- jetty-quickstart/pom.xml | 2 +- jetty-rewrite/pom.xml | 2 +- jetty-runner/pom.xml | 2 +- jetty-security/pom.xml | 2 +- jetty-server/pom.xml | 2 +- jetty-servlet/pom.xml | 2 +- jetty-servlets/pom.xml | 2 +- jetty-slf4j-impl/pom.xml | 2 +- jetty-start/pom.xml | 2 +- jetty-unixdomain-server/pom.xml | 2 +- .../jetty-unixsocket-client/pom.xml | 2 +- .../jetty-unixsocket-common/pom.xml | 2 +- .../jetty-unixsocket-server/pom.xml | 2 +- jetty-unixsocket/pom.xml | 2 +- jetty-util-ajax/pom.xml | 2 +- jetty-util/pom.xml | 2 +- jetty-webapp/pom.xml | 2 +- jetty-websocket/pom.xml | 2 +- jetty-websocket/websocket-core-client/pom.xml | 2 +- jetty-websocket/websocket-core-common/pom.xml | 2 +- jetty-websocket/websocket-core-server/pom.xml | 2 +- jetty-websocket/websocket-core-tests/pom.xml | 2 +- .../websocket-javax-client/pom.xml | 2 +- .../websocket-javax-common/pom.xml | 2 +- .../websocket-javax-server/pom.xml | 2 +- jetty-websocket/websocket-javax-tests/pom.xml | 2 +- jetty-websocket/websocket-jetty-api/pom.xml | 2 +- .../websocket-jetty-client/pom.xml | 2 +- .../websocket-jetty-common/pom.xml | 2 +- .../websocket-jetty-server/pom.xml | 2 +- jetty-websocket/websocket-jetty-tests/pom.xml | 2 +- jetty-websocket/websocket-servlet/pom.xml | 2 +- jetty-xml/pom.xml | 2 +- pom.xml | 2 +- scripts/release-jetty.sh | 5 - tests/jetty-home-tester/pom.xml | 2 +- tests/jetty-http-tools/pom.xml | 2 +- tests/jetty-jmh/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-cdi/pom.xml | 2 +- tests/test-distribution/pom.xml | 2 +- tests/test-http-client-transport/pom.xml | 2 +- tests/test-integration/pom.xml | 2 +- tests/test-jmx/jmx-webapp-it/pom.xml | 2 +- tests/test-jmx/jmx-webapp/pom.xml | 2 +- tests/test-jmx/pom.xml | 2 +- tests/test-jpms/pom.xml | 2 +- .../test-jpms-websocket-core/pom.xml | 2 +- tests/test-loginservice/pom.xml | 2 +- tests/test-quickstart/pom.xml | 2 +- tests/test-sessions/pom.xml | 2 +- .../test-sessions/test-file-sessions/pom.xml | 2 +- .../test-gcloud-sessions/pom.xml | 2 +- .../test-hazelcast-sessions/pom.xml | 2 +- .../test-infinispan-sessions/pom.xml | 2 +- .../test-sessions/test-jdbc-sessions/pom.xml | 2 +- .../test-memcached-sessions/pom.xml | 2 +- .../test-mongodb-sessions/pom.xml | 2 +- .../test-sessions-common/pom.xml | 2 +- tests/test-webapps/pom.xml | 2 +- .../test-bad-websocket-webapp/pom.xml | 2 +- .../test-cdi-common-webapp/pom.xml | 2 +- tests/test-webapps/test-felix-webapp/pom.xml | 2 +- tests/test-webapps/test-http2-webapp/pom.xml | 2 +- tests/test-webapps/test-openid-webapp/pom.xml | 2 +- .../test-webapps/test-owb-cdi-webapp/pom.xml | 2 +- .../test-simple-session-webapp/pom.xml | 2 +- .../test-webapps/test-webapp-rfc2616/pom.xml | 2 +- .../pom.xml | 2 +- .../test-websocket-client-webapp/pom.xml | 2 +- .../test-websocket-webapp/pom.xml | 2 +- .../test-webapps/test-weld-cdi-webapp/pom.xml | 2 +- tests/test-websocket-autobahn/pom.xml | 2 +- 174 files changed, 289 insertions(+), 275 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 330dc9e81b5d..d3ac90b22835 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,4 +1,10 @@ -jetty-10.0.17-SNAPSHOT +jetty-10.0.17 - 09 October 2023 + + 9777 CrossOriginFilter does not return Vary header on no-cors mode + + 9928 Backport `Request.getBeginNanoTime()` + + 10473 Startup Script reports `ok` too fast, and doesn't wait for actual + start of Jetty + + 10547 Cannot customize Executor on WebSocketClient + + 10679 Review HTTP/2 rate control jetty-10.0.16 - 25 August 2023 + 6140 Report total number of keys in SelectorManager @@ -69,7 +75,8 @@ jetty-10.0.15 - 11 April 2023 + 9309 `jetty.sh` cannot handle complex Jetty properties from `start.d/*.ini` + 9400 Jetty logs warning with stacktrace when annotation parser encounters module-info.class file inside elasticsearch-x-content jar - + 9464 Add optional configuration to log user out after OpenID idToken expires (CVE-2023-41900) + + 9464 Add optional configuration to log user out after OpenID idToken expires + (CVE-2023-41900) + 9468 Jetty 11.0.14 is less tolerant of non-compliant cookies than 11.0.13 + 9497 Maven plugin effective web xml: add support for jar projects + 9501 jetty client with proxy - ssl traffic between both proxy and servers @@ -220,7 +227,6 @@ jetty-10.0.10 - 16 June 2022 properties + 8161 Improve SSLConnection buffers handling (CVE-2022-2191) - jetty-9.4.47.v20220610 - 10 June 2022 + 4717 High CPU spikes with jetty winstone threads + 7748 Allow overriding of url-pattern mapping in ServletContextHandler to @@ -528,7 +534,8 @@ jetty-10.0.3 - 20 May 2021 + 6254 Total timeout not enforced for queued requests + 6263 Review URI encoding in ConcatServlet & WelcomeFilter (CVE-2021-28169) + 6272 Reduce allocation in HttpClient when notifying content listeners - + 6277 Better handle exceptions thrown from session destroy listener (CVE-2021-34428) + + 6277 Better handle exceptions thrown from session destroy listener + (CVE-2021-34428) + 6280 Copy ServletHolder class/instance properly during startWebapp + 6287 Class loading broken for WebSocketClient used inside webapp @@ -559,7 +566,8 @@ jetty-10.0.2 - 26 March 2021 + 6037 Review logging modules for j.u.l + 6050 Websocket: NotUtf8Exception after upgrade 9.4.35 -> 9.4.36 or newer + 6063 Allow override of hazelcast version when using module - + 6072 jetty server high CPU when client send data length > 17408 (CVE-2021-28165) + + 6072 jetty server high CPU when client send data length > 17408 + (CVE-2021-28165) + 6076 Embedded Jetty throws null pointer exception + 6082 SslConnection compacting + 6085 Jetty keeps Sessions in use after "Duplicate valid session cookies" @@ -635,7 +643,8 @@ jetty-10.0.0 - 02 December 2020 + 5555 NPE for servlet with no mapping + 5562 ArrayTernaryTrie consumes too much memory + 5575 Add SEARCH as a known HttpMethod - + 5605 java.io.IOException: unconsumed input during http request parsing (CVE-2020-27218) + + 5605 java.io.IOException: unconsumed input during http request parsing + (CVE-2020-27218) + 5633 Allow to configure HttpClient request authority + 5679 Distro argument --list-all-modules does not work + 5680 No way to see which modules are enabled for the distro @@ -827,7 +836,8 @@ jetty-9.4.41.v20210516 - 16 May 2021 `AsyncContext.dispatch` + 6254 Total timeout not enforced for queued requests + 6263 Review URI encoding in ConcatServlet & WelcomeFilter (CVE-2021-28169) - + 6277 Better handle exceptions thrown from session destroy listener (CVE-2021-34428) + + 6277 Better handle exceptions thrown from session destroy listener + (CVE-2021-34428) + 6280 Copy ServletHolder class/instance properly during startWebapp jetty-9.4.40.v20210413 - 13 April 2021 @@ -843,7 +853,8 @@ jetty-9.4.39.v20210325 - 25 March 2021 + 6052 Cleanup TypeUtil and ModuleLocation to allow jetty-client/hybrid to work on Android + 6063 Allow override of hazelcast version when using module - + 6072 jetty server high CPU when client send data length > 17408 (CVE-2021-28165) + + 6072 jetty server high CPU when client send data length > 17408 + (CVE-2021-28165) + 6085 Jetty keeps Sessions in use after "Duplicate valid session cookies" Message + 6101 Normalize ambiguous URIs (CVE-2021-28164) @@ -899,7 +910,8 @@ jetty-9.4.35.v20201120 - 20 November 2020 + 5539 StatisticsServlet output is not valid + 5562 ArrayTernaryTrie consumes too much memory + 5575 Add SEARCH as a known HttpMethod - + 5605 java.io.IOException: unconsumed input during http request parsing (CVE-2020-27218) + + 5605 java.io.IOException: unconsumed input during http request parsing + (CVE-2020-27218) + 5633 Allow to configure HttpClient request authority jetty-9.4.34.v20201102 - 02 November 2020 @@ -1393,8 +1405,10 @@ jetty-9.4.18.v20190429 - 29 April 2019 jetty-9.4.17.v20190418 - 18 April 2019 + 2140 Infinispan and hazelcast changes to scavenge zombie expired sessions + 3464 Split SslContextFactory into Client and Server - + 3549 Directory Listing on Windows reveals Resource Base path (CVE-2019-10246) - + 3555 DefaultHandler Reveals Base Resource Path of each Context (CVE-2019-10247) + + 3549 Directory Listing on Windows reveals Resource Base path + (CVE-2019-10246) + + 3555 DefaultHandler Reveals Base Resource Path of each Context + (CVE-2019-10247) jetty-9.4.16.v20190411 - 11 April 2019 + 1861 Limit total bytes pooled by ByteBufferPools @@ -1475,8 +1489,10 @@ jetty-9.3.28.v20191105 - 05 November 2019 + 4217 SslConnection.DecryptedEnpoint.flush eternal busy loop jetty-9.3.27.v20190418 - 18 April 2019 - + 3549 Directory Listing on Windows reveals Resource Base path (CVE-2019-10246) - + 3555 DefaultHandler Reveals Base Resource Path of each Context (CVE-2019-10247) + + 3549 Directory Listing on Windows reveals Resource Base path + (CVE-2019-10246) + + 3555 DefaultHandler Reveals Base Resource Path of each Context + (CVE-2019-10247) jetty-9.3.26.v20190403 - 03 April 2019 + 2954 Improve cause reporting for HttpClient failures @@ -1490,11 +1506,14 @@ jetty-9.2.29.v20191105 - 05 November 2019 + 4217 SslConnection.DecryptedEnpoint.flush eternal busy loop jetty-9.2.28.v20190418 - 18 April 2019 - + 3549 Directory Listing on Windows reveals Resource Base path (CVE-2019-10246) - + 3555 DefaultHandler Reveals Base Resource Path of each Context (CVE-2019-10247) + + 3549 Directory Listing on Windows reveals Resource Base path + (CVE-2019-10246) + + 3555 DefaultHandler Reveals Base Resource Path of each Context + (CVE-2019-10247) jetty-9.2.27.v20190403 - 03 April 2019 - + 3319 Refactored Directory Listing to modernize and avoid XSS (CVE-2019-10241) + + 3319 Refactored Directory Listing to modernize and avoid XSS + (CVE-2019-10241) jetty-9.4.14.v20181114 - 14 November 2018 + 3097 Duplicated programmatic Servlet Listeners causing duplicate calls diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index 8cd69d87a13c..74257c1cbd47 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml index 500d9a681521..2bd08fd144b5 100644 --- a/apache-jstl/pom.xml +++ b/apache-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 apache-jstl diff --git a/build-resources/pom.xml b/build-resources/pom.xml index 8ff57e1c42f3..92c632cf9477 100644 --- a/build-resources/pom.xml +++ b/build-resources/pom.xml @@ -7,7 +7,7 @@ --> org.eclipse.jetty build-resources - 10.0.17-SNAPSHOT + 10.0.17 Jetty :: Build Resources jar diff --git a/demos/demo-async-rest/demo-async-rest-jar/pom.xml b/demos/demo-async-rest/demo-async-rest-jar/pom.xml index dbd48cbc2ff5..7d3639ebfed9 100644 --- a/demos/demo-async-rest/demo-async-rest-jar/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-jar/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/demos/demo-async-rest/demo-async-rest-server/pom.xml b/demos/demo-async-rest/demo-async-rest-server/pom.xml index 5db1c6b79d74..ff947402dda7 100644 --- a/demos/demo-async-rest/demo-async-rest-server/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml index 229a191f1cc2..63b1d07622f1 100644 --- a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/demos/demo-async-rest/pom.xml b/demos/demo-async-rest/pom.xml index 0df25a011f12..fae4cb057e0b 100644 --- a/demos/demo-async-rest/pom.xml +++ b/demos/demo-async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/demos/demo-jaas-webapp/pom.xml b/demos/demo-jaas-webapp/pom.xml index ca7ee81bd06e..1013fe35b970 100644 --- a/demos/demo-jaas-webapp/pom.xml +++ b/demos/demo-jaas-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17-SNAPSHOT + 10.0.17 demo-jaas-webapp Demo :: JAAS :: WebApp diff --git a/demos/demo-jetty-webapp/pom.xml b/demos/demo-jetty-webapp/pom.xml index 0d3e0ba0a479..eb81f099a2e0 100644 --- a/demos/demo-jetty-webapp/pom.xml +++ b/demos/demo-jetty-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17-SNAPSHOT + 10.0.17 ../pom.xml 4.0.0 diff --git a/demos/demo-jndi-webapp/pom.xml b/demos/demo-jndi-webapp/pom.xml index f09868f7cce8..14fe383deab0 100644 --- a/demos/demo-jndi-webapp/pom.xml +++ b/demos/demo-jndi-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17-SNAPSHOT + 10.0.17 demo-jndi-webapp Demo :: JNDI :: WebApp diff --git a/demos/demo-jsp-webapp/pom.xml b/demos/demo-jsp-webapp/pom.xml index 8ffc0026d68b..ba6829b91d68 100644 --- a/demos/demo-jsp-webapp/pom.xml +++ b/demos/demo-jsp-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/demos/demo-mock-resources/pom.xml b/demos/demo-mock-resources/pom.xml index 95712d65ba85..25617107d2c0 100644 --- a/demos/demo-mock-resources/pom.xml +++ b/demos/demo-mock-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17-SNAPSHOT + 10.0.17 Demo :: Mock Resources demo-mock-resources diff --git a/demos/demo-proxy-webapp/pom.xml b/demos/demo-proxy-webapp/pom.xml index e96673a63257..8ac819104117 100644 --- a/demos/demo-proxy-webapp/pom.xml +++ b/demos/demo-proxy-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 demo-proxy-webapp diff --git a/demos/demo-simple-webapp/pom.xml b/demos/demo-simple-webapp/pom.xml index 3db0eb6bf00b..8d96855e323a 100644 --- a/demos/demo-simple-webapp/pom.xml +++ b/demos/demo-simple-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/demos/demo-spec/demo-container-initializer/pom.xml b/demos/demo-spec/demo-container-initializer/pom.xml index 3dfbaaa271d6..3e46164ea9ed 100644 --- a/demos/demo-spec/demo-container-initializer/pom.xml +++ b/demos/demo-spec/demo-container-initializer/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17-SNAPSHOT + 10.0.17 ../../pom.xml demo-container-initializer diff --git a/demos/demo-spec/demo-spec-webapp/pom.xml b/demos/demo-spec/demo-spec-webapp/pom.xml index 65647a3e49ca..c679343db3c4 100644 --- a/demos/demo-spec/demo-spec-webapp/pom.xml +++ b/demos/demo-spec/demo-spec-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17-SNAPSHOT + 10.0.17 ../../pom.xml Demo :: Servlet Spec :: Webapp diff --git a/demos/demo-spec/demo-web-fragment/pom.xml b/demos/demo-spec/demo-web-fragment/pom.xml index 5ded99d837b4..a31e09af11f4 100644 --- a/demos/demo-spec/demo-web-fragment/pom.xml +++ b/demos/demo-spec/demo-web-fragment/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17-SNAPSHOT + 10.0.17 ../../pom.xml diff --git a/demos/demo-spec/pom.xml b/demos/demo-spec/pom.xml index 0aeae1a40a25..2840e8f47dd4 100644 --- a/demos/demo-spec/pom.xml +++ b/demos/demo-spec/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17-SNAPSHOT + 10.0.17 Demo :: Servlet Spec demo-spec diff --git a/demos/embedded/pom.xml b/demos/embedded/pom.xml index 37363a73bcc5..452a34047180 100644 --- a/demos/embedded/pom.xml +++ b/demos/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 demos-jetty-embedded diff --git a/demos/pom.xml b/demos/pom.xml index 309e24be95a1..22ca00084abc 100644 --- a/demos/pom.xml +++ b/demos/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml index 669d8417b1d9..73ee41046a70 100644 --- a/documentation/jetty-asciidoctor-extensions/pom.xml +++ b/documentation/jetty-asciidoctor-extensions/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.documentation documentation-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index ba8ec747fd6f..c59d68239904 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.documentation documentation-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/documentation/pom.xml b/documentation/pom.xml index a4ba1ca6e319..2374ffadd4d8 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/javadoc/pom.xml b/javadoc/pom.xml index c423b9d46ec9..e68597d1b40c 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index df963c6f6228..59acb992d13d 100644 --- a/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-alpn/jetty-alpn-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-alpn-client diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index 3ddd75ad6493..7a7e35610772 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index 72b9291e3e1f..b62bf61ebd31 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index 51ed53a50eef..2981fc87f47e 100644 --- a/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index b9bd5b9a18bb..89427dc82128 100644 --- a/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index 53a00d60eb58..12376841a0c9 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-alpn-server diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index c818e251ee62..0a22f496de1a 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-alpn-parent diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 6d33aa35f635..5ca33cf177a2 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index fbae542b8184..229616a54e7f 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-ant diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index 5fd381cb92fc..d0d3dd314662 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 jetty-bom @@ -53,409 +53,409 @@ org.eclipse.jetty apache-jsp - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty apache-jstl - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-alpn-client - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-alpn-java-client - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-alpn-java-server - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-alpn-conscrypt-client - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-alpn-conscrypt-server - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-alpn-server - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-annotations - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-ant - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-client - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-cdi - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-deploy - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.fcgi fcgi-client - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.fcgi fcgi-server - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.gcloud jetty-gcloud-session-manager - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-home - 10.0.17-SNAPSHOT + 10.0.17 zip org.eclipse.jetty jetty-home - 10.0.17-SNAPSHOT + 10.0.17 tar.gz org.eclipse.jetty jetty-http - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.http2 http2-client - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.http2 http2-common - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.http2 http2-hpack - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.http2 http2-http-client-transport - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.http2 http2-server - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.http3 http3-client - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.http3 http3-common - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.http3 http3-http-client-transport - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.http3 http3-qpack - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.http3 http3-server - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-http-spi - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty infinispan-common - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty infinispan-remote-query - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty infinispan-embedded-query - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-hazelcast - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-io - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-jaas - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-jaspi - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-jmx - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-jndi - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-keystore - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.memcached jetty-memcached-sessions - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-nosql - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.osgi jetty-osgi-alpn - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.osgi jetty-osgi-boot - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.osgi jetty-osgi-boot-jsp - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.osgi jetty-osgi-boot-warurl - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.quic quic-client - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.quic quic-common - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.quic quic-quiche-common - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.quic quic-quiche-jna - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.quic quic-server - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.osgi jetty-httpservice - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-plus - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-proxy - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-quickstart - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-rewrite - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-security - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-openid - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-server - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-servlet - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-servlets - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-slf4j-impl - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-unixdomain-server - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-unixsocket-common - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-unixsocket-client - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-unixsocket-server - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-util - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-util-ajax - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-webapp - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.websocket websocket-javax-client - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.websocket websocket-javax-server - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.websocket websocket-javax-common - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.websocket websocket-jetty-api - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.websocket websocket-jetty-client - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.websocket websocket-jetty-common - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.websocket websocket-jetty-server - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.websocket websocket-servlet - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.websocket websocket-core-common - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.websocket websocket-core-client - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty.websocket websocket-core-server - 10.0.17-SNAPSHOT + 10.0.17 org.eclipse.jetty jetty-xml - 10.0.17-SNAPSHOT + 10.0.17 @@ -471,7 +471,7 @@ org.eclipse.jetty.quic quic-quiche-foreign-incubator - 10.0.17-SNAPSHOT + 10.0.17 diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index 0c832d1a358e..2edaccf5288f 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 org.eclipse.jetty diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 713c5821a622..3c48cc2f8355 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 6a08b04089e2..1c1567a6c2c9 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index c9347186874c..0650cff7fa8f 100644 --- a/jetty-fcgi/fcgi-client/pom.xml +++ b/jetty-fcgi/fcgi-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi fcgi-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index e5f6f50ff7b2..178938b53e1f 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi fcgi-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml index cdc47e20b0b8..ed510e80629f 100644 --- a/jetty-fcgi/pom.xml +++ b/jetty-fcgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index 76faa6c33aff..bbef903d353d 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.gcloud gcloud-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index 05692b95d5bb..a5e96393e4f5 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index 437207e18c18..cd7438fb74fb 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index fd2b1691e9b9..434bc74a9b82 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-home diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 90e1eb2210be..06d2c82cddcb 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 797d06a625e3..43d9d1fa9341 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index 304f332bc378..c7177ecb3e50 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index 1d71505c9072..4f0977f4065f 100644 --- a/jetty-http2/http2-common/pom.xml +++ b/jetty-http2/http2-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index c350cf058700..e50cdd99318e 100644 --- a/jetty-http2/http2-hpack/pom.xml +++ b/jetty-http2/http2-hpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index abbdc34f8ae6..c7911cc35a1f 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index ada8905ad231..862f6ae04de0 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml index 7b601de8cef0..bf0aadedc3e2 100644 --- a/jetty-http2/pom.xml +++ b/jetty-http2/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-http3/http3-client/pom.xml b/jetty-http3/http3-client/pom.xml index 362e4196d2d8..f7030657fbab 100644 --- a/jetty-http3/http3-client/pom.xml +++ b/jetty-http3/http3-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-http3/http3-common/pom.xml b/jetty-http3/http3-common/pom.xml index e13016d2e831..4a8d9fcdf575 100644 --- a/jetty-http3/http3-common/pom.xml +++ b/jetty-http3/http3-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-http3/http3-http-client-transport/pom.xml b/jetty-http3/http3-http-client-transport/pom.xml index 29de56e8738e..e0b80da4e8b9 100644 --- a/jetty-http3/http3-http-client-transport/pom.xml +++ b/jetty-http3/http3-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-http3/http3-qpack/pom.xml b/jetty-http3/http3-qpack/pom.xml index 6f94f3aaf1ed..b473e5b4a020 100644 --- a/jetty-http3/http3-qpack/pom.xml +++ b/jetty-http3/http3-qpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-http3/http3-server/pom.xml b/jetty-http3/http3-server/pom.xml index 2efb83d72139..dc8258fff1d2 100644 --- a/jetty-http3/http3-server/pom.xml +++ b/jetty-http3/http3-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-http3/http3-tests/pom.xml b/jetty-http3/http3-tests/pom.xml index ba9d4f329483..93c70d202692 100644 --- a/jetty-http3/http3-tests/pom.xml +++ b/jetty-http3/http3-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-http3/pom.xml b/jetty-http3/pom.xml index 22dd6c7cccb3..88039cb86bb2 100644 --- a/jetty-http3/pom.xml +++ b/jetty-http3/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml index bcfdc7052a97..c99f6eef5f55 100644 --- a/jetty-infinispan/infinispan-common/pom.xml +++ b/jetty-infinispan/infinispan-common/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 infinispan-common diff --git a/jetty-infinispan/infinispan-embedded-query/pom.xml b/jetty-infinispan/infinispan-embedded-query/pom.xml index a4928ac9505f..f8f10082152e 100644 --- a/jetty-infinispan/infinispan-embedded-query/pom.xml +++ b/jetty-infinispan/infinispan-embedded-query/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 infinispan-embedded-query diff --git a/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-infinispan/infinispan-embedded/pom.xml index 085b55ac982c..f4b749e45156 100644 --- a/jetty-infinispan/infinispan-embedded/pom.xml +++ b/jetty-infinispan/infinispan-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 infinispan-embedded diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml index 7f0e8d552fc6..a3d484d5702d 100644 --- a/jetty-infinispan/infinispan-remote-query/pom.xml +++ b/jetty-infinispan/infinispan-remote-query/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 infinispan-remote-query diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml index e17da915cede..c80af76ab338 100644 --- a/jetty-infinispan/infinispan-remote/pom.xml +++ b/jetty-infinispan/infinispan-remote/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 infinispan-remote diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml index 67bb5d3de448..0c1290c5c73d 100644 --- a/jetty-infinispan/pom.xml +++ b/jetty-infinispan/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 3ab02e4bad14..a17622ace59d 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 5576064b61ea..dcb789e79d0d 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index a1f4568e8a91..98c09be9be1e 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index f14eb36e4d8c..39fb9eb37594 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 7662f57df99d..dabbba1ae1d7 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index b19a498b488a..b4ebe4a68a9a 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-keystore/pom.xml b/jetty-keystore/pom.xml index 4e90ee522379..cf0e68784ad6 100644 --- a/jetty-keystore/pom.xml +++ b/jetty-keystore/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-keystore diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 0a1349dbe39b..f44cc22894a8 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-maven-plugin diff --git a/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-memcached/jetty-memcached-sessions/pom.xml index 418c0872764a..efa187e1c302 100644 --- a/jetty-memcached/jetty-memcached-sessions/pom.xml +++ b/jetty-memcached/jetty-memcached-sessions/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.memcached memcached-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-memcached/pom.xml b/jetty-memcached/pom.xml index 54fb4a969c81..8ed79b98f3df 100644 --- a/jetty-memcached/pom.xml +++ b/jetty-memcached/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 4b846c134425..83e025829e19 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-nosql diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index 824063091d5e..8389aeb8288a 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml index 9199896049af..025295ad03be 100644 --- a/jetty-osgi/jetty-osgi-alpn/pom.xml +++ b/jetty-osgi/jetty-osgi-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17-SNAPSHOT + 10.0.17 diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 65bda6c9b259..40bb71338f51 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-osgi-boot-jsp diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index c751a9b58a2f..8caa1907472b 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17-SNAPSHOT + 10.0.17 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 3cf122195836..bd9ea1934dd7 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-osgi-boot diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index 68dcbaeef33a..501b4132bf3c 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-httpservice diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index 4c4be23ec2b5..b07c3868ae79 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index 88d1afa6829b..f31247b5cc49 100644 --- a/jetty-osgi/test-jetty-osgi-context/pom.xml +++ b/jetty-osgi/test-jetty-osgi-context/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 test-jetty-osgi-context diff --git a/jetty-osgi/test-jetty-osgi-fragment/pom.xml b/jetty-osgi/test-jetty-osgi-fragment/pom.xml index 8c87777b3d46..5e16035277dd 100644 --- a/jetty-osgi/test-jetty-osgi-fragment/pom.xml +++ b/jetty-osgi/test-jetty-osgi-fragment/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17-SNAPSHOT + 10.0.17 ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-server/pom.xml b/jetty-osgi/test-jetty-osgi-server/pom.xml index 68b5c6aaba5e..84d8b8921a4f 100644 --- a/jetty-osgi/test-jetty-osgi-server/pom.xml +++ b/jetty-osgi/test-jetty-osgi-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 test-jetty-osgi-server diff --git a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml index c3b3d455b1bf..1ca1fd529d2f 100644 --- a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 test-jetty-osgi-webapp-resources diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index 8e811e30c2d4..03bbb9926b50 100644 --- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17-SNAPSHOT + 10.0.17 ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 73849e66b434..4c1e63518a4b 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17-SNAPSHOT + 10.0.17 ../pom.xml 4.0.0 diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml index bcb39f330a68..a1e683ba9c14 100644 --- a/jetty-p2/pom.xml +++ b/jetty-p2/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-p2 diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 84b8599523a8..91dd2e7c2414 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 1ea021dd368b..d7a135c8323c 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-quic/pom.xml b/jetty-quic/pom.xml index 5fdd77863498..ae45e42cdf01 100644 --- a/jetty-quic/pom.xml +++ b/jetty-quic/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-quic/quic-client/pom.xml b/jetty-quic/quic-client/pom.xml index 168a9516048e..d2d9aed2529d 100644 --- a/jetty-quic/quic-client/pom.xml +++ b/jetty-quic/quic-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-quic/quic-common/pom.xml b/jetty-quic/quic-common/pom.xml index 1e0d9cc31e5e..dc797a77d3ac 100644 --- a/jetty-quic/quic-common/pom.xml +++ b/jetty-quic/quic-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-quic/quic-quiche/pom.xml b/jetty-quic/quic-quiche/pom.xml index f0b0e07c8cf6..532dc212319b 100644 --- a/jetty-quic/quic-quiche/pom.xml +++ b/jetty-quic/quic-quiche/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-common/pom.xml b/jetty-quic/quic-quiche/quic-quiche-common/pom.xml index ad1cc75cb71b..574d81025327 100644 --- a/jetty-quic/quic-quiche/quic-quiche-common/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml index a46f880f9b99..133a1fd86521 100644 --- a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml b/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml index d1664ab57899..96beb6fef5c3 100644 --- a/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-quic/quic-server/pom.xml b/jetty-quic/quic-server/pom.xml index d121a4639899..d47e4fec9718 100644 --- a/jetty-quic/quic-server/pom.xml +++ b/jetty-quic/quic-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index 5163c90a805d..51a2af087abc 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 3cbb3d816fd6..c11d6ed8c1a2 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index c88d06d2ba0f..c855d1dd5795 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-runner diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 1293e29b1f26..6a316fe5a36a 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index df40ef00c4bb..ced93e89bbb3 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index e3fc40126066..c367a6e62527 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 7a1cc32bd236..de7dbac1af82 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-slf4j-impl/pom.xml b/jetty-slf4j-impl/pom.xml index 93b8c7f93fa9..42cf10d6b37d 100644 --- a/jetty-slf4j-impl/pom.xml +++ b/jetty-slf4j-impl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index eccc9d3b07ea..60b6a96568d6 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-start diff --git a/jetty-unixdomain-server/pom.xml b/jetty-unixdomain-server/pom.xml index 1f5156f7d407..0b601a41014c 100644 --- a/jetty-unixdomain-server/pom.xml +++ b/jetty-unixdomain-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-client/pom.xml b/jetty-unixsocket/jetty-unixsocket-client/pom.xml index 961b9f8d7e49..a5badf7c0ca6 100644 --- a/jetty-unixsocket/jetty-unixsocket-client/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-client/pom.xml @@ -3,7 +3,7 @@ jetty-unixsocket org.eclipse.jetty - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-common/pom.xml b/jetty-unixsocket/jetty-unixsocket-common/pom.xml index 7d94ba26342e..3ca5770dd55d 100644 --- a/jetty-unixsocket/jetty-unixsocket-common/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-unixsocket - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-server/pom.xml b/jetty-unixsocket/jetty-unixsocket-server/pom.xml index 3d9425080300..998642b99e58 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/pom.xml @@ -3,7 +3,7 @@ jetty-unixsocket org.eclipse.jetty - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-unixsocket/pom.xml b/jetty-unixsocket/pom.xml index 2a483631842a..cf75d993e302 100644 --- a/jetty-unixsocket/pom.xml +++ b/jetty-unixsocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 1e76c29bcf0a..eb46b8f813c2 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index ec4f92699632..a3f27f9582b4 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index d0727ccf3d92..051f09a16013 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 2354faa2187c..d5f7a4a75562 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-websocket/websocket-core-client/pom.xml b/jetty-websocket/websocket-core-client/pom.xml index 744f18fb5451..6b0873c3aa65 100644 --- a/jetty-websocket/websocket-core-client/pom.xml +++ b/jetty-websocket/websocket-core-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-websocket/websocket-core-common/pom.xml b/jetty-websocket/websocket-core-common/pom.xml index aea0e2033d7b..f32c26b7af95 100644 --- a/jetty-websocket/websocket-core-common/pom.xml +++ b/jetty-websocket/websocket-core-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-websocket/websocket-core-server/pom.xml b/jetty-websocket/websocket-core-server/pom.xml index e9cc8cb5fc36..57f3b3efe91b 100644 --- a/jetty-websocket/websocket-core-server/pom.xml +++ b/jetty-websocket/websocket-core-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-websocket/websocket-core-tests/pom.xml b/jetty-websocket/websocket-core-tests/pom.xml index ef3f2c4cf51c..aae4571059eb 100644 --- a/jetty-websocket/websocket-core-tests/pom.xml +++ b/jetty-websocket/websocket-core-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-websocket/websocket-javax-client/pom.xml b/jetty-websocket/websocket-javax-client/pom.xml index 625ead3feb0d..cc09aee66086 100644 --- a/jetty-websocket/websocket-javax-client/pom.xml +++ b/jetty-websocket/websocket-javax-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-websocket/websocket-javax-common/pom.xml b/jetty-websocket/websocket-javax-common/pom.xml index 3ac840363a62..4fb7f9eac7cd 100644 --- a/jetty-websocket/websocket-javax-common/pom.xml +++ b/jetty-websocket/websocket-javax-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-websocket/websocket-javax-server/pom.xml b/jetty-websocket/websocket-javax-server/pom.xml index 9fa84508211c..f628cfe65349 100644 --- a/jetty-websocket/websocket-javax-server/pom.xml +++ b/jetty-websocket/websocket-javax-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-websocket/websocket-javax-tests/pom.xml b/jetty-websocket/websocket-javax-tests/pom.xml index 4e60dac1dc6e..5bc292d0e445 100644 --- a/jetty-websocket/websocket-javax-tests/pom.xml +++ b/jetty-websocket/websocket-javax-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-websocket/websocket-jetty-api/pom.xml b/jetty-websocket/websocket-jetty-api/pom.xml index 1b38811cb828..9923224a7d39 100644 --- a/jetty-websocket/websocket-jetty-api/pom.xml +++ b/jetty-websocket/websocket-jetty-api/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-websocket/websocket-jetty-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml index 80a95bb96b09..f9da9f3e9391 100644 --- a/jetty-websocket/websocket-jetty-client/pom.xml +++ b/jetty-websocket/websocket-jetty-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-websocket/websocket-jetty-common/pom.xml b/jetty-websocket/websocket-jetty-common/pom.xml index e3cea098f2a5..822b05f09d34 100644 --- a/jetty-websocket/websocket-jetty-common/pom.xml +++ b/jetty-websocket/websocket-jetty-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-websocket/websocket-jetty-server/pom.xml b/jetty-websocket/websocket-jetty-server/pom.xml index 1b9c76d574a2..b0532302ff4f 100644 --- a/jetty-websocket/websocket-jetty-server/pom.xml +++ b/jetty-websocket/websocket-jetty-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml index 40c55e4df219..b2781a8e2a10 100644 --- a/jetty-websocket/websocket-jetty-tests/pom.xml +++ b/jetty-websocket/websocket-jetty-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 2be5507fafe5..15356bdfc4be 100644 --- a/jetty-websocket/websocket-servlet/pom.xml +++ b/jetty-websocket/websocket-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 3dd315d396c8..ed877b8e5498 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index b2d0d4567490..392b65bb27ce 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 Jetty :: Project The Eclipse Jetty Project pom diff --git a/scripts/release-jetty.sh b/scripts/release-jetty.sh index 36af1fdcda97..0e16b5599721 100755 --- a/scripts/release-jetty.sh +++ b/scripts/release-jetty.sh @@ -163,11 +163,6 @@ if proceedyn "Are you sure you want to release using above? (y/N)" n; then # This is equivalent to 'mvn release:perform' if proceedyn "Build/Deploy from tag $TAG_NAME? (Y/n)" y; then mvn clean deploy -Peclipse-release $DEPLOY_OPTS - echo "IMPORTANT NOTICE: You will need to build+deploy jetty-documentation on JDK21 to make the documentation sane!" - echo "Switch to a new window, make sure you are using JDK21, and run the following command:" - echo "$ mvn clean deploy -Peclipse-release $DEPLOY_OPTS -pl :jetty-documentation" - if proceedyn "Did you build and deploy jetty-documentation in JDK21? (y/N)" n; then - fi fi if proceedyn "Update working directory for $VER_NEXT? (Y/n)" y; then echo "Update VERSION.txt for $VER_NEXT" diff --git a/tests/jetty-home-tester/pom.xml b/tests/jetty-home-tester/pom.xml index f6566269dbd3..62d82e794e76 100644 --- a/tests/jetty-home-tester/pom.xml +++ b/tests/jetty-home-tester/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/tests/jetty-http-tools/pom.xml b/tests/jetty-http-tools/pom.xml index 44d49aa6b48d..aeb1b0ba2bed 100644 --- a/tests/jetty-http-tools/pom.xml +++ b/tests/jetty-http-tools/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index 46b1e6e6c353..2d702de06c93 100644 --- a/tests/jetty-jmh/pom.xml +++ b/tests/jetty-jmh/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/tests/pom.xml b/tests/pom.xml index 588ddaca8ca1..4d0fdbc01498 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 10.0.17-SNAPSHOT + 10.0.17 ../pom.xml org.eclipse.jetty.tests diff --git a/tests/test-cdi/pom.xml b/tests/test-cdi/pom.xml index 174989fde947..f46e4a31c1d1 100644 --- a/tests/test-cdi/pom.xml +++ b/tests/test-cdi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 931cc6c126b9..b7f2e08bc7c9 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index 7ad835354d11..6ccaa4b95831 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 2a27e9c59e0f..1c698d827a72 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 test-integration diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml index 3e6bc856bfec..90836e9d579d 100644 --- a/tests/test-jmx/jmx-webapp-it/pom.xml +++ b/tests/test-jmx/jmx-webapp-it/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-jmx-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 jmx-webapp-it diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml index cfa205cd7038..110d60e0275a 100644 --- a/tests/test-jmx/jmx-webapp/pom.xml +++ b/tests/test-jmx/jmx-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-jmx-parent - 10.0.17-SNAPSHOT + 10.0.17 jmx-webapp war diff --git a/tests/test-jmx/pom.xml b/tests/test-jmx/pom.xml index 93f4614eb4fa..ce9134eb710b 100644 --- a/tests/test-jmx/pom.xml +++ b/tests/test-jmx/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 test-jmx-parent diff --git a/tests/test-jpms/pom.xml b/tests/test-jpms/pom.xml index 06a44ea71ad4..7fb8569dd1f1 100644 --- a/tests/test-jpms/pom.xml +++ b/tests/test-jpms/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 test-jpms diff --git a/tests/test-jpms/test-jpms-websocket-core/pom.xml b/tests/test-jpms/test-jpms-websocket-core/pom.xml index 38b3a82ff05b..4449cad13657 100644 --- a/tests/test-jpms/test-jpms-websocket-core/pom.xml +++ b/tests/test-jpms/test-jpms-websocket-core/pom.xml @@ -3,7 +3,7 @@ test-jpms org.eclipse.jetty.tests - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 test-jpms-websocket-core diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 8e735c5f6e93..ddbe77a688e4 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17-SNAPSHOT + 10.0.17 test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index c0a4db38b13d..fc86622a5aff 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17-SNAPSHOT + 10.0.17 ../pom.xml 4.0.0 diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 7a76b211a946..524a2bef045c 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17-SNAPSHOT + 10.0.17 test-sessions-parent Jetty Tests :: Sessions :: Parent diff --git a/tests/test-sessions/test-file-sessions/pom.xml b/tests/test-sessions/test-file-sessions/pom.xml index 814ccf46e98d..68b74fb174bc 100644 --- a/tests/test-sessions/test-file-sessions/pom.xml +++ b/tests/test-sessions/test-file-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 10.0.17-SNAPSHOT + 10.0.17 test-file-sessions Jetty Tests :: Sessions :: File diff --git a/tests/test-sessions/test-gcloud-sessions/pom.xml b/tests/test-sessions/test-gcloud-sessions/pom.xml index 2ed674c544a3..909ff6d560db 100644 --- a/tests/test-sessions/test-gcloud-sessions/pom.xml +++ b/tests/test-sessions/test-gcloud-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 10.0.17-SNAPSHOT + 10.0.17 test-gcloud-sessions Jetty Tests :: Sessions :: GCloud diff --git a/tests/test-sessions/test-hazelcast-sessions/pom.xml b/tests/test-sessions/test-hazelcast-sessions/pom.xml index 96899d230cc8..da4a355821e7 100644 --- a/tests/test-sessions/test-hazelcast-sessions/pom.xml +++ b/tests/test-sessions/test-hazelcast-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 10.0.17-SNAPSHOT + 10.0.17 test-hazelcast-sessions Jetty Tests :: Sessions :: Hazelcast diff --git a/tests/test-sessions/test-infinispan-sessions/pom.xml b/tests/test-sessions/test-infinispan-sessions/pom.xml index 3a407acae986..571933d36106 100644 --- a/tests/test-sessions/test-infinispan-sessions/pom.xml +++ b/tests/test-sessions/test-infinispan-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 10.0.17-SNAPSHOT + 10.0.17 test-infinispan-sessions Jetty Tests :: Sessions :: Infinispan diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index 523edefca5e4..077418ee6bad 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 10.0.17-SNAPSHOT + 10.0.17 test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-memcached-sessions/pom.xml b/tests/test-sessions/test-memcached-sessions/pom.xml index 1589c91b1999..3a4161ebbd66 100644 --- a/tests/test-sessions/test-memcached-sessions/pom.xml +++ b/tests/test-sessions/test-memcached-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 10.0.17-SNAPSHOT + 10.0.17 test-memcached-sessions Jetty Tests :: Sessions :: Memcached diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index 1809506336ca..a9279814ea3e 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 10.0.17-SNAPSHOT + 10.0.17 test-mongodb-sessions Jetty Tests :: Sessions :: Mongo diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index 893a312aea8b..2a5bd1df4554 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 10.0.17-SNAPSHOT + 10.0.17 test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index d1526a2bbb39..bf424d4c6851 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17-SNAPSHOT + 10.0.17 ../pom.xml test-webapps-parent diff --git a/tests/test-webapps/test-bad-websocket-webapp/pom.xml b/tests/test-webapps/test-bad-websocket-webapp/pom.xml index a09ebef2ac61..d6c4e8306b85 100644 --- a/tests/test-webapps/test-bad-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-bad-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/tests/test-webapps/test-cdi-common-webapp/pom.xml b/tests/test-webapps/test-cdi-common-webapp/pom.xml index f3d4d2325f87..0b262554e8fe 100644 --- a/tests/test-webapps/test-cdi-common-webapp/pom.xml +++ b/tests/test-webapps/test-cdi-common-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/tests/test-webapps/test-felix-webapp/pom.xml b/tests/test-webapps/test-felix-webapp/pom.xml index 47e8b055f19f..3f30a961cf1e 100644 --- a/tests/test-webapps/test-felix-webapp/pom.xml +++ b/tests/test-webapps/test-felix-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/tests/test-webapps/test-http2-webapp/pom.xml b/tests/test-webapps/test-http2-webapp/pom.xml index 19bccc0a2cd2..163bcde1a42a 100644 --- a/tests/test-webapps/test-http2-webapp/pom.xml +++ b/tests/test-webapps/test-http2-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/tests/test-webapps/test-openid-webapp/pom.xml b/tests/test-webapps/test-openid-webapp/pom.xml index 6cecffc7687e..f7dc412b0c9a 100644 --- a/tests/test-webapps/test-openid-webapp/pom.xml +++ b/tests/test-webapps/test-openid-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/tests/test-webapps/test-owb-cdi-webapp/pom.xml b/tests/test-webapps/test-owb-cdi-webapp/pom.xml index 817f34e1069b..317f95d05227 100644 --- a/tests/test-webapps/test-owb-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-owb-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/tests/test-webapps/test-simple-session-webapp/pom.xml b/tests/test-webapps/test-simple-session-webapp/pom.xml index 8cf1551738b3..58dacac5032c 100644 --- a/tests/test-webapps/test-simple-session-webapp/pom.xml +++ b/tests/test-webapps/test-simple-session-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17-SNAPSHOT + 10.0.17 test-simple-session-webapp diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 87fd65b0b9d4..2516f3e0e200 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17-SNAPSHOT + 10.0.17 test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 diff --git a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml index c649f062c8b2..6b8370544bd9 100644 --- a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/tests/test-webapps/test-websocket-client-webapp/pom.xml b/tests/test-webapps/test-websocket-client-webapp/pom.xml index 2572565c30b3..4ad4d1a52f98 100644 --- a/tests/test-webapps/test-websocket-client-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/tests/test-webapps/test-websocket-webapp/pom.xml b/tests/test-webapps/test-websocket-webapp/pom.xml index 6dd368e740bf..70fc8d335c3b 100644 --- a/tests/test-webapps/test-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/tests/test-webapps/test-weld-cdi-webapp/pom.xml b/tests/test-webapps/test-weld-cdi-webapp/pom.xml index b3e74cf28731..8ac4696edfb0 100644 --- a/tests/test-webapps/test-weld-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-weld-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 diff --git a/tests/test-websocket-autobahn/pom.xml b/tests/test-websocket-autobahn/pom.xml index bfff37db58a1..14d452fed450 100644 --- a/tests/test-websocket-autobahn/pom.xml +++ b/tests/test-websocket-autobahn/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17-SNAPSHOT + 10.0.17 4.0.0 From 722b97ad6a2e692b46caf7bde5c05ce2666e3e0d Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 9 Oct 2023 13:32:28 -0500 Subject: [PATCH 20/31] Updating to version 10.0.18-SNAPSHOT --- VERSION.txt | 2 + apache-jsp/pom.xml | 2 +- apache-jstl/pom.xml | 2 +- build-resources/pom.xml | 2 +- .../demo-async-rest-jar/pom.xml | 2 +- .../demo-async-rest-server/pom.xml | 2 +- .../demo-async-rest-webapp/pom.xml | 2 +- demos/demo-async-rest/pom.xml | 2 +- demos/demo-jaas-webapp/pom.xml | 2 +- demos/demo-jetty-webapp/pom.xml | 2 +- demos/demo-jndi-webapp/pom.xml | 2 +- demos/demo-jsp-webapp/pom.xml | 2 +- demos/demo-mock-resources/pom.xml | 2 +- demos/demo-proxy-webapp/pom.xml | 2 +- demos/demo-simple-webapp/pom.xml | 2 +- .../demo-container-initializer/pom.xml | 2 +- demos/demo-spec/demo-spec-webapp/pom.xml | 2 +- demos/demo-spec/demo-web-fragment/pom.xml | 2 +- demos/demo-spec/pom.xml | 2 +- demos/embedded/pom.xml | 2 +- demos/pom.xml | 2 +- .../jetty-asciidoctor-extensions/pom.xml | 2 +- documentation/jetty-documentation/pom.xml | 2 +- documentation/pom.xml | 2 +- javadoc/pom.xml | 2 +- jetty-alpn/jetty-alpn-client/pom.xml | 2 +- .../jetty-alpn-conscrypt-client/pom.xml | 2 +- .../jetty-alpn-conscrypt-server/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-client/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-server/pom.xml | 2 +- jetty-alpn/jetty-alpn-server/pom.xml | 2 +- jetty-alpn/pom.xml | 2 +- jetty-annotations/pom.xml | 2 +- jetty-ant/pom.xml | 2 +- jetty-bom/pom.xml | 166 +++++++++--------- jetty-cdi/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-fcgi/fcgi-client/pom.xml | 2 +- jetty-fcgi/fcgi-server/pom.xml | 2 +- jetty-fcgi/pom.xml | 2 +- .../jetty-gcloud-session-manager/pom.xml | 2 +- jetty-gcloud/pom.xml | 2 +- jetty-hazelcast/pom.xml | 2 +- jetty-home/pom.xml | 2 +- jetty-http-spi/pom.xml | 2 +- jetty-http/pom.xml | 2 +- jetty-http2/http2-client/pom.xml | 2 +- jetty-http2/http2-common/pom.xml | 2 +- jetty-http2/http2-hpack/pom.xml | 2 +- .../http2-http-client-transport/pom.xml | 2 +- jetty-http2/http2-server/pom.xml | 2 +- jetty-http2/pom.xml | 2 +- jetty-http3/http3-client/pom.xml | 2 +- jetty-http3/http3-common/pom.xml | 2 +- .../http3-http-client-transport/pom.xml | 2 +- jetty-http3/http3-qpack/pom.xml | 2 +- jetty-http3/http3-server/pom.xml | 2 +- jetty-http3/http3-tests/pom.xml | 2 +- jetty-http3/pom.xml | 2 +- jetty-infinispan/infinispan-common/pom.xml | 2 +- .../infinispan-embedded-query/pom.xml | 2 +- jetty-infinispan/infinispan-embedded/pom.xml | 2 +- .../infinispan-remote-query/pom.xml | 2 +- jetty-infinispan/infinispan-remote/pom.xml | 2 +- jetty-infinispan/pom.xml | 2 +- jetty-io/pom.xml | 2 +- jetty-jaas/pom.xml | 2 +- jetty-jaspi/pom.xml | 2 +- jetty-jmx/pom.xml | 2 +- jetty-jndi/pom.xml | 2 +- jetty-jspc-maven-plugin/pom.xml | 2 +- jetty-keystore/pom.xml | 2 +- jetty-maven-plugin/pom.xml | 2 +- .../jetty-memcached-sessions/pom.xml | 2 +- jetty-memcached/pom.xml | 2 +- jetty-nosql/pom.xml | 2 +- jetty-openid/pom.xml | 2 +- jetty-osgi/jetty-osgi-alpn/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot/pom.xml | 2 +- jetty-osgi/jetty-osgi-httpservice/pom.xml | 2 +- jetty-osgi/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-context/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-fragment/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-server/pom.xml | 2 +- .../test-jetty-osgi-webapp-resources/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-webapp/pom.xml | 2 +- jetty-osgi/test-jetty-osgi/pom.xml | 2 +- jetty-p2/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-proxy/pom.xml | 2 +- jetty-quic/pom.xml | 2 +- jetty-quic/quic-client/pom.xml | 2 +- jetty-quic/quic-common/pom.xml | 2 +- jetty-quic/quic-quiche/pom.xml | 2 +- .../quic-quiche/quic-quiche-common/pom.xml | 2 +- .../quic-quiche-foreign-incubator/pom.xml | 2 +- .../quic-quiche/quic-quiche-jna/pom.xml | 2 +- jetty-quic/quic-server/pom.xml | 2 +- jetty-quickstart/pom.xml | 2 +- jetty-rewrite/pom.xml | 2 +- jetty-runner/pom.xml | 2 +- jetty-security/pom.xml | 2 +- jetty-server/pom.xml | 2 +- jetty-servlet/pom.xml | 2 +- jetty-servlets/pom.xml | 2 +- jetty-slf4j-impl/pom.xml | 2 +- jetty-start/pom.xml | 2 +- jetty-unixdomain-server/pom.xml | 2 +- .../jetty-unixsocket-client/pom.xml | 2 +- .../jetty-unixsocket-common/pom.xml | 2 +- .../jetty-unixsocket-server/pom.xml | 2 +- jetty-unixsocket/pom.xml | 2 +- jetty-util-ajax/pom.xml | 2 +- jetty-util/pom.xml | 2 +- jetty-webapp/pom.xml | 2 +- jetty-websocket/pom.xml | 2 +- jetty-websocket/websocket-core-client/pom.xml | 2 +- jetty-websocket/websocket-core-common/pom.xml | 2 +- jetty-websocket/websocket-core-server/pom.xml | 2 +- jetty-websocket/websocket-core-tests/pom.xml | 2 +- .../websocket-javax-client/pom.xml | 2 +- .../websocket-javax-common/pom.xml | 2 +- .../websocket-javax-server/pom.xml | 2 +- jetty-websocket/websocket-javax-tests/pom.xml | 2 +- jetty-websocket/websocket-jetty-api/pom.xml | 2 +- .../websocket-jetty-client/pom.xml | 2 +- .../websocket-jetty-common/pom.xml | 2 +- .../websocket-jetty-server/pom.xml | 2 +- jetty-websocket/websocket-jetty-tests/pom.xml | 2 +- jetty-websocket/websocket-servlet/pom.xml | 2 +- jetty-xml/pom.xml | 2 +- pom.xml | 2 +- tests/jetty-home-tester/pom.xml | 2 +- tests/jetty-http-tools/pom.xml | 2 +- tests/jetty-jmh/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-cdi/pom.xml | 2 +- tests/test-distribution/pom.xml | 2 +- tests/test-http-client-transport/pom.xml | 2 +- tests/test-integration/pom.xml | 2 +- tests/test-jmx/jmx-webapp-it/pom.xml | 2 +- tests/test-jmx/jmx-webapp/pom.xml | 2 +- tests/test-jmx/pom.xml | 2 +- tests/test-jpms/pom.xml | 2 +- .../test-jpms-websocket-core/pom.xml | 2 +- tests/test-loginservice/pom.xml | 2 +- tests/test-quickstart/pom.xml | 2 +- tests/test-sessions/pom.xml | 2 +- .../test-sessions/test-file-sessions/pom.xml | 2 +- .../test-gcloud-sessions/pom.xml | 2 +- .../test-hazelcast-sessions/pom.xml | 2 +- .../test-infinispan-sessions/pom.xml | 2 +- .../test-sessions/test-jdbc-sessions/pom.xml | 2 +- .../test-memcached-sessions/pom.xml | 2 +- .../test-mongodb-sessions/pom.xml | 2 +- .../test-sessions-common/pom.xml | 2 +- tests/test-webapps/pom.xml | 2 +- .../test-bad-websocket-webapp/pom.xml | 2 +- .../test-cdi-common-webapp/pom.xml | 2 +- tests/test-webapps/test-felix-webapp/pom.xml | 2 +- tests/test-webapps/test-http2-webapp/pom.xml | 2 +- tests/test-webapps/test-openid-webapp/pom.xml | 2 +- .../test-webapps/test-owb-cdi-webapp/pom.xml | 2 +- .../test-simple-session-webapp/pom.xml | 2 +- .../test-webapps/test-webapp-rfc2616/pom.xml | 2 +- .../pom.xml | 2 +- .../test-websocket-client-webapp/pom.xml | 2 +- .../test-websocket-webapp/pom.xml | 2 +- .../test-webapps/test-weld-cdi-webapp/pom.xml | 2 +- tests/test-websocket-autobahn/pom.xml | 2 +- 173 files changed, 256 insertions(+), 254 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index d3ac90b22835..2e02f1ed0aad 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,5 @@ +jetty-10.0.18-SNAPSHOT + jetty-10.0.17 - 09 October 2023 + 9777 CrossOriginFilter does not return Vary header on no-cors mode + 9928 Backport `Request.getBeginNanoTime()` diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index 74257c1cbd47..1d47e727b64a 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml index 2bd08fd144b5..ed58080f87fe 100644 --- a/apache-jstl/pom.xml +++ b/apache-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 apache-jstl diff --git a/build-resources/pom.xml b/build-resources/pom.xml index 92c632cf9477..72ff0394f912 100644 --- a/build-resources/pom.xml +++ b/build-resources/pom.xml @@ -7,7 +7,7 @@ --> org.eclipse.jetty build-resources - 10.0.17 + 10.0.18-SNAPSHOT Jetty :: Build Resources jar diff --git a/demos/demo-async-rest/demo-async-rest-jar/pom.xml b/demos/demo-async-rest/demo-async-rest-jar/pom.xml index 7d3639ebfed9..4e5511cf5d59 100644 --- a/demos/demo-async-rest/demo-async-rest-jar/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-jar/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/demos/demo-async-rest/demo-async-rest-server/pom.xml b/demos/demo-async-rest/demo-async-rest-server/pom.xml index ff947402dda7..dd7d0511533e 100644 --- a/demos/demo-async-rest/demo-async-rest-server/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml index 63b1d07622f1..811fd157944e 100644 --- a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/demos/demo-async-rest/pom.xml b/demos/demo-async-rest/pom.xml index fae4cb057e0b..df5aca0689aa 100644 --- a/demos/demo-async-rest/pom.xml +++ b/demos/demo-async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/demos/demo-jaas-webapp/pom.xml b/demos/demo-jaas-webapp/pom.xml index 1013fe35b970..51904cb5d320 100644 --- a/demos/demo-jaas-webapp/pom.xml +++ b/demos/demo-jaas-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17 + 10.0.18-SNAPSHOT demo-jaas-webapp Demo :: JAAS :: WebApp diff --git a/demos/demo-jetty-webapp/pom.xml b/demos/demo-jetty-webapp/pom.xml index eb81f099a2e0..ad5aff947a75 100644 --- a/demos/demo-jetty-webapp/pom.xml +++ b/demos/demo-jetty-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17 + 10.0.18-SNAPSHOT ../pom.xml 4.0.0 diff --git a/demos/demo-jndi-webapp/pom.xml b/demos/demo-jndi-webapp/pom.xml index 14fe383deab0..5432230e71fe 100644 --- a/demos/demo-jndi-webapp/pom.xml +++ b/demos/demo-jndi-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17 + 10.0.18-SNAPSHOT demo-jndi-webapp Demo :: JNDI :: WebApp diff --git a/demos/demo-jsp-webapp/pom.xml b/demos/demo-jsp-webapp/pom.xml index ba6829b91d68..94348e9d21de 100644 --- a/demos/demo-jsp-webapp/pom.xml +++ b/demos/demo-jsp-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/demos/demo-mock-resources/pom.xml b/demos/demo-mock-resources/pom.xml index 25617107d2c0..1b52e9711e50 100644 --- a/demos/demo-mock-resources/pom.xml +++ b/demos/demo-mock-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17 + 10.0.18-SNAPSHOT Demo :: Mock Resources demo-mock-resources diff --git a/demos/demo-proxy-webapp/pom.xml b/demos/demo-proxy-webapp/pom.xml index 8ac819104117..6bc6f3ee2e4b 100644 --- a/demos/demo-proxy-webapp/pom.xml +++ b/demos/demo-proxy-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 demo-proxy-webapp diff --git a/demos/demo-simple-webapp/pom.xml b/demos/demo-simple-webapp/pom.xml index 8d96855e323a..661ebb0b86fb 100644 --- a/demos/demo-simple-webapp/pom.xml +++ b/demos/demo-simple-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/demos/demo-spec/demo-container-initializer/pom.xml b/demos/demo-spec/demo-container-initializer/pom.xml index 3e46164ea9ed..3f27d91d14d0 100644 --- a/demos/demo-spec/demo-container-initializer/pom.xml +++ b/demos/demo-spec/demo-container-initializer/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17 + 10.0.18-SNAPSHOT ../../pom.xml demo-container-initializer diff --git a/demos/demo-spec/demo-spec-webapp/pom.xml b/demos/demo-spec/demo-spec-webapp/pom.xml index c679343db3c4..3840a37f732f 100644 --- a/demos/demo-spec/demo-spec-webapp/pom.xml +++ b/demos/demo-spec/demo-spec-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17 + 10.0.18-SNAPSHOT ../../pom.xml Demo :: Servlet Spec :: Webapp diff --git a/demos/demo-spec/demo-web-fragment/pom.xml b/demos/demo-spec/demo-web-fragment/pom.xml index a31e09af11f4..c28177e0c4cc 100644 --- a/demos/demo-spec/demo-web-fragment/pom.xml +++ b/demos/demo-spec/demo-web-fragment/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17 + 10.0.18-SNAPSHOT ../../pom.xml diff --git a/demos/demo-spec/pom.xml b/demos/demo-spec/pom.xml index 2840e8f47dd4..c8eb9bf3db20 100644 --- a/demos/demo-spec/pom.xml +++ b/demos/demo-spec/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17 + 10.0.18-SNAPSHOT Demo :: Servlet Spec demo-spec diff --git a/demos/embedded/pom.xml b/demos/embedded/pom.xml index 452a34047180..659caed045f0 100644 --- a/demos/embedded/pom.xml +++ b/demos/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 demos-jetty-embedded diff --git a/demos/pom.xml b/demos/pom.xml index 22ca00084abc..4ca99df64a42 100644 --- a/demos/pom.xml +++ b/demos/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml index 73ee41046a70..d5e5fedc3f8e 100644 --- a/documentation/jetty-asciidoctor-extensions/pom.xml +++ b/documentation/jetty-asciidoctor-extensions/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.documentation documentation-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index c59d68239904..9126f03865ee 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.documentation documentation-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/documentation/pom.xml b/documentation/pom.xml index 2374ffadd4d8..723b85bc651d 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/javadoc/pom.xml b/javadoc/pom.xml index e68597d1b40c..6ec339c293ed 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index 59acb992d13d..6ac95a738565 100644 --- a/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-alpn/jetty-alpn-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-alpn-client diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index 7a7e35610772..77cd6483148e 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index b62bf61ebd31..62214b4c53d9 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index 2981fc87f47e..6111820e03e5 100644 --- a/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index 89427dc82128..c660d7fe6376 100644 --- a/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index 12376841a0c9..2a08d9e57182 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-alpn-server diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index 0a22f496de1a..934db68c826d 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-alpn-parent diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 5ca33cf177a2..e29343599ed1 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 229616a54e7f..9c91e1d0365a 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-ant diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index d0d3dd314662..63dda2f9675e 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT jetty-bom @@ -53,409 +53,409 @@ org.eclipse.jetty apache-jsp - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty apache-jstl - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-alpn-client - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-alpn-java-client - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-alpn-java-server - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-alpn-conscrypt-client - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-alpn-conscrypt-server - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-alpn-server - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-annotations - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-ant - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-client - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-cdi - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-deploy - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.fcgi fcgi-client - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.fcgi fcgi-server - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.gcloud jetty-gcloud-session-manager - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-home - 10.0.17 + 10.0.18-SNAPSHOT zip org.eclipse.jetty jetty-home - 10.0.17 + 10.0.18-SNAPSHOT tar.gz org.eclipse.jetty jetty-http - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.http2 http2-client - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.http2 http2-common - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.http2 http2-hpack - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.http2 http2-http-client-transport - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.http2 http2-server - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.http3 http3-client - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.http3 http3-common - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.http3 http3-http-client-transport - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.http3 http3-qpack - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.http3 http3-server - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-http-spi - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty infinispan-common - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty infinispan-remote-query - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty infinispan-embedded-query - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-hazelcast - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-io - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-jaas - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-jaspi - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-jmx - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-jndi - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-keystore - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.memcached jetty-memcached-sessions - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-nosql - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-alpn - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-boot - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-boot-jsp - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-boot-warurl - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.quic quic-client - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.quic quic-common - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.quic quic-quiche-common - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.quic quic-quiche-jna - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.quic quic-server - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.osgi jetty-httpservice - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-plus - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-proxy - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-quickstart - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-rewrite - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-security - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-openid - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-server - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-servlet - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-servlets - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-slf4j-impl - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-unixdomain-server - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-unixsocket-common - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-unixsocket-client - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-unixsocket-server - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-util - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-util-ajax - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-webapp - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-javax-client - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-javax-server - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-javax-common - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-jetty-api - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-jetty-client - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-jetty-common - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-jetty-server - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-servlet - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-core-common - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-core-client - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-core-server - 10.0.17 + 10.0.18-SNAPSHOT org.eclipse.jetty jetty-xml - 10.0.17 + 10.0.18-SNAPSHOT @@ -471,7 +471,7 @@ org.eclipse.jetty.quic quic-quiche-foreign-incubator - 10.0.17 + 10.0.18-SNAPSHOT diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index 2edaccf5288f..a6ed91de7dbc 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 3c48cc2f8355..d9744dc968c2 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 1c1567a6c2c9..be078b68cf07 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index 0650cff7fa8f..9cb4061f4852 100644 --- a/jetty-fcgi/fcgi-client/pom.xml +++ b/jetty-fcgi/fcgi-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi fcgi-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index 178938b53e1f..5727d6ff18a7 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi fcgi-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml index ed510e80629f..3da5d27f760a 100644 --- a/jetty-fcgi/pom.xml +++ b/jetty-fcgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index bbef903d353d..0c9f8fb1d7aa 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.gcloud gcloud-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index a5e96393e4f5..f84c9f0cf03e 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index cd7438fb74fb..4d621a17090b 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 434bc74a9b82..c473f7685cc5 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-home diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 06d2c82cddcb..4c05259e0985 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 43d9d1fa9341..55c19958fa30 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index c7177ecb3e50..97ac0946b214 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index 4f0977f4065f..395d006ca70d 100644 --- a/jetty-http2/http2-common/pom.xml +++ b/jetty-http2/http2-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index e50cdd99318e..0c0c2e4bffd4 100644 --- a/jetty-http2/http2-hpack/pom.xml +++ b/jetty-http2/http2-hpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index c7911cc35a1f..6a9cada04681 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 862f6ae04de0..66137121c907 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml index bf0aadedc3e2..2b1773fb506a 100644 --- a/jetty-http2/pom.xml +++ b/jetty-http2/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-client/pom.xml b/jetty-http3/http3-client/pom.xml index f7030657fbab..5125660e855f 100644 --- a/jetty-http3/http3-client/pom.xml +++ b/jetty-http3/http3-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-common/pom.xml b/jetty-http3/http3-common/pom.xml index 4a8d9fcdf575..9373e0226f7e 100644 --- a/jetty-http3/http3-common/pom.xml +++ b/jetty-http3/http3-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-http-client-transport/pom.xml b/jetty-http3/http3-http-client-transport/pom.xml index e0b80da4e8b9..119da47395ea 100644 --- a/jetty-http3/http3-http-client-transport/pom.xml +++ b/jetty-http3/http3-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-qpack/pom.xml b/jetty-http3/http3-qpack/pom.xml index b473e5b4a020..59d91575a67d 100644 --- a/jetty-http3/http3-qpack/pom.xml +++ b/jetty-http3/http3-qpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-server/pom.xml b/jetty-http3/http3-server/pom.xml index dc8258fff1d2..3b00bfeaf21b 100644 --- a/jetty-http3/http3-server/pom.xml +++ b/jetty-http3/http3-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-tests/pom.xml b/jetty-http3/http3-tests/pom.xml index 93c70d202692..9047a0d36913 100644 --- a/jetty-http3/http3-tests/pom.xml +++ b/jetty-http3/http3-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http3/pom.xml b/jetty-http3/pom.xml index 88039cb86bb2..85191d3fadb3 100644 --- a/jetty-http3/pom.xml +++ b/jetty-http3/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml index c99f6eef5f55..a8ecdc1d1555 100644 --- a/jetty-infinispan/infinispan-common/pom.xml +++ b/jetty-infinispan/infinispan-common/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 infinispan-common diff --git a/jetty-infinispan/infinispan-embedded-query/pom.xml b/jetty-infinispan/infinispan-embedded-query/pom.xml index f8f10082152e..a690fa8539f9 100644 --- a/jetty-infinispan/infinispan-embedded-query/pom.xml +++ b/jetty-infinispan/infinispan-embedded-query/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 infinispan-embedded-query diff --git a/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-infinispan/infinispan-embedded/pom.xml index f4b749e45156..4dbdd34ec515 100644 --- a/jetty-infinispan/infinispan-embedded/pom.xml +++ b/jetty-infinispan/infinispan-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 infinispan-embedded diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml index a3d484d5702d..0397b73d3082 100644 --- a/jetty-infinispan/infinispan-remote-query/pom.xml +++ b/jetty-infinispan/infinispan-remote-query/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 infinispan-remote-query diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml index c80af76ab338..5b4376c70c60 100644 --- a/jetty-infinispan/infinispan-remote/pom.xml +++ b/jetty-infinispan/infinispan-remote/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 infinispan-remote diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml index 0c1290c5c73d..219199ea65b5 100644 --- a/jetty-infinispan/pom.xml +++ b/jetty-infinispan/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index a17622ace59d..7501553edd25 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index dcb789e79d0d..f4c6bbeb1bf1 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 98c09be9be1e..97a3cd24acd0 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 39fb9eb37594..85607c4a699b 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index dabbba1ae1d7..c4a763b2a5a7 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index b4ebe4a68a9a..88c5909663c1 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-keystore/pom.xml b/jetty-keystore/pom.xml index cf0e68784ad6..30b3ba452d3a 100644 --- a/jetty-keystore/pom.xml +++ b/jetty-keystore/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-keystore diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index f44cc22894a8..b52790327476 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-maven-plugin diff --git a/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-memcached/jetty-memcached-sessions/pom.xml index efa187e1c302..70f2a8c6dcc9 100644 --- a/jetty-memcached/jetty-memcached-sessions/pom.xml +++ b/jetty-memcached/jetty-memcached-sessions/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.memcached memcached-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-memcached/pom.xml b/jetty-memcached/pom.xml index 8ed79b98f3df..5693c2f89188 100644 --- a/jetty-memcached/pom.xml +++ b/jetty-memcached/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 83e025829e19..22a6d5f9bbb4 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-nosql diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index 8389aeb8288a..01262c49ffd9 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml index 025295ad03be..f5c4764d0eee 100644 --- a/jetty-osgi/jetty-osgi-alpn/pom.xml +++ b/jetty-osgi/jetty-osgi-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17 + 10.0.18-SNAPSHOT diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 40bb71338f51..61efd50bf0ad 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-osgi-boot-jsp diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index 8caa1907472b..360f51fc566e 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17 + 10.0.18-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index bd9ea1934dd7..277f72cc8391 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-osgi-boot diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index 501b4132bf3c..1ba1e2acfd6c 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-httpservice diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index b07c3868ae79..3d9af2a88888 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index f31247b5cc49..a23c1b35e096 100644 --- a/jetty-osgi/test-jetty-osgi-context/pom.xml +++ b/jetty-osgi/test-jetty-osgi-context/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 test-jetty-osgi-context diff --git a/jetty-osgi/test-jetty-osgi-fragment/pom.xml b/jetty-osgi/test-jetty-osgi-fragment/pom.xml index 5e16035277dd..7155a7d6ad33 100644 --- a/jetty-osgi/test-jetty-osgi-fragment/pom.xml +++ b/jetty-osgi/test-jetty-osgi-fragment/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17 + 10.0.18-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-server/pom.xml b/jetty-osgi/test-jetty-osgi-server/pom.xml index 84d8b8921a4f..f60dc05653c4 100644 --- a/jetty-osgi/test-jetty-osgi-server/pom.xml +++ b/jetty-osgi/test-jetty-osgi-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 test-jetty-osgi-server diff --git a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml index 1ca1fd529d2f..a93c80d01f0e 100644 --- a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 test-jetty-osgi-webapp-resources diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index 03bbb9926b50..39f6616b1fcf 100644 --- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17 + 10.0.18-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 4c1e63518a4b..ee52e42e54a4 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.17 + 10.0.18-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml index a1e683ba9c14..a8911aa74b71 100644 --- a/jetty-p2/pom.xml +++ b/jetty-p2/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-p2 diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 91dd2e7c2414..b38160a37e63 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index d7a135c8323c..5bd2685f1152 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quic/pom.xml b/jetty-quic/pom.xml index ae45e42cdf01..4e0b93d423aa 100644 --- a/jetty-quic/pom.xml +++ b/jetty-quic/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-client/pom.xml b/jetty-quic/quic-client/pom.xml index d2d9aed2529d..30bd162d3478 100644 --- a/jetty-quic/quic-client/pom.xml +++ b/jetty-quic/quic-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-common/pom.xml b/jetty-quic/quic-common/pom.xml index dc797a77d3ac..7ccf23329c3a 100644 --- a/jetty-quic/quic-common/pom.xml +++ b/jetty-quic/quic-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-quiche/pom.xml b/jetty-quic/quic-quiche/pom.xml index 532dc212319b..94506893b64b 100644 --- a/jetty-quic/quic-quiche/pom.xml +++ b/jetty-quic/quic-quiche/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-common/pom.xml b/jetty-quic/quic-quiche/quic-quiche-common/pom.xml index 574d81025327..68402d8278fd 100644 --- a/jetty-quic/quic-quiche/quic-quiche-common/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml index 133a1fd86521..23671aabb396 100644 --- a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml b/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml index 96beb6fef5c3..7b7862cd6fa4 100644 --- a/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-server/pom.xml b/jetty-quic/quic-server/pom.xml index d47e4fec9718..6887a21bd11e 100644 --- a/jetty-quic/quic-server/pom.xml +++ b/jetty-quic/quic-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index 51a2af087abc..60c868a320a1 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index c11d6ed8c1a2..4815dc35d02d 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index c855d1dd5795..ef46a34efb6f 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-runner diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 6a316fe5a36a..e9d08f856558 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index ced93e89bbb3..218d069c329b 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index c367a6e62527..d4859e424b46 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index de7dbac1af82..9108a37237b3 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-slf4j-impl/pom.xml b/jetty-slf4j-impl/pom.xml index 42cf10d6b37d..73230798256b 100644 --- a/jetty-slf4j-impl/pom.xml +++ b/jetty-slf4j-impl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 60b6a96568d6..156316332120 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-start diff --git a/jetty-unixdomain-server/pom.xml b/jetty-unixdomain-server/pom.xml index 0b601a41014c..0e4850fe096e 100644 --- a/jetty-unixdomain-server/pom.xml +++ b/jetty-unixdomain-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-client/pom.xml b/jetty-unixsocket/jetty-unixsocket-client/pom.xml index a5badf7c0ca6..045e63336e6a 100644 --- a/jetty-unixsocket/jetty-unixsocket-client/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-client/pom.xml @@ -3,7 +3,7 @@ jetty-unixsocket org.eclipse.jetty - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-common/pom.xml b/jetty-unixsocket/jetty-unixsocket-common/pom.xml index 3ca5770dd55d..a9e7c442894b 100644 --- a/jetty-unixsocket/jetty-unixsocket-common/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-unixsocket - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-server/pom.xml b/jetty-unixsocket/jetty-unixsocket-server/pom.xml index 998642b99e58..04ab262436c4 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/pom.xml @@ -3,7 +3,7 @@ jetty-unixsocket org.eclipse.jetty - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-unixsocket/pom.xml b/jetty-unixsocket/pom.xml index cf75d993e302..7c949d67b498 100644 --- a/jetty-unixsocket/pom.xml +++ b/jetty-unixsocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index eb46b8f813c2..9f1faa385292 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index a3f27f9582b4..44bab2c687b4 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 051f09a16013..d6cbd99b6b0e 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index d5f7a4a75562..1989c6c36066 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-core-client/pom.xml b/jetty-websocket/websocket-core-client/pom.xml index 6b0873c3aa65..cb1e94aaf160 100644 --- a/jetty-websocket/websocket-core-client/pom.xml +++ b/jetty-websocket/websocket-core-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-core-common/pom.xml b/jetty-websocket/websocket-core-common/pom.xml index f32c26b7af95..4c8ce28e313c 100644 --- a/jetty-websocket/websocket-core-common/pom.xml +++ b/jetty-websocket/websocket-core-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-core-server/pom.xml b/jetty-websocket/websocket-core-server/pom.xml index 57f3b3efe91b..b79d016e0929 100644 --- a/jetty-websocket/websocket-core-server/pom.xml +++ b/jetty-websocket/websocket-core-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-core-tests/pom.xml b/jetty-websocket/websocket-core-tests/pom.xml index aae4571059eb..34beb78de4fd 100644 --- a/jetty-websocket/websocket-core-tests/pom.xml +++ b/jetty-websocket/websocket-core-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-javax-client/pom.xml b/jetty-websocket/websocket-javax-client/pom.xml index cc09aee66086..d88266a518bc 100644 --- a/jetty-websocket/websocket-javax-client/pom.xml +++ b/jetty-websocket/websocket-javax-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-javax-common/pom.xml b/jetty-websocket/websocket-javax-common/pom.xml index 4fb7f9eac7cd..71abdaafcf29 100644 --- a/jetty-websocket/websocket-javax-common/pom.xml +++ b/jetty-websocket/websocket-javax-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-javax-server/pom.xml b/jetty-websocket/websocket-javax-server/pom.xml index f628cfe65349..7433e97408c8 100644 --- a/jetty-websocket/websocket-javax-server/pom.xml +++ b/jetty-websocket/websocket-javax-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-javax-tests/pom.xml b/jetty-websocket/websocket-javax-tests/pom.xml index 5bc292d0e445..57f9f669fc29 100644 --- a/jetty-websocket/websocket-javax-tests/pom.xml +++ b/jetty-websocket/websocket-javax-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jetty-api/pom.xml b/jetty-websocket/websocket-jetty-api/pom.xml index 9923224a7d39..90c2a8e9533b 100644 --- a/jetty-websocket/websocket-jetty-api/pom.xml +++ b/jetty-websocket/websocket-jetty-api/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jetty-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml index f9da9f3e9391..6358fc7c238b 100644 --- a/jetty-websocket/websocket-jetty-client/pom.xml +++ b/jetty-websocket/websocket-jetty-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jetty-common/pom.xml b/jetty-websocket/websocket-jetty-common/pom.xml index 822b05f09d34..f8f8032c54ce 100644 --- a/jetty-websocket/websocket-jetty-common/pom.xml +++ b/jetty-websocket/websocket-jetty-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jetty-server/pom.xml b/jetty-websocket/websocket-jetty-server/pom.xml index b0532302ff4f..199a26dc72b3 100644 --- a/jetty-websocket/websocket-jetty-server/pom.xml +++ b/jetty-websocket/websocket-jetty-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml index b2781a8e2a10..3a6b151411e1 100644 --- a/jetty-websocket/websocket-jetty-tests/pom.xml +++ b/jetty-websocket/websocket-jetty-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 15356bdfc4be..387cbb164e05 100644 --- a/jetty-websocket/websocket-servlet/pom.xml +++ b/jetty-websocket/websocket-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index ed877b8e5498..3df18e4e7cfc 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 392b65bb27ce..3cb48f2aa2a8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT Jetty :: Project The Eclipse Jetty Project pom diff --git a/tests/jetty-home-tester/pom.xml b/tests/jetty-home-tester/pom.xml index 62d82e794e76..a282d70ed019 100644 --- a/tests/jetty-home-tester/pom.xml +++ b/tests/jetty-home-tester/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/tests/jetty-http-tools/pom.xml b/tests/jetty-http-tools/pom.xml index aeb1b0ba2bed..efb24c0f8dba 100644 --- a/tests/jetty-http-tools/pom.xml +++ b/tests/jetty-http-tools/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index 2d702de06c93..9e5b7be7ae2f 100644 --- a/tests/jetty-jmh/pom.xml +++ b/tests/jetty-jmh/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/tests/pom.xml b/tests/pom.xml index 4d0fdbc01498..39a2bc80fbdf 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 10.0.17 + 10.0.18-SNAPSHOT ../pom.xml org.eclipse.jetty.tests diff --git a/tests/test-cdi/pom.xml b/tests/test-cdi/pom.xml index f46e4a31c1d1..f7cb4d7b7ccf 100644 --- a/tests/test-cdi/pom.xml +++ b/tests/test-cdi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index b7f2e08bc7c9..bee553a4a881 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index 6ccaa4b95831..9a383b291ff7 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 1c698d827a72..759e67e21ae0 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 test-integration diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml index 90836e9d579d..563ddb79eb67 100644 --- a/tests/test-jmx/jmx-webapp-it/pom.xml +++ b/tests/test-jmx/jmx-webapp-it/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-jmx-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 jmx-webapp-it diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml index 110d60e0275a..8e12caf1661e 100644 --- a/tests/test-jmx/jmx-webapp/pom.xml +++ b/tests/test-jmx/jmx-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-jmx-parent - 10.0.17 + 10.0.18-SNAPSHOT jmx-webapp war diff --git a/tests/test-jmx/pom.xml b/tests/test-jmx/pom.xml index ce9134eb710b..7544e8956c70 100644 --- a/tests/test-jmx/pom.xml +++ b/tests/test-jmx/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 test-jmx-parent diff --git a/tests/test-jpms/pom.xml b/tests/test-jpms/pom.xml index 7fb8569dd1f1..acb827f226b8 100644 --- a/tests/test-jpms/pom.xml +++ b/tests/test-jpms/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 test-jpms diff --git a/tests/test-jpms/test-jpms-websocket-core/pom.xml b/tests/test-jpms/test-jpms-websocket-core/pom.xml index 4449cad13657..1974b48ee9f1 100644 --- a/tests/test-jpms/test-jpms-websocket-core/pom.xml +++ b/tests/test-jpms/test-jpms-websocket-core/pom.xml @@ -3,7 +3,7 @@ test-jpms org.eclipse.jetty.tests - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 test-jpms-websocket-core diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index ddbe77a688e4..0fc4922483ea 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17 + 10.0.18-SNAPSHOT test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index fc86622a5aff..0fe4878d21ab 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17 + 10.0.18-SNAPSHOT ../pom.xml 4.0.0 diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 524a2bef045c..9702b516aa51 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17 + 10.0.18-SNAPSHOT test-sessions-parent Jetty Tests :: Sessions :: Parent diff --git a/tests/test-sessions/test-file-sessions/pom.xml b/tests/test-sessions/test-file-sessions/pom.xml index 68b74fb174bc..e7e7138eb35d 100644 --- a/tests/test-sessions/test-file-sessions/pom.xml +++ b/tests/test-sessions/test-file-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 10.0.17 + 10.0.18-SNAPSHOT test-file-sessions Jetty Tests :: Sessions :: File diff --git a/tests/test-sessions/test-gcloud-sessions/pom.xml b/tests/test-sessions/test-gcloud-sessions/pom.xml index 909ff6d560db..50c501856dab 100644 --- a/tests/test-sessions/test-gcloud-sessions/pom.xml +++ b/tests/test-sessions/test-gcloud-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 10.0.17 + 10.0.18-SNAPSHOT test-gcloud-sessions Jetty Tests :: Sessions :: GCloud diff --git a/tests/test-sessions/test-hazelcast-sessions/pom.xml b/tests/test-sessions/test-hazelcast-sessions/pom.xml index da4a355821e7..7bfbfda5cebb 100644 --- a/tests/test-sessions/test-hazelcast-sessions/pom.xml +++ b/tests/test-sessions/test-hazelcast-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 10.0.17 + 10.0.18-SNAPSHOT test-hazelcast-sessions Jetty Tests :: Sessions :: Hazelcast diff --git a/tests/test-sessions/test-infinispan-sessions/pom.xml b/tests/test-sessions/test-infinispan-sessions/pom.xml index 571933d36106..e9c02828f9b0 100644 --- a/tests/test-sessions/test-infinispan-sessions/pom.xml +++ b/tests/test-sessions/test-infinispan-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 10.0.17 + 10.0.18-SNAPSHOT test-infinispan-sessions Jetty Tests :: Sessions :: Infinispan diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index 077418ee6bad..e4f717398ccb 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 10.0.17 + 10.0.18-SNAPSHOT test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-memcached-sessions/pom.xml b/tests/test-sessions/test-memcached-sessions/pom.xml index 3a4161ebbd66..144159f1d6d8 100644 --- a/tests/test-sessions/test-memcached-sessions/pom.xml +++ b/tests/test-sessions/test-memcached-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 10.0.17 + 10.0.18-SNAPSHOT test-memcached-sessions Jetty Tests :: Sessions :: Memcached diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index a9279814ea3e..dc651d842a88 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 10.0.17 + 10.0.18-SNAPSHOT test-mongodb-sessions Jetty Tests :: Sessions :: Mongo diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index 2a5bd1df4554..8c83b6622b0f 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 10.0.17 + 10.0.18-SNAPSHOT test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index bf424d4c6851..2fa53753635a 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17 + 10.0.18-SNAPSHOT ../pom.xml test-webapps-parent diff --git a/tests/test-webapps/test-bad-websocket-webapp/pom.xml b/tests/test-webapps/test-bad-websocket-webapp/pom.xml index d6c4e8306b85..81b3145dfa65 100644 --- a/tests/test-webapps/test-bad-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-bad-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-cdi-common-webapp/pom.xml b/tests/test-webapps/test-cdi-common-webapp/pom.xml index 0b262554e8fe..40c6c9759e59 100644 --- a/tests/test-webapps/test-cdi-common-webapp/pom.xml +++ b/tests/test-webapps/test-cdi-common-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-felix-webapp/pom.xml b/tests/test-webapps/test-felix-webapp/pom.xml index 3f30a961cf1e..e610bfa9eae7 100644 --- a/tests/test-webapps/test-felix-webapp/pom.xml +++ b/tests/test-webapps/test-felix-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-http2-webapp/pom.xml b/tests/test-webapps/test-http2-webapp/pom.xml index 163bcde1a42a..921001545ad0 100644 --- a/tests/test-webapps/test-http2-webapp/pom.xml +++ b/tests/test-webapps/test-http2-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-openid-webapp/pom.xml b/tests/test-webapps/test-openid-webapp/pom.xml index f7dc412b0c9a..b6134cf45485 100644 --- a/tests/test-webapps/test-openid-webapp/pom.xml +++ b/tests/test-webapps/test-openid-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-owb-cdi-webapp/pom.xml b/tests/test-webapps/test-owb-cdi-webapp/pom.xml index 317f95d05227..8053995e61c3 100644 --- a/tests/test-webapps/test-owb-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-owb-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-simple-session-webapp/pom.xml b/tests/test-webapps/test-simple-session-webapp/pom.xml index 58dacac5032c..87f9c9bb82e5 100644 --- a/tests/test-webapps/test-simple-session-webapp/pom.xml +++ b/tests/test-webapps/test-simple-session-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17 + 10.0.18-SNAPSHOT test-simple-session-webapp diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 2516f3e0e200..9052a5c5d0be 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17 + 10.0.18-SNAPSHOT test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 diff --git a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml index 6b8370544bd9..17c2d69ac632 100644 --- a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-websocket-client-webapp/pom.xml b/tests/test-webapps/test-websocket-client-webapp/pom.xml index 4ad4d1a52f98..4cd28c00c216 100644 --- a/tests/test-webapps/test-websocket-client-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-websocket-webapp/pom.xml b/tests/test-webapps/test-websocket-webapp/pom.xml index 70fc8d335c3b..fefbd93e278f 100644 --- a/tests/test-webapps/test-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-weld-cdi-webapp/pom.xml b/tests/test-webapps/test-weld-cdi-webapp/pom.xml index 8ac4696edfb0..02e5d4a2d9dc 100644 --- a/tests/test-webapps/test-weld-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-weld-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-websocket-autobahn/pom.xml b/tests/test-websocket-autobahn/pom.xml index 14d452fed450..9a461035ddf6 100644 --- a/tests/test-websocket-autobahn/pom.xml +++ b/tests/test-websocket-autobahn/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.17 + 10.0.18-SNAPSHOT 4.0.0 From 48e7716b9462bebea6732b885dbebb4300787a5c Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 9 Oct 2023 13:38:47 -0500 Subject: [PATCH 21/31] Updating to version 11.0.17 --- VERSION.txt | 57 ++++-- apache-jsp/pom.xml | 2 +- build-resources/pom.xml | 2 +- .../demo-async-rest-jar/pom.xml | 2 +- .../demo-async-rest-server/pom.xml | 2 +- .../demo-async-rest-webapp/pom.xml | 2 +- demos/demo-async-rest/pom.xml | 2 +- demos/demo-jaas-webapp/pom.xml | 2 +- demos/demo-jetty-webapp/pom.xml | 2 +- demos/demo-jndi-webapp/pom.xml | 2 +- demos/demo-jsp-webapp/pom.xml | 2 +- demos/demo-mock-resources/pom.xml | 2 +- demos/demo-proxy-webapp/pom.xml | 2 +- demos/demo-simple-webapp/pom.xml | 2 +- .../demo-container-initializer/pom.xml | 2 +- demos/demo-spec/demo-spec-webapp/pom.xml | 2 +- demos/demo-spec/demo-web-fragment/pom.xml | 2 +- demos/demo-spec/pom.xml | 2 +- demos/embedded/pom.xml | 2 +- demos/pom.xml | 2 +- .../jetty-asciidoctor-extensions/pom.xml | 2 +- documentation/jetty-documentation/pom.xml | 2 +- documentation/pom.xml | 2 +- glassfish-jstl/pom.xml | 2 +- javadoc/pom.xml | 2 +- jetty-alpn/jetty-alpn-client/pom.xml | 2 +- .../jetty-alpn-conscrypt-client/pom.xml | 2 +- .../jetty-alpn-conscrypt-server/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-client/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-server/pom.xml | 2 +- jetty-alpn/jetty-alpn-server/pom.xml | 2 +- jetty-alpn/pom.xml | 2 +- jetty-annotations/pom.xml | 2 +- jetty-ant/pom.xml | 2 +- jetty-bom/pom.xml | 166 +++++++++--------- jetty-cdi/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-fcgi/fcgi-client/pom.xml | 2 +- jetty-fcgi/fcgi-server/pom.xml | 2 +- jetty-fcgi/pom.xml | 2 +- .../jetty-gcloud-session-manager/pom.xml | 2 +- jetty-gcloud/pom.xml | 2 +- jetty-hazelcast/pom.xml | 2 +- jetty-home/pom.xml | 2 +- jetty-http-spi/pom.xml | 2 +- jetty-http/pom.xml | 2 +- jetty-http2/http2-client/pom.xml | 2 +- jetty-http2/http2-common/pom.xml | 2 +- jetty-http2/http2-hpack/pom.xml | 2 +- .../http2-http-client-transport/pom.xml | 2 +- jetty-http2/http2-server/pom.xml | 2 +- jetty-http2/pom.xml | 2 +- jetty-http3/http3-client/pom.xml | 2 +- jetty-http3/http3-common/pom.xml | 2 +- .../http3-http-client-transport/pom.xml | 2 +- jetty-http3/http3-qpack/pom.xml | 2 +- jetty-http3/http3-server/pom.xml | 2 +- jetty-http3/http3-tests/pom.xml | 2 +- jetty-http3/pom.xml | 2 +- jetty-infinispan/infinispan-common/pom.xml | 2 +- .../infinispan-embedded-query/pom.xml | 2 +- jetty-infinispan/infinispan-embedded/pom.xml | 2 +- .../infinispan-remote-query/pom.xml | 2 +- jetty-infinispan/infinispan-remote/pom.xml | 2 +- jetty-infinispan/pom.xml | 2 +- jetty-io/pom.xml | 2 +- jetty-jaas/pom.xml | 2 +- jetty-jaspi/pom.xml | 2 +- jetty-jmx/pom.xml | 2 +- jetty-jndi/pom.xml | 2 +- jetty-jspc-maven-plugin/pom.xml | 2 +- jetty-keystore/pom.xml | 2 +- jetty-maven-plugin/pom.xml | 2 +- .../jetty-memcached-sessions/pom.xml | 2 +- jetty-memcached/pom.xml | 2 +- jetty-nosql/pom.xml | 2 +- jetty-openid/pom.xml | 2 +- jetty-osgi/jetty-osgi-alpn/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot/pom.xml | 2 +- jetty-osgi/jetty-osgi-httpservice/pom.xml | 2 +- jetty-osgi/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-context/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-fragment/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-server/pom.xml | 2 +- .../test-jetty-osgi-webapp-resources/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-webapp/pom.xml | 2 +- jetty-osgi/test-jetty-osgi/pom.xml | 2 +- jetty-p2/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-proxy/pom.xml | 2 +- jetty-quic/pom.xml | 2 +- jetty-quic/quic-client/pom.xml | 2 +- jetty-quic/quic-common/pom.xml | 2 +- jetty-quic/quic-quiche/pom.xml | 2 +- .../quic-quiche/quic-quiche-common/pom.xml | 2 +- .../quic-quiche-foreign-incubator/pom.xml | 2 +- .../quic-quiche/quic-quiche-jna/pom.xml | 2 +- jetty-quic/quic-server/pom.xml | 2 +- jetty-quickstart/pom.xml | 2 +- jetty-rewrite/pom.xml | 2 +- jetty-runner/pom.xml | 2 +- jetty-security/pom.xml | 2 +- jetty-server/pom.xml | 2 +- jetty-servlet/pom.xml | 2 +- jetty-servlets/pom.xml | 2 +- jetty-slf4j-impl/pom.xml | 2 +- jetty-start/pom.xml | 2 +- jetty-unixdomain-server/pom.xml | 2 +- .../jetty-unixsocket-client/pom.xml | 2 +- .../jetty-unixsocket-common/pom.xml | 2 +- .../jetty-unixsocket-server/pom.xml | 2 +- jetty-unixsocket/pom.xml | 2 +- jetty-util-ajax/pom.xml | 2 +- jetty-util/pom.xml | 2 +- jetty-webapp/pom.xml | 2 +- jetty-websocket/pom.xml | 2 +- jetty-websocket/websocket-core-client/pom.xml | 2 +- jetty-websocket/websocket-core-common/pom.xml | 2 +- jetty-websocket/websocket-core-server/pom.xml | 2 +- jetty-websocket/websocket-core-tests/pom.xml | 2 +- .../websocket-jakarta-client/pom.xml | 2 +- .../websocket-jakarta-common/pom.xml | 2 +- .../websocket-jakarta-server/pom.xml | 2 +- .../websocket-jakarta-tests/pom.xml | 2 +- jetty-websocket/websocket-jetty-api/pom.xml | 2 +- .../websocket-jetty-client/pom.xml | 2 +- .../websocket-jetty-common/pom.xml | 2 +- .../websocket-jetty-server/pom.xml | 2 +- jetty-websocket/websocket-jetty-tests/pom.xml | 2 +- jetty-websocket/websocket-servlet/pom.xml | 2 +- jetty-xml/pom.xml | 2 +- pom.xml | 2 +- scripts/release-jetty.sh | 5 - tests/jetty-home-tester/pom.xml | 2 +- tests/jetty-http-tools/pom.xml | 2 +- tests/jetty-jmh/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-cdi/pom.xml | 2 +- tests/test-distribution/pom.xml | 2 +- tests/test-http-client-transport/pom.xml | 2 +- tests/test-integration/pom.xml | 2 +- tests/test-jmx/jmx-webapp-it/pom.xml | 2 +- tests/test-jmx/jmx-webapp/pom.xml | 2 +- tests/test-jmx/pom.xml | 2 +- tests/test-jndi/pom.xml | 2 +- tests/test-jpms/pom.xml | 2 +- .../test-jpms-websocket-core/pom.xml | 2 +- tests/test-loginservice/pom.xml | 2 +- tests/test-quickstart/pom.xml | 2 +- tests/test-sessions/pom.xml | 2 +- .../test-sessions/test-file-sessions/pom.xml | 2 +- .../test-gcloud-sessions/pom.xml | 2 +- .../test-hazelcast-sessions/pom.xml | 2 +- .../test-infinispan-sessions/pom.xml | 2 +- .../test-sessions/test-jdbc-sessions/pom.xml | 2 +- .../test-memcached-sessions/pom.xml | 2 +- .../test-mongodb-sessions/pom.xml | 2 +- .../test-sessions-common/pom.xml | 2 +- tests/test-webapps/pom.xml | 2 +- .../test-bad-websocket-webapp/pom.xml | 2 +- .../test-cdi-common-webapp/pom.xml | 2 +- tests/test-webapps/test-felix-webapp/pom.xml | 2 +- tests/test-webapps/test-http2-webapp/pom.xml | 2 +- tests/test-webapps/test-openid-webapp/pom.xml | 2 +- .../test-webapps/test-owb-cdi-webapp/pom.xml | 2 +- .../test-simple-session-webapp/pom.xml | 2 +- .../test-webapps/test-webapp-rfc2616/pom.xml | 2 +- .../pom.xml | 2 +- .../test-websocket-client-webapp/pom.xml | 2 +- .../test-websocket-webapp/pom.xml | 2 +- .../test-webapps/test-weld-cdi-webapp/pom.xml | 2 +- tests/test-websocket-autobahn/pom.xml | 2 +- 175 files changed, 294 insertions(+), 278 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 1fc0afc427c0..d0922575d8ba 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,4 +1,11 @@ -jetty-11.0.17-SNAPSHOT +jetty-11.0.17 - 09 October 2023 + + 9777 CrossOriginFilter does not return Vary header on no-cors mode + + 9928 Backport `Request.getBeginNanoTime()` + + 10271 jetty.sh does not stop jetty anymore + + 10473 Startup Script reports `ok` too fast, and doesn't wait for actual + start of Jetty + + 10547 Cannot customize Executor on WebSocketClient + + 10679 Review HTTP/2 rate control jetty-11.0.16 - 25 August 2023 + 6140 Report total number of keys in SelectorManager @@ -58,7 +65,8 @@ jetty-11.0.15 - 11 April 2023 + 9309 `jetty.sh` cannot handle complex Jetty properties from `start.d/*.ini` + 9400 Jetty logs warning with stacktrace when annotation parser encounters module-info.class file inside elasticsearch-x-content jar - + 9464 Add optional configuration to log user out after OpenID idToken expires (CVE-2023-41900) + + 9464 Add optional configuration to log user out after OpenID idToken expires + (CVE-2023-41900) + 9468 Jetty 11.0.14 is less tolerant of non-compliant cookies than 11.0.13 + 9497 Maven plugin effective web xml: add support for jar projects + 9501 jetty client with proxy - ssl traffic between both proxy and servers @@ -222,7 +230,8 @@ jetty-10.0.15 - 11 April 2023 + 9309 `jetty.sh` cannot handle complex Jetty properties from `start.d/*.ini` + 9400 Jetty logs warning with stacktrace when annotation parser encounters module-info.class file inside elasticsearch-x-content jar - + 9464 Add optional configuration to log user out after OpenID idToken expires (CVE-2023-41900) + + 9464 Add optional configuration to log user out after OpenID idToken expires + (CVE-2023-41900) + 9468 Jetty 11.0.14 is less tolerant of non-compliant cookies than 11.0.13 + 9497 Maven plugin effective web xml: add support for jar projects + 9501 jetty client with proxy - ssl traffic between both proxy and servers @@ -508,7 +517,6 @@ jetty-10.0.10 - 16 June 2022 properties + 8161 Improve SSLConnection buffers handling (CVE-2022-2191) - jetty-9.4.47.v20220610 - 10 June 2022 + 4717 High CPU spikes with jetty winstone threads + 7748 Allow overriding of url-pattern mapping in ServletContextHandler to @@ -953,7 +961,8 @@ jetty-10.0.3 - 20 May 2021 + 6254 Total timeout not enforced for queued requests + 6263 Review URI encoding in ConcatServlet & WelcomeFilter (CVE-2021-28169) + 6272 Reduce allocation in HttpClient when notifying content listeners - + 6277 Better handle exceptions thrown from session destroy listener (CVE-2021-34428) + + 6277 Better handle exceptions thrown from session destroy listener + (CVE-2021-34428) + 6280 Copy ServletHolder class/instance properly during startWebapp + 6287 Class loading broken for WebSocketClient used inside webapp @@ -1207,7 +1216,7 @@ jetty-11.0.0.beta1 - 10 July 2020 SETTINGS Frame. + 4903 Give better errors for non public Websocket Endpoints + 4904 WebsocketClient creates more connections than needed - + 4907 + + 4907 org.eclipse.jetty.websocket.tests.SuspendResumeTest#testSuspendAfterClose + 4920 Restore ability to delete sessions on stop + 4921 Quickstart run improperly runs dynamically added context initializers @@ -1257,7 +1266,8 @@ jetty-10.0.2 - 26 March 2021 + 6037 Review logging modules for j.u.l + 6050 Websocket: NotUtf8Exception after upgrade 9.4.35 -> 9.4.36 or newer + 6063 Allow override of hazelcast version when using module - + 6072 jetty server high CPU when client send data length > 17408 (CVE-2021-28165) + + 6072 jetty server high CPU when client send data length > 17408 + (CVE-2021-28165) + 6076 Embedded Jetty throws null pointer exception + 6082 SslConnection compacting + 6085 Jetty keeps Sessions in use after "Duplicate valid session cookies" @@ -1333,7 +1343,8 @@ jetty-10.0.0 - 02 December 2020 + 5555 NPE for servlet with no mapping + 5562 ArrayTernaryTrie consumes too much memory + 5575 Add SEARCH as a known HttpMethod - + 5605 java.io.IOException: unconsumed input during http request parsing (CVE-2020-27218) + + 5605 java.io.IOException: unconsumed input during http request parsing + (CVE-2020-27218) + 5633 Allow to configure HttpClient request authority + 5679 Distro argument --list-all-modules does not work + 5680 No way to see which modules are enabled for the distro @@ -1620,7 +1631,8 @@ jetty-9.4.41.v20210516 - 16 May 2021 `AsyncContext.dispatch` + 6254 Total timeout not enforced for queued requests + 6263 Review URI encoding in ConcatServlet & WelcomeFilter (CVE-2021-28169) - + 6277 Better handle exceptions thrown from session destroy listener (CVE-2021-34428) + + 6277 Better handle exceptions thrown from session destroy listener + (CVE-2021-34428) + 6280 Copy ServletHolder class/instance properly during startWebapp jetty-9.4.40.v20210413 - 13 April 2021 @@ -1636,7 +1648,8 @@ jetty-9.4.39.v20210325 - 25 March 2021 + 6052 Cleanup TypeUtil and ModuleLocation to allow jetty-client/hybrid to work on Android + 6063 Allow override of hazelcast version when using module - + 6072 jetty server high CPU when client send data length > 17408 (CVE-2021-28165) + + 6072 jetty server high CPU when client send data length > 17408 + (CVE-2021-28165) + 6085 Jetty keeps Sessions in use after "Duplicate valid session cookies" Message + 6101 Normalize ambiguous URIs (CVE-2021-28164) @@ -1692,7 +1705,8 @@ jetty-9.4.35.v20201120 - 20 November 2020 + 5539 StatisticsServlet output is not valid + 5562 ArrayTernaryTrie consumes too much memory + 5575 Add SEARCH as a known HttpMethod - + 5605 java.io.IOException: unconsumed input during http request parsing (CVE-2020-27218) + + 5605 java.io.IOException: unconsumed input during http request parsing + (CVE-2020-27218) + 5633 Allow to configure HttpClient request authority jetty-9.4.34.v20201102 - 02 November 2020 @@ -2186,8 +2200,10 @@ jetty-9.4.18.v20190429 - 29 April 2019 jetty-9.4.17.v20190418 - 18 April 2019 + 2140 Infinispan and hazelcast changes to scavenge zombie expired sessions + 3464 Split SslContextFactory into Client and Server - + 3549 Directory Listing on Windows reveals Resource Base path (CVE-2019-10246) - + 3555 DefaultHandler Reveals Base Resource Path of each Context (CVE-2019-10247) + + 3549 Directory Listing on Windows reveals Resource Base path + (CVE-2019-10246) + + 3555 DefaultHandler Reveals Base Resource Path of each Context + (CVE-2019-10247) jetty-9.4.16.v20190411 - 11 April 2019 + 1861 Limit total bytes pooled by ByteBufferPools @@ -2268,8 +2284,10 @@ jetty-9.3.28.v20191105 - 05 November 2019 + 4217 SslConnection.DecryptedEnpoint.flush eternal busy loop jetty-9.3.27.v20190418 - 18 April 2019 - + 3549 Directory Listing on Windows reveals Resource Base path (CVE-2019-10246) - + 3555 DefaultHandler Reveals Base Resource Path of each Context (CVE-2019-10247) + + 3549 Directory Listing on Windows reveals Resource Base path + (CVE-2019-10246) + + 3555 DefaultHandler Reveals Base Resource Path of each Context + (CVE-2019-10247) jetty-9.3.26.v20190403 - 03 April 2019 + 2954 Improve cause reporting for HttpClient failures @@ -2283,11 +2301,14 @@ jetty-9.2.29.v20191105 - 05 November 2019 + 4217 SslConnection.DecryptedEnpoint.flush eternal busy loop jetty-9.2.28.v20190418 - 18 April 2019 - + 3549 Directory Listing on Windows reveals Resource Base path (CVE-2019-10246) - + 3555 DefaultHandler Reveals Base Resource Path of each Context (CVE-2019-10247) + + 3549 Directory Listing on Windows reveals Resource Base path + (CVE-2019-10246) + + 3555 DefaultHandler Reveals Base Resource Path of each Context + (CVE-2019-10247) jetty-9.2.27.v20190403 - 03 April 2019 - + 3319 Refactored Directory Listing to modernize and avoid XSS (CVE-2019-10241) + + 3319 Refactored Directory Listing to modernize and avoid XSS + (CVE-2019-10241) jetty-9.4.14.v20181114 - 14 November 2018 + 3097 Duplicated programmatic Servlet Listeners causing duplicate calls diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index 108f446dbc14..6035f0c1ff94 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/build-resources/pom.xml b/build-resources/pom.xml index a674138717e9..4a63d2f23ce4 100644 --- a/build-resources/pom.xml +++ b/build-resources/pom.xml @@ -7,7 +7,7 @@ --> org.eclipse.jetty build-resources - 11.0.17-SNAPSHOT + 11.0.17 Jetty :: Build Resources jar diff --git a/demos/demo-async-rest/demo-async-rest-jar/pom.xml b/demos/demo-async-rest/demo-async-rest-jar/pom.xml index 09c3a5bfe5cb..c76a57bb2315 100644 --- a/demos/demo-async-rest/demo-async-rest-jar/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-jar/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/demos/demo-async-rest/demo-async-rest-server/pom.xml b/demos/demo-async-rest/demo-async-rest-server/pom.xml index 2d43716622d4..fb0a9d838769 100644 --- a/demos/demo-async-rest/demo-async-rest-server/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml index 428ba7c68514..d852b4baa21f 100644 --- a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/demos/demo-async-rest/pom.xml b/demos/demo-async-rest/pom.xml index b551011421f5..ae4ffa13bc80 100644 --- a/demos/demo-async-rest/pom.xml +++ b/demos/demo-async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/demos/demo-jaas-webapp/pom.xml b/demos/demo-jaas-webapp/pom.xml index 625a77c252f9..3a4715244fbc 100644 --- a/demos/demo-jaas-webapp/pom.xml +++ b/demos/demo-jaas-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17-SNAPSHOT + 11.0.17 demo-jaas-webapp Demo :: JAAS :: WebApp diff --git a/demos/demo-jetty-webapp/pom.xml b/demos/demo-jetty-webapp/pom.xml index e4b16b52f55d..256f95f2f64b 100644 --- a/demos/demo-jetty-webapp/pom.xml +++ b/demos/demo-jetty-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17-SNAPSHOT + 11.0.17 ../pom.xml 4.0.0 diff --git a/demos/demo-jndi-webapp/pom.xml b/demos/demo-jndi-webapp/pom.xml index 47e4916ce72b..70b99576f34c 100644 --- a/demos/demo-jndi-webapp/pom.xml +++ b/demos/demo-jndi-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17-SNAPSHOT + 11.0.17 demo-jndi-webapp Demo :: JNDI :: WebApp diff --git a/demos/demo-jsp-webapp/pom.xml b/demos/demo-jsp-webapp/pom.xml index 701defb7b404..7b33968dfd61 100644 --- a/demos/demo-jsp-webapp/pom.xml +++ b/demos/demo-jsp-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/demos/demo-mock-resources/pom.xml b/demos/demo-mock-resources/pom.xml index 054dbf0706a5..d69fdbb97a3c 100644 --- a/demos/demo-mock-resources/pom.xml +++ b/demos/demo-mock-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17-SNAPSHOT + 11.0.17 Demo :: Mock Resources demo-mock-resources diff --git a/demos/demo-proxy-webapp/pom.xml b/demos/demo-proxy-webapp/pom.xml index dabc1ea83a88..0388822e7920 100644 --- a/demos/demo-proxy-webapp/pom.xml +++ b/demos/demo-proxy-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 demo-proxy-webapp diff --git a/demos/demo-simple-webapp/pom.xml b/demos/demo-simple-webapp/pom.xml index 11fbf4845b36..b4a884402e7a 100644 --- a/demos/demo-simple-webapp/pom.xml +++ b/demos/demo-simple-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/demos/demo-spec/demo-container-initializer/pom.xml b/demos/demo-spec/demo-container-initializer/pom.xml index 1a77dcb1b91c..c56846571ab1 100644 --- a/demos/demo-spec/demo-container-initializer/pom.xml +++ b/demos/demo-spec/demo-container-initializer/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17-SNAPSHOT + 11.0.17 ../../pom.xml demo-container-initializer diff --git a/demos/demo-spec/demo-spec-webapp/pom.xml b/demos/demo-spec/demo-spec-webapp/pom.xml index ee762d783f5e..0f867ac7a593 100644 --- a/demos/demo-spec/demo-spec-webapp/pom.xml +++ b/demos/demo-spec/demo-spec-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17-SNAPSHOT + 11.0.17 ../../pom.xml Demo :: Servlet Spec :: Webapp diff --git a/demos/demo-spec/demo-web-fragment/pom.xml b/demos/demo-spec/demo-web-fragment/pom.xml index 2462392a5c35..ef7ed8b64e24 100644 --- a/demos/demo-spec/demo-web-fragment/pom.xml +++ b/demos/demo-spec/demo-web-fragment/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17-SNAPSHOT + 11.0.17 ../../pom.xml diff --git a/demos/demo-spec/pom.xml b/demos/demo-spec/pom.xml index 6838b2fa8028..dd910653d71b 100644 --- a/demos/demo-spec/pom.xml +++ b/demos/demo-spec/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17-SNAPSHOT + 11.0.17 Demo :: Servlet Spec demo-spec diff --git a/demos/embedded/pom.xml b/demos/embedded/pom.xml index 8206e93cdaf3..9a34eebb67d9 100644 --- a/demos/embedded/pom.xml +++ b/demos/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 demos-jetty-embedded diff --git a/demos/pom.xml b/demos/pom.xml index 43daa80655b5..ee90023f7fe7 100644 --- a/demos/pom.xml +++ b/demos/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml index 85fdc6049c9a..748f65cbc6f6 100644 --- a/documentation/jetty-asciidoctor-extensions/pom.xml +++ b/documentation/jetty-asciidoctor-extensions/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.documentation documentation-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index 2d1a90a8fa83..9f0ef321384c 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.documentation documentation-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/documentation/pom.xml b/documentation/pom.xml index 6bf43001da0d..3114527de6ef 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/glassfish-jstl/pom.xml b/glassfish-jstl/pom.xml index d76575173ff2..1798400d563e 100644 --- a/glassfish-jstl/pom.xml +++ b/glassfish-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 glassfish-jstl diff --git a/javadoc/pom.xml b/javadoc/pom.xml index eaad0c16f08f..252aa188ae5b 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index b0ec27063e59..e5f5c6d5cb9f 100644 --- a/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-alpn/jetty-alpn-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-alpn-client diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index 27afce4f03a2..6e0177d462e6 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index 9fca74a3368e..d62eef7c4274 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index 4d1228b426d6..b78de7045e69 100644 --- a/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index b9bb992adc61..2d1bfe33b513 100644 --- a/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index 8f394d477525..2a01c4851533 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-alpn-server diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index ae5442eb68c6..1ba135ba1ab8 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-alpn-parent diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 5f8d5176075c..0b0992447abe 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 47e79e08b131..2c24ef95db0b 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-ant diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index d31226797190..3940e2d2e156 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 jetty-bom @@ -53,409 +53,409 @@ org.eclipse.jetty apache-jsp - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty glassfish-jstl - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-alpn-client - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-alpn-java-client - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-alpn-java-server - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-alpn-conscrypt-client - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-alpn-conscrypt-server - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-alpn-server - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-annotations - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-ant - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-client - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-cdi - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-deploy - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.fcgi fcgi-client - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.fcgi fcgi-server - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.gcloud jetty-gcloud-session-manager - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-home - 11.0.17-SNAPSHOT + 11.0.17 zip org.eclipse.jetty jetty-home - 11.0.17-SNAPSHOT + 11.0.17 tar.gz org.eclipse.jetty jetty-http - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.http2 http2-client - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.http2 http2-common - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.http2 http2-hpack - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.http2 http2-http-client-transport - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.http2 http2-server - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.http3 http3-client - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.http3 http3-common - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.http3 http3-http-client-transport - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.http3 http3-qpack - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.http3 http3-server - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-http-spi - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty infinispan-common - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty infinispan-remote-query - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty infinispan-embedded-query - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-hazelcast - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-io - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-jaas - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-jaspi - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-jmx - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-jndi - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-keystore - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.memcached jetty-memcached-sessions - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-nosql - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.osgi jetty-osgi-alpn - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.osgi jetty-osgi-boot - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.osgi jetty-osgi-boot-jsp - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.osgi jetty-osgi-boot-warurl - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.quic quic-client - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.quic quic-common - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.quic quic-quiche-common - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.quic quic-quiche-jna - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.quic quic-server - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.osgi jetty-httpservice - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-plus - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-proxy - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-quickstart - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-rewrite - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-security - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-openid - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-server - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-servlet - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-servlets - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-slf4j-impl - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-unixdomain-server - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-unixsocket-common - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-unixsocket-client - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-unixsocket-server - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-util - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-util-ajax - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-webapp - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.websocket websocket-jakarta-client - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.websocket websocket-jakarta-server - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.websocket websocket-jakarta-common - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.websocket websocket-jetty-api - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.websocket websocket-jetty-client - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.websocket websocket-jetty-common - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.websocket websocket-jetty-server - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.websocket websocket-servlet - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.websocket websocket-core-common - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.websocket websocket-core-client - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty.websocket websocket-core-server - 11.0.17-SNAPSHOT + 11.0.17 org.eclipse.jetty jetty-xml - 11.0.17-SNAPSHOT + 11.0.17 @@ -471,7 +471,7 @@ org.eclipse.jetty.quic quic-quiche-foreign-incubator - 11.0.17-SNAPSHOT + 11.0.17 diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index 433a5b15b8e3..f866c883e078 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 org.eclipse.jetty diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index b654859e8544..f38d47cfe04d 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 4109e752d495..8d6894792940 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index da1a93833138..365c51047646 100644 --- a/jetty-fcgi/fcgi-client/pom.xml +++ b/jetty-fcgi/fcgi-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi fcgi-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index 7301a0eab97e..cd48cbdf896f 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi fcgi-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml index 16aaf7cbd5fa..c9b4096f6729 100644 --- a/jetty-fcgi/pom.xml +++ b/jetty-fcgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index b7811a97619d..ca9c325ecff7 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.gcloud gcloud-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index 4bdd47aaa535..5d63e2c8e07f 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index f7a8e1ec8403..861ab3ad1a8d 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 6d0445b328bb..36534c7757f8 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-home diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index b789573dfb1d..725a553c2334 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index fdd6eeeba63f..72d7c91706ce 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index 2f184100258a..509343e80fe8 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index 9bbc8b856420..6b829676b78e 100644 --- a/jetty-http2/http2-common/pom.xml +++ b/jetty-http2/http2-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index 46f50634c485..0247295cfcda 100644 --- a/jetty-http2/http2-hpack/pom.xml +++ b/jetty-http2/http2-hpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index 0d61fc5b550b..f4e110fe1b4f 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 51872bd34e43..b628fcc182c1 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml index 89876e0c3722..0683f0a0da6c 100644 --- a/jetty-http2/pom.xml +++ b/jetty-http2/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-http3/http3-client/pom.xml b/jetty-http3/http3-client/pom.xml index aef4a24ac310..230f5aa9e40f 100644 --- a/jetty-http3/http3-client/pom.xml +++ b/jetty-http3/http3-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-http3/http3-common/pom.xml b/jetty-http3/http3-common/pom.xml index bcde583f6180..768257a850d2 100644 --- a/jetty-http3/http3-common/pom.xml +++ b/jetty-http3/http3-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-http3/http3-http-client-transport/pom.xml b/jetty-http3/http3-http-client-transport/pom.xml index 48bcebb2eaca..4e3a2987b100 100644 --- a/jetty-http3/http3-http-client-transport/pom.xml +++ b/jetty-http3/http3-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-http3/http3-qpack/pom.xml b/jetty-http3/http3-qpack/pom.xml index a4579532bbdd..87b9212309e2 100644 --- a/jetty-http3/http3-qpack/pom.xml +++ b/jetty-http3/http3-qpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-http3/http3-server/pom.xml b/jetty-http3/http3-server/pom.xml index 3eba7f079993..0f03401ed0b4 100644 --- a/jetty-http3/http3-server/pom.xml +++ b/jetty-http3/http3-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-http3/http3-tests/pom.xml b/jetty-http3/http3-tests/pom.xml index c49f3bc4ac80..abc24c9333ca 100644 --- a/jetty-http3/http3-tests/pom.xml +++ b/jetty-http3/http3-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-http3/pom.xml b/jetty-http3/pom.xml index 70a75eeac65c..5c0ffcb0d144 100644 --- a/jetty-http3/pom.xml +++ b/jetty-http3/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml index abfc0f0fabe3..303415f239a4 100644 --- a/jetty-infinispan/infinispan-common/pom.xml +++ b/jetty-infinispan/infinispan-common/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 infinispan-common diff --git a/jetty-infinispan/infinispan-embedded-query/pom.xml b/jetty-infinispan/infinispan-embedded-query/pom.xml index 50f211b9d881..c603c68d0022 100644 --- a/jetty-infinispan/infinispan-embedded-query/pom.xml +++ b/jetty-infinispan/infinispan-embedded-query/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 infinispan-embedded-query diff --git a/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-infinispan/infinispan-embedded/pom.xml index 96f0ce94511b..9f4822709338 100644 --- a/jetty-infinispan/infinispan-embedded/pom.xml +++ b/jetty-infinispan/infinispan-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 infinispan-embedded diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml index ea76e7cb4689..a35a52066b8e 100644 --- a/jetty-infinispan/infinispan-remote-query/pom.xml +++ b/jetty-infinispan/infinispan-remote-query/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 infinispan-remote-query diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml index c82e9c3931ed..def332ef44d3 100644 --- a/jetty-infinispan/infinispan-remote/pom.xml +++ b/jetty-infinispan/infinispan-remote/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 infinispan-remote diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml index f6bb2691ae82..dcb7f1b81383 100644 --- a/jetty-infinispan/pom.xml +++ b/jetty-infinispan/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index c6ee7aca4a7d..5c5ece5eaa9a 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index f18b3a3d433f..474574f46152 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 24ec591c67d6..863aed4b29b8 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 6a07c6edc7b0..6258bdc9272c 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 63d57b0fb3f8..15ab790f9739 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index a6580a80731c..bb5d5137a23d 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-keystore/pom.xml b/jetty-keystore/pom.xml index 80a089df7a1d..83eb4721edfa 100644 --- a/jetty-keystore/pom.xml +++ b/jetty-keystore/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-keystore diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index f8fcdc785daf..cb3ae2e1c522 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-maven-plugin diff --git a/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-memcached/jetty-memcached-sessions/pom.xml index 6b632359d342..8a35e146aaf5 100644 --- a/jetty-memcached/jetty-memcached-sessions/pom.xml +++ b/jetty-memcached/jetty-memcached-sessions/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.memcached memcached-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-memcached/pom.xml b/jetty-memcached/pom.xml index dee1c3e85a6b..d6ab4187a68e 100644 --- a/jetty-memcached/pom.xml +++ b/jetty-memcached/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 04d3b5226516..e735ace3ab0b 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-nosql diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index c5a8a51e78ea..92ced5f818d9 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml index 99466861ff17..ed395beb844a 100644 --- a/jetty-osgi/jetty-osgi-alpn/pom.xml +++ b/jetty-osgi/jetty-osgi-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17-SNAPSHOT + 11.0.17 diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index bc7a73068d33..eeff5181dc43 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-osgi-boot-jsp diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index 142b366b3e77..2068ec5ab51a 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17-SNAPSHOT + 11.0.17 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 46b4b7a81682..3541906dddec 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-osgi-boot diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index b206d56ade00..95465639f609 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-httpservice diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index fea9abc1a515..888ce8a863e3 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index b6710cf89e06..2214ef88c5ec 100644 --- a/jetty-osgi/test-jetty-osgi-context/pom.xml +++ b/jetty-osgi/test-jetty-osgi-context/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 test-jetty-osgi-context diff --git a/jetty-osgi/test-jetty-osgi-fragment/pom.xml b/jetty-osgi/test-jetty-osgi-fragment/pom.xml index 81b7e427964c..4e762e643090 100644 --- a/jetty-osgi/test-jetty-osgi-fragment/pom.xml +++ b/jetty-osgi/test-jetty-osgi-fragment/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17-SNAPSHOT + 11.0.17 ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-server/pom.xml b/jetty-osgi/test-jetty-osgi-server/pom.xml index d8991d9028ca..dbac6056638e 100644 --- a/jetty-osgi/test-jetty-osgi-server/pom.xml +++ b/jetty-osgi/test-jetty-osgi-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 test-jetty-osgi-server diff --git a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml index edabe2a72028..248c6fe30900 100644 --- a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 test-jetty-osgi-webapp-resources diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index 532684ee28d8..aec18998ffc2 100644 --- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17-SNAPSHOT + 11.0.17 ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 6be26f3c7fa6..7d1c38d09151 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17-SNAPSHOT + 11.0.17 ../pom.xml 4.0.0 diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml index 07fca39c106e..0d9b7625a21b 100644 --- a/jetty-p2/pom.xml +++ b/jetty-p2/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-p2 diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 58f7e71857bc..a78d05a851d7 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 9f0e71bbd906..e89c95f27a2c 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-quic/pom.xml b/jetty-quic/pom.xml index 573681b5b673..0291be0aeff7 100644 --- a/jetty-quic/pom.xml +++ b/jetty-quic/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-quic/quic-client/pom.xml b/jetty-quic/quic-client/pom.xml index 411fb80ca50b..5a6992357a49 100644 --- a/jetty-quic/quic-client/pom.xml +++ b/jetty-quic/quic-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-quic/quic-common/pom.xml b/jetty-quic/quic-common/pom.xml index 681879722c86..1d6db068762b 100644 --- a/jetty-quic/quic-common/pom.xml +++ b/jetty-quic/quic-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-quic/quic-quiche/pom.xml b/jetty-quic/quic-quiche/pom.xml index cdaba56097e3..bde321314a80 100644 --- a/jetty-quic/quic-quiche/pom.xml +++ b/jetty-quic/quic-quiche/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-common/pom.xml b/jetty-quic/quic-quiche/quic-quiche-common/pom.xml index c1322fd337cc..8729885986a7 100644 --- a/jetty-quic/quic-quiche/quic-quiche-common/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml index ba059f4de207..75abd8a706e6 100644 --- a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml b/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml index 53cd9b64c220..39b98bf38c72 100644 --- a/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-quic/quic-server/pom.xml b/jetty-quic/quic-server/pom.xml index d5d641eebe56..7fb3228f697b 100644 --- a/jetty-quic/quic-server/pom.xml +++ b/jetty-quic/quic-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index 1f3d0cb2c801..f4b02228e150 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 47d11b245f08..3b23b4930f1a 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 69d4cecc1bb1..6f3f2941daf5 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-runner diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 75df41ef41bb..73ddb6903f0c 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 5d8450f05bf2..e492406c4a0b 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 65664eed21d3..a3eb207e7bb2 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 9349c5263e1b..fd9497b66378 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-slf4j-impl/pom.xml b/jetty-slf4j-impl/pom.xml index 6d207c341864..cbf13618e428 100644 --- a/jetty-slf4j-impl/pom.xml +++ b/jetty-slf4j-impl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index bfaa5f04f13d..6af8e964b99d 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-start diff --git a/jetty-unixdomain-server/pom.xml b/jetty-unixdomain-server/pom.xml index 48de3f8679de..52c2b05b84d9 100644 --- a/jetty-unixdomain-server/pom.xml +++ b/jetty-unixdomain-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-client/pom.xml b/jetty-unixsocket/jetty-unixsocket-client/pom.xml index 8218ddf51fe5..955e5296ad29 100644 --- a/jetty-unixsocket/jetty-unixsocket-client/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-client/pom.xml @@ -3,7 +3,7 @@ jetty-unixsocket org.eclipse.jetty - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-common/pom.xml b/jetty-unixsocket/jetty-unixsocket-common/pom.xml index 6fa164ee6313..1ade6484a7d5 100644 --- a/jetty-unixsocket/jetty-unixsocket-common/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-unixsocket - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-server/pom.xml b/jetty-unixsocket/jetty-unixsocket-server/pom.xml index b9a5f518d5d2..23cdb257ddfd 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/pom.xml @@ -3,7 +3,7 @@ jetty-unixsocket org.eclipse.jetty - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-unixsocket/pom.xml b/jetty-unixsocket/pom.xml index 60c8852ff079..b3f59b5f0bed 100644 --- a/jetty-unixsocket/pom.xml +++ b/jetty-unixsocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 8e061ec72ce3..1839a87f5162 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 99619d60bea0..758ca393d446 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 3de100825dc4..2d09318c7969 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 84ee00cdd724..ca7c93cdc41e 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-websocket/websocket-core-client/pom.xml b/jetty-websocket/websocket-core-client/pom.xml index 11a037009e25..f43f29d6dff8 100644 --- a/jetty-websocket/websocket-core-client/pom.xml +++ b/jetty-websocket/websocket-core-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-websocket/websocket-core-common/pom.xml b/jetty-websocket/websocket-core-common/pom.xml index 5cb2f1b15108..5ebdbca5da90 100644 --- a/jetty-websocket/websocket-core-common/pom.xml +++ b/jetty-websocket/websocket-core-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-websocket/websocket-core-server/pom.xml b/jetty-websocket/websocket-core-server/pom.xml index 234b2ea9110f..001a8c1db4a3 100644 --- a/jetty-websocket/websocket-core-server/pom.xml +++ b/jetty-websocket/websocket-core-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-websocket/websocket-core-tests/pom.xml b/jetty-websocket/websocket-core-tests/pom.xml index faf15bee3051..591ff87fcb77 100644 --- a/jetty-websocket/websocket-core-tests/pom.xml +++ b/jetty-websocket/websocket-core-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-websocket/websocket-jakarta-client/pom.xml b/jetty-websocket/websocket-jakarta-client/pom.xml index 7f8baaaefb71..a42175216259 100644 --- a/jetty-websocket/websocket-jakarta-client/pom.xml +++ b/jetty-websocket/websocket-jakarta-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-websocket/websocket-jakarta-common/pom.xml b/jetty-websocket/websocket-jakarta-common/pom.xml index 4922bd91908b..80112e6d4f5b 100644 --- a/jetty-websocket/websocket-jakarta-common/pom.xml +++ b/jetty-websocket/websocket-jakarta-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-websocket/websocket-jakarta-server/pom.xml b/jetty-websocket/websocket-jakarta-server/pom.xml index 7ce1c6aa4e90..c5418351f857 100644 --- a/jetty-websocket/websocket-jakarta-server/pom.xml +++ b/jetty-websocket/websocket-jakarta-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-websocket/websocket-jakarta-tests/pom.xml b/jetty-websocket/websocket-jakarta-tests/pom.xml index 65f118e1e7d0..bbcae2c93092 100644 --- a/jetty-websocket/websocket-jakarta-tests/pom.xml +++ b/jetty-websocket/websocket-jakarta-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-websocket/websocket-jetty-api/pom.xml b/jetty-websocket/websocket-jetty-api/pom.xml index 3cc87069e9e6..e263f6880b9a 100644 --- a/jetty-websocket/websocket-jetty-api/pom.xml +++ b/jetty-websocket/websocket-jetty-api/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-websocket/websocket-jetty-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml index 8914dc369c5c..ba767c678d54 100644 --- a/jetty-websocket/websocket-jetty-client/pom.xml +++ b/jetty-websocket/websocket-jetty-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-websocket/websocket-jetty-common/pom.xml b/jetty-websocket/websocket-jetty-common/pom.xml index 4f21f3a1e984..5324a759f004 100644 --- a/jetty-websocket/websocket-jetty-common/pom.xml +++ b/jetty-websocket/websocket-jetty-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-websocket/websocket-jetty-server/pom.xml b/jetty-websocket/websocket-jetty-server/pom.xml index b9d57bdbfbfc..b54aef5f6e79 100644 --- a/jetty-websocket/websocket-jetty-server/pom.xml +++ b/jetty-websocket/websocket-jetty-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml index 56a122b4f055..6e4ba7d0e739 100644 --- a/jetty-websocket/websocket-jetty-tests/pom.xml +++ b/jetty-websocket/websocket-jetty-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 930a9c9de440..29446e715899 100644 --- a/jetty-websocket/websocket-servlet/pom.xml +++ b/jetty-websocket/websocket-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index f50a96bbc2d8..d844c0c4a059 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 9550aa32af3a..33b2c456c3ed 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 Jetty :: Project The Eclipse Jetty Project pom diff --git a/scripts/release-jetty.sh b/scripts/release-jetty.sh index 36af1fdcda97..0e16b5599721 100755 --- a/scripts/release-jetty.sh +++ b/scripts/release-jetty.sh @@ -163,11 +163,6 @@ if proceedyn "Are you sure you want to release using above? (y/N)" n; then # This is equivalent to 'mvn release:perform' if proceedyn "Build/Deploy from tag $TAG_NAME? (Y/n)" y; then mvn clean deploy -Peclipse-release $DEPLOY_OPTS - echo "IMPORTANT NOTICE: You will need to build+deploy jetty-documentation on JDK21 to make the documentation sane!" - echo "Switch to a new window, make sure you are using JDK21, and run the following command:" - echo "$ mvn clean deploy -Peclipse-release $DEPLOY_OPTS -pl :jetty-documentation" - if proceedyn "Did you build and deploy jetty-documentation in JDK21? (y/N)" n; then - fi fi if proceedyn "Update working directory for $VER_NEXT? (Y/n)" y; then echo "Update VERSION.txt for $VER_NEXT" diff --git a/tests/jetty-home-tester/pom.xml b/tests/jetty-home-tester/pom.xml index 31767479c9e0..aa9512744341 100644 --- a/tests/jetty-home-tester/pom.xml +++ b/tests/jetty-home-tester/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/jetty-http-tools/pom.xml b/tests/jetty-http-tools/pom.xml index c9cba21f05be..39e37d28ecfd 100644 --- a/tests/jetty-http-tools/pom.xml +++ b/tests/jetty-http-tools/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index 7c9a0c919402..8e8ecc2c8a2b 100644 --- a/tests/jetty-jmh/pom.xml +++ b/tests/jetty-jmh/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/pom.xml b/tests/pom.xml index 07d2c339365f..d11ce22bd835 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 11.0.17-SNAPSHOT + 11.0.17 ../pom.xml org.eclipse.jetty.tests diff --git a/tests/test-cdi/pom.xml b/tests/test-cdi/pom.xml index 0d681c4dfd6e..dc96121ba98d 100644 --- a/tests/test-cdi/pom.xml +++ b/tests/test-cdi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index b9941a31bcb4..5c463c4e9086 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index 84f2bc555a99..dca551c69634 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 7a20fb01a240..ffdae1e98f78 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 test-integration diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml index 7274ca05d2e3..37f3f038cca5 100644 --- a/tests/test-jmx/jmx-webapp-it/pom.xml +++ b/tests/test-jmx/jmx-webapp-it/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-jmx-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 jmx-webapp-it diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml index 5cab1e4c36b3..331995a0d041 100644 --- a/tests/test-jmx/jmx-webapp/pom.xml +++ b/tests/test-jmx/jmx-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-jmx-parent - 11.0.17-SNAPSHOT + 11.0.17 jmx-webapp war diff --git a/tests/test-jmx/pom.xml b/tests/test-jmx/pom.xml index 46063271a182..80d49782b0da 100644 --- a/tests/test-jmx/pom.xml +++ b/tests/test-jmx/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 test-jmx-parent diff --git a/tests/test-jndi/pom.xml b/tests/test-jndi/pom.xml index 9776590be683..5527ad50cf2c 100644 --- a/tests/test-jndi/pom.xml +++ b/tests/test-jndi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/test-jpms/pom.xml b/tests/test-jpms/pom.xml index 675ddfbb9de7..f52f06b2be66 100644 --- a/tests/test-jpms/pom.xml +++ b/tests/test-jpms/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 test-jpms diff --git a/tests/test-jpms/test-jpms-websocket-core/pom.xml b/tests/test-jpms/test-jpms-websocket-core/pom.xml index f158d63c4af9..b8f09a8c252e 100644 --- a/tests/test-jpms/test-jpms-websocket-core/pom.xml +++ b/tests/test-jpms/test-jpms-websocket-core/pom.xml @@ -3,7 +3,7 @@ test-jpms org.eclipse.jetty.tests - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 test-jpms-websocket-core diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 39455374f8cf..01d144ceaa36 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17-SNAPSHOT + 11.0.17 test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index e77794d17260..65692ac47ac4 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17-SNAPSHOT + 11.0.17 ../pom.xml 4.0.0 diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index ad681b9f8bca..444b573bdc35 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17-SNAPSHOT + 11.0.17 test-sessions-parent Jetty Tests :: Sessions :: Parent diff --git a/tests/test-sessions/test-file-sessions/pom.xml b/tests/test-sessions/test-file-sessions/pom.xml index ef9340a9d03e..d71d1accfe1c 100644 --- a/tests/test-sessions/test-file-sessions/pom.xml +++ b/tests/test-sessions/test-file-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 11.0.17-SNAPSHOT + 11.0.17 test-file-sessions Jetty Tests :: Sessions :: File diff --git a/tests/test-sessions/test-gcloud-sessions/pom.xml b/tests/test-sessions/test-gcloud-sessions/pom.xml index 80b352e853b0..824f69504f35 100644 --- a/tests/test-sessions/test-gcloud-sessions/pom.xml +++ b/tests/test-sessions/test-gcloud-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 11.0.17-SNAPSHOT + 11.0.17 test-gcloud-sessions Jetty Tests :: Sessions :: GCloud diff --git a/tests/test-sessions/test-hazelcast-sessions/pom.xml b/tests/test-sessions/test-hazelcast-sessions/pom.xml index 1c9fcc6fdd7c..cf95d0bdb39a 100644 --- a/tests/test-sessions/test-hazelcast-sessions/pom.xml +++ b/tests/test-sessions/test-hazelcast-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 11.0.17-SNAPSHOT + 11.0.17 test-hazelcast-sessions Jetty Tests :: Sessions :: Hazelcast diff --git a/tests/test-sessions/test-infinispan-sessions/pom.xml b/tests/test-sessions/test-infinispan-sessions/pom.xml index 7d11627e9050..5de2a76d515f 100644 --- a/tests/test-sessions/test-infinispan-sessions/pom.xml +++ b/tests/test-sessions/test-infinispan-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 11.0.17-SNAPSHOT + 11.0.17 test-infinispan-sessions Jetty Tests :: Sessions :: Infinispan diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index d6817e2550d7..d461d8cfc8a0 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 11.0.17-SNAPSHOT + 11.0.17 test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-memcached-sessions/pom.xml b/tests/test-sessions/test-memcached-sessions/pom.xml index 2921e9244902..a863549038b5 100644 --- a/tests/test-sessions/test-memcached-sessions/pom.xml +++ b/tests/test-sessions/test-memcached-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 11.0.17-SNAPSHOT + 11.0.17 test-memcached-sessions Jetty Tests :: Sessions :: Memcached diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index 6526c2eb5953..4810ce68c189 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 11.0.17-SNAPSHOT + 11.0.17 test-mongodb-sessions Jetty Tests :: Sessions :: Mongo diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index 08d1716611e9..0e3131e55bdc 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 11.0.17-SNAPSHOT + 11.0.17 test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index 7922a891dacb..b3f53b332e9a 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17-SNAPSHOT + 11.0.17 ../pom.xml test-webapps-parent diff --git a/tests/test-webapps/test-bad-websocket-webapp/pom.xml b/tests/test-webapps/test-bad-websocket-webapp/pom.xml index 397351f3eeb2..8ac566883618 100644 --- a/tests/test-webapps/test-bad-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-bad-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/test-webapps/test-cdi-common-webapp/pom.xml b/tests/test-webapps/test-cdi-common-webapp/pom.xml index efd50490842e..3f5c16a4bbcf 100644 --- a/tests/test-webapps/test-cdi-common-webapp/pom.xml +++ b/tests/test-webapps/test-cdi-common-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/test-webapps/test-felix-webapp/pom.xml b/tests/test-webapps/test-felix-webapp/pom.xml index ccafc9f20f61..11a8ce398779 100644 --- a/tests/test-webapps/test-felix-webapp/pom.xml +++ b/tests/test-webapps/test-felix-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/test-webapps/test-http2-webapp/pom.xml b/tests/test-webapps/test-http2-webapp/pom.xml index 1adc7ce2589b..9c5876732fa6 100644 --- a/tests/test-webapps/test-http2-webapp/pom.xml +++ b/tests/test-webapps/test-http2-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/test-webapps/test-openid-webapp/pom.xml b/tests/test-webapps/test-openid-webapp/pom.xml index 6c3928c240e6..43dfcf83ba08 100644 --- a/tests/test-webapps/test-openid-webapp/pom.xml +++ b/tests/test-webapps/test-openid-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/test-webapps/test-owb-cdi-webapp/pom.xml b/tests/test-webapps/test-owb-cdi-webapp/pom.xml index 51875afb3e00..c81f41f3c249 100644 --- a/tests/test-webapps/test-owb-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-owb-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/test-webapps/test-simple-session-webapp/pom.xml b/tests/test-webapps/test-simple-session-webapp/pom.xml index b4867c1da8b8..e30d2e560b9b 100644 --- a/tests/test-webapps/test-simple-session-webapp/pom.xml +++ b/tests/test-webapps/test-simple-session-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17-SNAPSHOT + 11.0.17 test-simple-session-webapp diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 19761a72d706..93589816b951 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17-SNAPSHOT + 11.0.17 test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 diff --git a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml index b0a85ef93439..323cc6a99550 100644 --- a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/test-webapps/test-websocket-client-webapp/pom.xml b/tests/test-webapps/test-websocket-client-webapp/pom.xml index 781e080753fe..2abc767a5f18 100644 --- a/tests/test-webapps/test-websocket-client-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/test-webapps/test-websocket-webapp/pom.xml b/tests/test-webapps/test-websocket-webapp/pom.xml index 85da98a1e523..0c30f29d1b37 100644 --- a/tests/test-webapps/test-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/test-webapps/test-weld-cdi-webapp/pom.xml b/tests/test-webapps/test-weld-cdi-webapp/pom.xml index 0e08063e1853..507bd8db79da 100644 --- a/tests/test-webapps/test-weld-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-weld-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 diff --git a/tests/test-websocket-autobahn/pom.xml b/tests/test-websocket-autobahn/pom.xml index 73d5b3f9fe43..da71f51f9bcd 100644 --- a/tests/test-websocket-autobahn/pom.xml +++ b/tests/test-websocket-autobahn/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17-SNAPSHOT + 11.0.17 4.0.0 From c8829f75bf56801b691e9f16338d813874a95e07 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 9 Oct 2023 13:49:23 -0500 Subject: [PATCH 22/31] Updating to version 11.0.18-SNAPSHOT --- VERSION.txt | 2 + apache-jsp/pom.xml | 2 +- build-resources/pom.xml | 2 +- .../demo-async-rest-jar/pom.xml | 2 +- .../demo-async-rest-server/pom.xml | 2 +- .../demo-async-rest-webapp/pom.xml | 2 +- demos/demo-async-rest/pom.xml | 2 +- demos/demo-jaas-webapp/pom.xml | 2 +- demos/demo-jetty-webapp/pom.xml | 2 +- demos/demo-jndi-webapp/pom.xml | 2 +- demos/demo-jsp-webapp/pom.xml | 2 +- demos/demo-mock-resources/pom.xml | 2 +- demos/demo-proxy-webapp/pom.xml | 2 +- demos/demo-simple-webapp/pom.xml | 2 +- .../demo-container-initializer/pom.xml | 2 +- demos/demo-spec/demo-spec-webapp/pom.xml | 2 +- demos/demo-spec/demo-web-fragment/pom.xml | 2 +- demos/demo-spec/pom.xml | 2 +- demos/embedded/pom.xml | 2 +- demos/pom.xml | 2 +- .../jetty-asciidoctor-extensions/pom.xml | 2 +- documentation/jetty-documentation/pom.xml | 2 +- documentation/pom.xml | 2 +- glassfish-jstl/pom.xml | 2 +- javadoc/pom.xml | 2 +- jetty-alpn/jetty-alpn-client/pom.xml | 2 +- .../jetty-alpn-conscrypt-client/pom.xml | 2 +- .../jetty-alpn-conscrypt-server/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-client/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-server/pom.xml | 2 +- jetty-alpn/jetty-alpn-server/pom.xml | 2 +- jetty-alpn/pom.xml | 2 +- jetty-annotations/pom.xml | 2 +- jetty-ant/pom.xml | 2 +- jetty-bom/pom.xml | 166 +++++++++--------- jetty-cdi/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-fcgi/fcgi-client/pom.xml | 2 +- jetty-fcgi/fcgi-server/pom.xml | 2 +- jetty-fcgi/pom.xml | 2 +- .../jetty-gcloud-session-manager/pom.xml | 2 +- jetty-gcloud/pom.xml | 2 +- jetty-hazelcast/pom.xml | 2 +- jetty-home/pom.xml | 2 +- jetty-http-spi/pom.xml | 2 +- jetty-http/pom.xml | 2 +- jetty-http2/http2-client/pom.xml | 2 +- jetty-http2/http2-common/pom.xml | 2 +- jetty-http2/http2-hpack/pom.xml | 2 +- .../http2-http-client-transport/pom.xml | 2 +- jetty-http2/http2-server/pom.xml | 2 +- jetty-http2/pom.xml | 2 +- jetty-http3/http3-client/pom.xml | 2 +- jetty-http3/http3-common/pom.xml | 2 +- .../http3-http-client-transport/pom.xml | 2 +- jetty-http3/http3-qpack/pom.xml | 2 +- jetty-http3/http3-server/pom.xml | 2 +- jetty-http3/http3-tests/pom.xml | 2 +- jetty-http3/pom.xml | 2 +- jetty-infinispan/infinispan-common/pom.xml | 2 +- .../infinispan-embedded-query/pom.xml | 2 +- jetty-infinispan/infinispan-embedded/pom.xml | 2 +- .../infinispan-remote-query/pom.xml | 2 +- jetty-infinispan/infinispan-remote/pom.xml | 2 +- jetty-infinispan/pom.xml | 2 +- jetty-io/pom.xml | 2 +- jetty-jaas/pom.xml | 2 +- jetty-jaspi/pom.xml | 2 +- jetty-jmx/pom.xml | 2 +- jetty-jndi/pom.xml | 2 +- jetty-jspc-maven-plugin/pom.xml | 2 +- jetty-keystore/pom.xml | 2 +- jetty-maven-plugin/pom.xml | 2 +- .../jetty-memcached-sessions/pom.xml | 2 +- jetty-memcached/pom.xml | 2 +- jetty-nosql/pom.xml | 2 +- jetty-openid/pom.xml | 2 +- jetty-osgi/jetty-osgi-alpn/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot/pom.xml | 2 +- jetty-osgi/jetty-osgi-httpservice/pom.xml | 2 +- jetty-osgi/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-context/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-fragment/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-server/pom.xml | 2 +- .../test-jetty-osgi-webapp-resources/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-webapp/pom.xml | 2 +- jetty-osgi/test-jetty-osgi/pom.xml | 2 +- jetty-p2/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-proxy/pom.xml | 2 +- jetty-quic/pom.xml | 2 +- jetty-quic/quic-client/pom.xml | 2 +- jetty-quic/quic-common/pom.xml | 2 +- jetty-quic/quic-quiche/pom.xml | 2 +- .../quic-quiche/quic-quiche-common/pom.xml | 2 +- .../quic-quiche-foreign-incubator/pom.xml | 2 +- .../quic-quiche/quic-quiche-jna/pom.xml | 2 +- jetty-quic/quic-server/pom.xml | 2 +- jetty-quickstart/pom.xml | 2 +- jetty-rewrite/pom.xml | 2 +- jetty-runner/pom.xml | 2 +- jetty-security/pom.xml | 2 +- jetty-server/pom.xml | 2 +- jetty-servlet/pom.xml | 2 +- jetty-servlets/pom.xml | 2 +- jetty-slf4j-impl/pom.xml | 2 +- jetty-start/pom.xml | 2 +- jetty-unixdomain-server/pom.xml | 2 +- .../jetty-unixsocket-client/pom.xml | 2 +- .../jetty-unixsocket-common/pom.xml | 2 +- .../jetty-unixsocket-server/pom.xml | 2 +- jetty-unixsocket/pom.xml | 2 +- jetty-util-ajax/pom.xml | 2 +- jetty-util/pom.xml | 2 +- jetty-webapp/pom.xml | 2 +- jetty-websocket/pom.xml | 2 +- jetty-websocket/websocket-core-client/pom.xml | 2 +- jetty-websocket/websocket-core-common/pom.xml | 2 +- jetty-websocket/websocket-core-server/pom.xml | 2 +- jetty-websocket/websocket-core-tests/pom.xml | 2 +- .../websocket-jakarta-client/pom.xml | 2 +- .../websocket-jakarta-common/pom.xml | 2 +- .../websocket-jakarta-server/pom.xml | 2 +- .../websocket-jakarta-tests/pom.xml | 2 +- jetty-websocket/websocket-jetty-api/pom.xml | 2 +- .../websocket-jetty-client/pom.xml | 2 +- .../websocket-jetty-common/pom.xml | 2 +- .../websocket-jetty-server/pom.xml | 2 +- jetty-websocket/websocket-jetty-tests/pom.xml | 2 +- jetty-websocket/websocket-servlet/pom.xml | 2 +- jetty-xml/pom.xml | 2 +- pom.xml | 2 +- tests/jetty-home-tester/pom.xml | 2 +- tests/jetty-http-tools/pom.xml | 2 +- tests/jetty-jmh/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-cdi/pom.xml | 2 +- tests/test-distribution/pom.xml | 2 +- tests/test-http-client-transport/pom.xml | 2 +- tests/test-integration/pom.xml | 2 +- tests/test-jmx/jmx-webapp-it/pom.xml | 2 +- tests/test-jmx/jmx-webapp/pom.xml | 2 +- tests/test-jmx/pom.xml | 2 +- tests/test-jndi/pom.xml | 2 +- tests/test-jpms/pom.xml | 2 +- .../test-jpms-websocket-core/pom.xml | 2 +- tests/test-loginservice/pom.xml | 2 +- tests/test-quickstart/pom.xml | 2 +- tests/test-sessions/pom.xml | 2 +- .../test-sessions/test-file-sessions/pom.xml | 2 +- .../test-gcloud-sessions/pom.xml | 2 +- .../test-hazelcast-sessions/pom.xml | 2 +- .../test-infinispan-sessions/pom.xml | 2 +- .../test-sessions/test-jdbc-sessions/pom.xml | 2 +- .../test-memcached-sessions/pom.xml | 2 +- .../test-mongodb-sessions/pom.xml | 2 +- .../test-sessions-common/pom.xml | 2 +- tests/test-webapps/pom.xml | 2 +- .../test-bad-websocket-webapp/pom.xml | 2 +- .../test-cdi-common-webapp/pom.xml | 2 +- tests/test-webapps/test-felix-webapp/pom.xml | 2 +- tests/test-webapps/test-http2-webapp/pom.xml | 2 +- tests/test-webapps/test-openid-webapp/pom.xml | 2 +- .../test-webapps/test-owb-cdi-webapp/pom.xml | 2 +- .../test-simple-session-webapp/pom.xml | 2 +- .../test-webapps/test-webapp-rfc2616/pom.xml | 2 +- .../pom.xml | 2 +- .../test-websocket-client-webapp/pom.xml | 2 +- .../test-websocket-webapp/pom.xml | 2 +- .../test-webapps/test-weld-cdi-webapp/pom.xml | 2 +- tests/test-websocket-autobahn/pom.xml | 2 +- 174 files changed, 257 insertions(+), 255 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index d0922575d8ba..05640013cc81 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,5 @@ +jetty-11.0.18-SNAPSHOT + jetty-11.0.17 - 09 October 2023 + 9777 CrossOriginFilter does not return Vary header on no-cors mode + 9928 Backport `Request.getBeginNanoTime()` diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index 6035f0c1ff94..2f3684469b31 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/build-resources/pom.xml b/build-resources/pom.xml index 4a63d2f23ce4..87cad5518cc7 100644 --- a/build-resources/pom.xml +++ b/build-resources/pom.xml @@ -7,7 +7,7 @@ --> org.eclipse.jetty build-resources - 11.0.17 + 11.0.18-SNAPSHOT Jetty :: Build Resources jar diff --git a/demos/demo-async-rest/demo-async-rest-jar/pom.xml b/demos/demo-async-rest/demo-async-rest-jar/pom.xml index c76a57bb2315..8b1b721a6499 100644 --- a/demos/demo-async-rest/demo-async-rest-jar/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-jar/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/demos/demo-async-rest/demo-async-rest-server/pom.xml b/demos/demo-async-rest/demo-async-rest-server/pom.xml index fb0a9d838769..f567ce742111 100644 --- a/demos/demo-async-rest/demo-async-rest-server/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml index d852b4baa21f..8e2148dfa55d 100644 --- a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/demos/demo-async-rest/pom.xml b/demos/demo-async-rest/pom.xml index ae4ffa13bc80..dd3c60bb916f 100644 --- a/demos/demo-async-rest/pom.xml +++ b/demos/demo-async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/demos/demo-jaas-webapp/pom.xml b/demos/demo-jaas-webapp/pom.xml index 3a4715244fbc..aa0968e63cf4 100644 --- a/demos/demo-jaas-webapp/pom.xml +++ b/demos/demo-jaas-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17 + 11.0.18-SNAPSHOT demo-jaas-webapp Demo :: JAAS :: WebApp diff --git a/demos/demo-jetty-webapp/pom.xml b/demos/demo-jetty-webapp/pom.xml index 256f95f2f64b..40283f099559 100644 --- a/demos/demo-jetty-webapp/pom.xml +++ b/demos/demo-jetty-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17 + 11.0.18-SNAPSHOT ../pom.xml 4.0.0 diff --git a/demos/demo-jndi-webapp/pom.xml b/demos/demo-jndi-webapp/pom.xml index 70b99576f34c..f046db977086 100644 --- a/demos/demo-jndi-webapp/pom.xml +++ b/demos/demo-jndi-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17 + 11.0.18-SNAPSHOT demo-jndi-webapp Demo :: JNDI :: WebApp diff --git a/demos/demo-jsp-webapp/pom.xml b/demos/demo-jsp-webapp/pom.xml index 7b33968dfd61..50ab4b059b29 100644 --- a/demos/demo-jsp-webapp/pom.xml +++ b/demos/demo-jsp-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/demos/demo-mock-resources/pom.xml b/demos/demo-mock-resources/pom.xml index d69fdbb97a3c..073fe7d6e03a 100644 --- a/demos/demo-mock-resources/pom.xml +++ b/demos/demo-mock-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17 + 11.0.18-SNAPSHOT Demo :: Mock Resources demo-mock-resources diff --git a/demos/demo-proxy-webapp/pom.xml b/demos/demo-proxy-webapp/pom.xml index 0388822e7920..a039ebed2871 100644 --- a/demos/demo-proxy-webapp/pom.xml +++ b/demos/demo-proxy-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 demo-proxy-webapp diff --git a/demos/demo-simple-webapp/pom.xml b/demos/demo-simple-webapp/pom.xml index b4a884402e7a..b21205719450 100644 --- a/demos/demo-simple-webapp/pom.xml +++ b/demos/demo-simple-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/demos/demo-spec/demo-container-initializer/pom.xml b/demos/demo-spec/demo-container-initializer/pom.xml index c56846571ab1..3be8f2c47b11 100644 --- a/demos/demo-spec/demo-container-initializer/pom.xml +++ b/demos/demo-spec/demo-container-initializer/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17 + 11.0.18-SNAPSHOT ../../pom.xml demo-container-initializer diff --git a/demos/demo-spec/demo-spec-webapp/pom.xml b/demos/demo-spec/demo-spec-webapp/pom.xml index 0f867ac7a593..f81c1b93afde 100644 --- a/demos/demo-spec/demo-spec-webapp/pom.xml +++ b/demos/demo-spec/demo-spec-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17 + 11.0.18-SNAPSHOT ../../pom.xml Demo :: Servlet Spec :: Webapp diff --git a/demos/demo-spec/demo-web-fragment/pom.xml b/demos/demo-spec/demo-web-fragment/pom.xml index ef7ed8b64e24..083e3bda7c9c 100644 --- a/demos/demo-spec/demo-web-fragment/pom.xml +++ b/demos/demo-spec/demo-web-fragment/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17 + 11.0.18-SNAPSHOT ../../pom.xml diff --git a/demos/demo-spec/pom.xml b/demos/demo-spec/pom.xml index dd910653d71b..af713c80eb89 100644 --- a/demos/demo-spec/pom.xml +++ b/demos/demo-spec/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17 + 11.0.18-SNAPSHOT Demo :: Servlet Spec demo-spec diff --git a/demos/embedded/pom.xml b/demos/embedded/pom.xml index 9a34eebb67d9..a9ac27c1613c 100644 --- a/demos/embedded/pom.xml +++ b/demos/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demos-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 demos-jetty-embedded diff --git a/demos/pom.xml b/demos/pom.xml index ee90023f7fe7..b181ac314e0f 100644 --- a/demos/pom.xml +++ b/demos/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml index 748f65cbc6f6..8e7d1873485c 100644 --- a/documentation/jetty-asciidoctor-extensions/pom.xml +++ b/documentation/jetty-asciidoctor-extensions/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.documentation documentation-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index 9f0ef321384c..2852e072d9c9 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.documentation documentation-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/documentation/pom.xml b/documentation/pom.xml index 3114527de6ef..137445b361bb 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/glassfish-jstl/pom.xml b/glassfish-jstl/pom.xml index 1798400d563e..534b8291ca42 100644 --- a/glassfish-jstl/pom.xml +++ b/glassfish-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 glassfish-jstl diff --git a/javadoc/pom.xml b/javadoc/pom.xml index 252aa188ae5b..a4cca53be9dd 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index e5f5c6d5cb9f..65fb382aca63 100644 --- a/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-alpn/jetty-alpn-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-alpn-client diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index 6e0177d462e6..5c490b65b5b1 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index d62eef7c4274..26e6417ecdc4 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index b78de7045e69..a31699f332b3 100644 --- a/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index 2d1bfe33b513..beae121c5adf 100644 --- a/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index 2a01c4851533..3f2df77d206e 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-alpn-server diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index 1ba135ba1ab8..1ede3f2b328a 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-alpn-parent diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 0b0992447abe..ea4dfa85727f 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 2c24ef95db0b..98ad72b9d0ce 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-ant diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index 3940e2d2e156..a70b5f71959b 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT jetty-bom @@ -53,409 +53,409 @@ org.eclipse.jetty apache-jsp - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty glassfish-jstl - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-alpn-client - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-alpn-java-client - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-alpn-java-server - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-alpn-conscrypt-client - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-alpn-conscrypt-server - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-alpn-server - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-annotations - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-ant - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-client - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-cdi - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-deploy - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.fcgi fcgi-client - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.fcgi fcgi-server - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.gcloud jetty-gcloud-session-manager - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-home - 11.0.17 + 11.0.18-SNAPSHOT zip org.eclipse.jetty jetty-home - 11.0.17 + 11.0.18-SNAPSHOT tar.gz org.eclipse.jetty jetty-http - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.http2 http2-client - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.http2 http2-common - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.http2 http2-hpack - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.http2 http2-http-client-transport - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.http2 http2-server - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.http3 http3-client - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.http3 http3-common - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.http3 http3-http-client-transport - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.http3 http3-qpack - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.http3 http3-server - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-http-spi - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty infinispan-common - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty infinispan-remote-query - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty infinispan-embedded-query - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-hazelcast - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-io - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-jaas - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-jaspi - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-jmx - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-jndi - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-keystore - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.memcached jetty-memcached-sessions - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-nosql - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-alpn - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-boot - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-boot-jsp - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-boot-warurl - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.quic quic-client - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.quic quic-common - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.quic quic-quiche-common - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.quic quic-quiche-jna - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.quic quic-server - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.osgi jetty-httpservice - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-plus - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-proxy - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-quickstart - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-rewrite - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-security - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-openid - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-server - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-servlet - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-servlets - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-slf4j-impl - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-unixdomain-server - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-unixsocket-common - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-unixsocket-client - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-unixsocket-server - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-util - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-util-ajax - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-webapp - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-jakarta-client - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-jakarta-server - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-jakarta-common - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-jetty-api - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-jetty-client - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-jetty-common - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-jetty-server - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-servlet - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-core-common - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-core-client - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty.websocket websocket-core-server - 11.0.17 + 11.0.18-SNAPSHOT org.eclipse.jetty jetty-xml - 11.0.17 + 11.0.18-SNAPSHOT @@ -471,7 +471,7 @@ org.eclipse.jetty.quic quic-quiche-foreign-incubator - 11.0.17 + 11.0.18-SNAPSHOT diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index f866c883e078..0a3c45889010 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index f38d47cfe04d..34e0ff570127 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 8d6894792940..e3309764dc05 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index 365c51047646..94cca90d29bb 100644 --- a/jetty-fcgi/fcgi-client/pom.xml +++ b/jetty-fcgi/fcgi-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi fcgi-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index cd48cbdf896f..6033db9254b4 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi fcgi-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml index c9b4096f6729..e3f323d9625b 100644 --- a/jetty-fcgi/pom.xml +++ b/jetty-fcgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index ca9c325ecff7..7a0b5ebb928f 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.gcloud gcloud-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index 5d63e2c8e07f..2c885fff4603 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index 861ab3ad1a8d..412e7bd06b6b 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 36534c7757f8..f821b475ebd4 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-home diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 725a553c2334..e59f8adbdfd7 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 72d7c91706ce..1dd42ce43290 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index 509343e80fe8..fb72af11e11c 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index 6b829676b78e..262a20a7c0d7 100644 --- a/jetty-http2/http2-common/pom.xml +++ b/jetty-http2/http2-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index 0247295cfcda..112418782cad 100644 --- a/jetty-http2/http2-hpack/pom.xml +++ b/jetty-http2/http2-hpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index f4e110fe1b4f..1b97c4419533 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index b628fcc182c1..0258af308b4e 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml index 0683f0a0da6c..2ddea88fc2b8 100644 --- a/jetty-http2/pom.xml +++ b/jetty-http2/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-client/pom.xml b/jetty-http3/http3-client/pom.xml index 230f5aa9e40f..83a69da0411f 100644 --- a/jetty-http3/http3-client/pom.xml +++ b/jetty-http3/http3-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-common/pom.xml b/jetty-http3/http3-common/pom.xml index 768257a850d2..3cab55fdd9fc 100644 --- a/jetty-http3/http3-common/pom.xml +++ b/jetty-http3/http3-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-http-client-transport/pom.xml b/jetty-http3/http3-http-client-transport/pom.xml index 4e3a2987b100..02579a093dc9 100644 --- a/jetty-http3/http3-http-client-transport/pom.xml +++ b/jetty-http3/http3-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-qpack/pom.xml b/jetty-http3/http3-qpack/pom.xml index 87b9212309e2..339699a744a3 100644 --- a/jetty-http3/http3-qpack/pom.xml +++ b/jetty-http3/http3-qpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-server/pom.xml b/jetty-http3/http3-server/pom.xml index 0f03401ed0b4..3876f08eb3f8 100644 --- a/jetty-http3/http3-server/pom.xml +++ b/jetty-http3/http3-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-tests/pom.xml b/jetty-http3/http3-tests/pom.xml index abc24c9333ca..9132e0378d3f 100644 --- a/jetty-http3/http3-tests/pom.xml +++ b/jetty-http3/http3-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-http3/pom.xml b/jetty-http3/pom.xml index 5c0ffcb0d144..fa9fce8a6697 100644 --- a/jetty-http3/pom.xml +++ b/jetty-http3/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml index 303415f239a4..d19cd9a24cef 100644 --- a/jetty-infinispan/infinispan-common/pom.xml +++ b/jetty-infinispan/infinispan-common/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 infinispan-common diff --git a/jetty-infinispan/infinispan-embedded-query/pom.xml b/jetty-infinispan/infinispan-embedded-query/pom.xml index c603c68d0022..8f0ddfa7592c 100644 --- a/jetty-infinispan/infinispan-embedded-query/pom.xml +++ b/jetty-infinispan/infinispan-embedded-query/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 infinispan-embedded-query diff --git a/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-infinispan/infinispan-embedded/pom.xml index 9f4822709338..8f74b33d3884 100644 --- a/jetty-infinispan/infinispan-embedded/pom.xml +++ b/jetty-infinispan/infinispan-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 infinispan-embedded diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml index a35a52066b8e..26e11403bc69 100644 --- a/jetty-infinispan/infinispan-remote-query/pom.xml +++ b/jetty-infinispan/infinispan-remote-query/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 infinispan-remote-query diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml index def332ef44d3..2a956f4cd7db 100644 --- a/jetty-infinispan/infinispan-remote/pom.xml +++ b/jetty-infinispan/infinispan-remote/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 infinispan-remote diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml index dcb7f1b81383..ace20521df76 100644 --- a/jetty-infinispan/pom.xml +++ b/jetty-infinispan/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 5c5ece5eaa9a..0e705e566664 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 474574f46152..57f3b9dd305c 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 863aed4b29b8..c6a9e95687f9 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 6258bdc9272c..048d49710797 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 15ab790f9739..3cc77e2442c9 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index bb5d5137a23d..8e9eacfedc99 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-keystore/pom.xml b/jetty-keystore/pom.xml index 83eb4721edfa..4aa5c43a8690 100644 --- a/jetty-keystore/pom.xml +++ b/jetty-keystore/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-keystore diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index cb3ae2e1c522..739a7dbb92c6 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-maven-plugin diff --git a/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-memcached/jetty-memcached-sessions/pom.xml index 8a35e146aaf5..5967f6867cb1 100644 --- a/jetty-memcached/jetty-memcached-sessions/pom.xml +++ b/jetty-memcached/jetty-memcached-sessions/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.memcached memcached-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-memcached/pom.xml b/jetty-memcached/pom.xml index d6ab4187a68e..50e6e1a5aac7 100644 --- a/jetty-memcached/pom.xml +++ b/jetty-memcached/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index e735ace3ab0b..aacf8b913518 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-nosql diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index 92ced5f818d9..5cb923d5e090 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml index ed395beb844a..bd2a5f4da2cb 100644 --- a/jetty-osgi/jetty-osgi-alpn/pom.xml +++ b/jetty-osgi/jetty-osgi-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17 + 11.0.18-SNAPSHOT diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index eeff5181dc43..614c37bde826 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-osgi-boot-jsp diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index 2068ec5ab51a..17b451905219 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17 + 11.0.18-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 3541906dddec..5028b9f82199 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-osgi-boot diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index 95465639f609..6663f0822b84 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-httpservice diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index 888ce8a863e3..01bfb9f3a14b 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index 2214ef88c5ec..c536bf42e8ad 100644 --- a/jetty-osgi/test-jetty-osgi-context/pom.xml +++ b/jetty-osgi/test-jetty-osgi-context/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 test-jetty-osgi-context diff --git a/jetty-osgi/test-jetty-osgi-fragment/pom.xml b/jetty-osgi/test-jetty-osgi-fragment/pom.xml index 4e762e643090..988765c426a9 100644 --- a/jetty-osgi/test-jetty-osgi-fragment/pom.xml +++ b/jetty-osgi/test-jetty-osgi-fragment/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17 + 11.0.18-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-server/pom.xml b/jetty-osgi/test-jetty-osgi-server/pom.xml index dbac6056638e..6b0b055dbb4a 100644 --- a/jetty-osgi/test-jetty-osgi-server/pom.xml +++ b/jetty-osgi/test-jetty-osgi-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 test-jetty-osgi-server diff --git a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml index 248c6fe30900..9cf2f93c1d61 100644 --- a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 test-jetty-osgi-webapp-resources diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index aec18998ffc2..d7c3b8d26a53 100644 --- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17 + 11.0.18-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 7d1c38d09151..2ccc2ba48872 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 11.0.17 + 11.0.18-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml index 0d9b7625a21b..1fac60880060 100644 --- a/jetty-p2/pom.xml +++ b/jetty-p2/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-p2 diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index a78d05a851d7..33f252d7f4e1 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index e89c95f27a2c..1b6f2226a029 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quic/pom.xml b/jetty-quic/pom.xml index 0291be0aeff7..f21a41693a42 100644 --- a/jetty-quic/pom.xml +++ b/jetty-quic/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-client/pom.xml b/jetty-quic/quic-client/pom.xml index 5a6992357a49..78059d6c52c1 100644 --- a/jetty-quic/quic-client/pom.xml +++ b/jetty-quic/quic-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-common/pom.xml b/jetty-quic/quic-common/pom.xml index 1d6db068762b..a099bb9bf8b9 100644 --- a/jetty-quic/quic-common/pom.xml +++ b/jetty-quic/quic-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-quiche/pom.xml b/jetty-quic/quic-quiche/pom.xml index bde321314a80..12e3d668c7d9 100644 --- a/jetty-quic/quic-quiche/pom.xml +++ b/jetty-quic/quic-quiche/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-common/pom.xml b/jetty-quic/quic-quiche/quic-quiche-common/pom.xml index 8729885986a7..6a640afa7939 100644 --- a/jetty-quic/quic-quiche/quic-quiche-common/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml index 75abd8a706e6..d448f902096d 100644 --- a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml b/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml index 39b98bf38c72..04efa7920914 100644 --- a/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-server/pom.xml b/jetty-quic/quic-server/pom.xml index 7fb3228f697b..c0b2d122c0fd 100644 --- a/jetty-quic/quic-server/pom.xml +++ b/jetty-quic/quic-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index f4b02228e150..341e7b626eb5 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 3b23b4930f1a..5d41ae477471 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 6f3f2941daf5..2b635e2f4929 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-runner diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 73ddb6903f0c..58f5c789dd18 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index e492406c4a0b..7ee6bd85fcee 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index a3eb207e7bb2..904ecd1f4558 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index fd9497b66378..cba940fa33c8 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-slf4j-impl/pom.xml b/jetty-slf4j-impl/pom.xml index cbf13618e428..37e80fdd0557 100644 --- a/jetty-slf4j-impl/pom.xml +++ b/jetty-slf4j-impl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 6af8e964b99d..8e45931ff11a 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-start diff --git a/jetty-unixdomain-server/pom.xml b/jetty-unixdomain-server/pom.xml index 52c2b05b84d9..fde194b6f755 100644 --- a/jetty-unixdomain-server/pom.xml +++ b/jetty-unixdomain-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-client/pom.xml b/jetty-unixsocket/jetty-unixsocket-client/pom.xml index 955e5296ad29..9d3fb8b8c7ef 100644 --- a/jetty-unixsocket/jetty-unixsocket-client/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-client/pom.xml @@ -3,7 +3,7 @@ jetty-unixsocket org.eclipse.jetty - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-common/pom.xml b/jetty-unixsocket/jetty-unixsocket-common/pom.xml index 1ade6484a7d5..7fdfec30c8ee 100644 --- a/jetty-unixsocket/jetty-unixsocket-common/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-unixsocket - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-server/pom.xml b/jetty-unixsocket/jetty-unixsocket-server/pom.xml index 23cdb257ddfd..988df1841618 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/pom.xml @@ -3,7 +3,7 @@ jetty-unixsocket org.eclipse.jetty - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-unixsocket/pom.xml b/jetty-unixsocket/pom.xml index b3f59b5f0bed..01ffdf5b6de1 100644 --- a/jetty-unixsocket/pom.xml +++ b/jetty-unixsocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 1839a87f5162..bb092b85258e 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 758ca393d446..03f7f5454f47 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 2d09318c7969..3f3b8deb5e6d 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index ca7c93cdc41e..752e58a64d9b 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-core-client/pom.xml b/jetty-websocket/websocket-core-client/pom.xml index f43f29d6dff8..9b077a793115 100644 --- a/jetty-websocket/websocket-core-client/pom.xml +++ b/jetty-websocket/websocket-core-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-core-common/pom.xml b/jetty-websocket/websocket-core-common/pom.xml index 5ebdbca5da90..301c53969b94 100644 --- a/jetty-websocket/websocket-core-common/pom.xml +++ b/jetty-websocket/websocket-core-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-core-server/pom.xml b/jetty-websocket/websocket-core-server/pom.xml index 001a8c1db4a3..a762665d8b19 100644 --- a/jetty-websocket/websocket-core-server/pom.xml +++ b/jetty-websocket/websocket-core-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-core-tests/pom.xml b/jetty-websocket/websocket-core-tests/pom.xml index 591ff87fcb77..019e7acabe88 100644 --- a/jetty-websocket/websocket-core-tests/pom.xml +++ b/jetty-websocket/websocket-core-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jakarta-client/pom.xml b/jetty-websocket/websocket-jakarta-client/pom.xml index a42175216259..612e7c6b1d6f 100644 --- a/jetty-websocket/websocket-jakarta-client/pom.xml +++ b/jetty-websocket/websocket-jakarta-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jakarta-common/pom.xml b/jetty-websocket/websocket-jakarta-common/pom.xml index 80112e6d4f5b..1c52f9b251c9 100644 --- a/jetty-websocket/websocket-jakarta-common/pom.xml +++ b/jetty-websocket/websocket-jakarta-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jakarta-server/pom.xml b/jetty-websocket/websocket-jakarta-server/pom.xml index c5418351f857..205d4cf0ddb1 100644 --- a/jetty-websocket/websocket-jakarta-server/pom.xml +++ b/jetty-websocket/websocket-jakarta-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jakarta-tests/pom.xml b/jetty-websocket/websocket-jakarta-tests/pom.xml index bbcae2c93092..a38bfd4492ff 100644 --- a/jetty-websocket/websocket-jakarta-tests/pom.xml +++ b/jetty-websocket/websocket-jakarta-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jetty-api/pom.xml b/jetty-websocket/websocket-jetty-api/pom.xml index e263f6880b9a..52807f4ee72a 100644 --- a/jetty-websocket/websocket-jetty-api/pom.xml +++ b/jetty-websocket/websocket-jetty-api/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jetty-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml index ba767c678d54..ede6ccb880dd 100644 --- a/jetty-websocket/websocket-jetty-client/pom.xml +++ b/jetty-websocket/websocket-jetty-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jetty-common/pom.xml b/jetty-websocket/websocket-jetty-common/pom.xml index 5324a759f004..dd80bac7920d 100644 --- a/jetty-websocket/websocket-jetty-common/pom.xml +++ b/jetty-websocket/websocket-jetty-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jetty-server/pom.xml b/jetty-websocket/websocket-jetty-server/pom.xml index b54aef5f6e79..cb7831fc9e33 100644 --- a/jetty-websocket/websocket-jetty-server/pom.xml +++ b/jetty-websocket/websocket-jetty-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml index 6e4ba7d0e739..cdd6f7e06afe 100644 --- a/jetty-websocket/websocket-jetty-tests/pom.xml +++ b/jetty-websocket/websocket-jetty-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 29446e715899..3e89e11813b4 100644 --- a/jetty-websocket/websocket-servlet/pom.xml +++ b/jetty-websocket/websocket-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index d844c0c4a059..0ecd9cb9e576 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 33b2c456c3ed..95732c8197de 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT Jetty :: Project The Eclipse Jetty Project pom diff --git a/tests/jetty-home-tester/pom.xml b/tests/jetty-home-tester/pom.xml index aa9512744341..4de91a24591c 100644 --- a/tests/jetty-home-tester/pom.xml +++ b/tests/jetty-home-tester/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/jetty-http-tools/pom.xml b/tests/jetty-http-tools/pom.xml index 39e37d28ecfd..0fcdf5ab273c 100644 --- a/tests/jetty-http-tools/pom.xml +++ b/tests/jetty-http-tools/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index 8e8ecc2c8a2b..009e2c66d420 100644 --- a/tests/jetty-jmh/pom.xml +++ b/tests/jetty-jmh/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/pom.xml b/tests/pom.xml index d11ce22bd835..382f89b1429e 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 11.0.17 + 11.0.18-SNAPSHOT ../pom.xml org.eclipse.jetty.tests diff --git a/tests/test-cdi/pom.xml b/tests/test-cdi/pom.xml index dc96121ba98d..276c9b6983ad 100644 --- a/tests/test-cdi/pom.xml +++ b/tests/test-cdi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 5c463c4e9086..8367e871f1d0 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index dca551c69634..b24bc50ab966 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index ffdae1e98f78..068d4fe76ff0 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 test-integration diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml index 37f3f038cca5..a6be7fc66c83 100644 --- a/tests/test-jmx/jmx-webapp-it/pom.xml +++ b/tests/test-jmx/jmx-webapp-it/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-jmx-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 jmx-webapp-it diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml index 331995a0d041..6c29a000ea1c 100644 --- a/tests/test-jmx/jmx-webapp/pom.xml +++ b/tests/test-jmx/jmx-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-jmx-parent - 11.0.17 + 11.0.18-SNAPSHOT jmx-webapp war diff --git a/tests/test-jmx/pom.xml b/tests/test-jmx/pom.xml index 80d49782b0da..5538b798e887 100644 --- a/tests/test-jmx/pom.xml +++ b/tests/test-jmx/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 test-jmx-parent diff --git a/tests/test-jndi/pom.xml b/tests/test-jndi/pom.xml index 5527ad50cf2c..c33bc5ee4600 100644 --- a/tests/test-jndi/pom.xml +++ b/tests/test-jndi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-jpms/pom.xml b/tests/test-jpms/pom.xml index f52f06b2be66..8cc866bada67 100644 --- a/tests/test-jpms/pom.xml +++ b/tests/test-jpms/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 test-jpms diff --git a/tests/test-jpms/test-jpms-websocket-core/pom.xml b/tests/test-jpms/test-jpms-websocket-core/pom.xml index b8f09a8c252e..d6d787e73e43 100644 --- a/tests/test-jpms/test-jpms-websocket-core/pom.xml +++ b/tests/test-jpms/test-jpms-websocket-core/pom.xml @@ -3,7 +3,7 @@ test-jpms org.eclipse.jetty.tests - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 test-jpms-websocket-core diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 01d144ceaa36..037a2d7965ed 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17 + 11.0.18-SNAPSHOT test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index 65692ac47ac4..1341a69718b0 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17 + 11.0.18-SNAPSHOT ../pom.xml 4.0.0 diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 444b573bdc35..b30e1a13d0e7 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17 + 11.0.18-SNAPSHOT test-sessions-parent Jetty Tests :: Sessions :: Parent diff --git a/tests/test-sessions/test-file-sessions/pom.xml b/tests/test-sessions/test-file-sessions/pom.xml index d71d1accfe1c..67f1617f4a44 100644 --- a/tests/test-sessions/test-file-sessions/pom.xml +++ b/tests/test-sessions/test-file-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 11.0.17 + 11.0.18-SNAPSHOT test-file-sessions Jetty Tests :: Sessions :: File diff --git a/tests/test-sessions/test-gcloud-sessions/pom.xml b/tests/test-sessions/test-gcloud-sessions/pom.xml index 824f69504f35..eb3be20eaf41 100644 --- a/tests/test-sessions/test-gcloud-sessions/pom.xml +++ b/tests/test-sessions/test-gcloud-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 11.0.17 + 11.0.18-SNAPSHOT test-gcloud-sessions Jetty Tests :: Sessions :: GCloud diff --git a/tests/test-sessions/test-hazelcast-sessions/pom.xml b/tests/test-sessions/test-hazelcast-sessions/pom.xml index cf95d0bdb39a..9b23147caf7b 100644 --- a/tests/test-sessions/test-hazelcast-sessions/pom.xml +++ b/tests/test-sessions/test-hazelcast-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 11.0.17 + 11.0.18-SNAPSHOT test-hazelcast-sessions Jetty Tests :: Sessions :: Hazelcast diff --git a/tests/test-sessions/test-infinispan-sessions/pom.xml b/tests/test-sessions/test-infinispan-sessions/pom.xml index 5de2a76d515f..36d622b2cf6c 100644 --- a/tests/test-sessions/test-infinispan-sessions/pom.xml +++ b/tests/test-sessions/test-infinispan-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 11.0.17 + 11.0.18-SNAPSHOT test-infinispan-sessions Jetty Tests :: Sessions :: Infinispan diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index d461d8cfc8a0..a3465bb62b2c 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 11.0.17 + 11.0.18-SNAPSHOT test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-memcached-sessions/pom.xml b/tests/test-sessions/test-memcached-sessions/pom.xml index a863549038b5..6c1a31e33e43 100644 --- a/tests/test-sessions/test-memcached-sessions/pom.xml +++ b/tests/test-sessions/test-memcached-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 11.0.17 + 11.0.18-SNAPSHOT test-memcached-sessions Jetty Tests :: Sessions :: Memcached diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index 4810ce68c189..842aad52d823 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 11.0.17 + 11.0.18-SNAPSHOT test-mongodb-sessions Jetty Tests :: Sessions :: Mongo diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index 0e3131e55bdc..c6a318f639c5 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 11.0.17 + 11.0.18-SNAPSHOT test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index b3f53b332e9a..117d586b7590 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17 + 11.0.18-SNAPSHOT ../pom.xml test-webapps-parent diff --git a/tests/test-webapps/test-bad-websocket-webapp/pom.xml b/tests/test-webapps/test-bad-websocket-webapp/pom.xml index 8ac566883618..b5524ff5519f 100644 --- a/tests/test-webapps/test-bad-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-bad-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-cdi-common-webapp/pom.xml b/tests/test-webapps/test-cdi-common-webapp/pom.xml index 3f5c16a4bbcf..efcd663f74ae 100644 --- a/tests/test-webapps/test-cdi-common-webapp/pom.xml +++ b/tests/test-webapps/test-cdi-common-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-felix-webapp/pom.xml b/tests/test-webapps/test-felix-webapp/pom.xml index 11a8ce398779..04bfef94bd7a 100644 --- a/tests/test-webapps/test-felix-webapp/pom.xml +++ b/tests/test-webapps/test-felix-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-http2-webapp/pom.xml b/tests/test-webapps/test-http2-webapp/pom.xml index 9c5876732fa6..e217ba236d3f 100644 --- a/tests/test-webapps/test-http2-webapp/pom.xml +++ b/tests/test-webapps/test-http2-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-openid-webapp/pom.xml b/tests/test-webapps/test-openid-webapp/pom.xml index 43dfcf83ba08..198373c34960 100644 --- a/tests/test-webapps/test-openid-webapp/pom.xml +++ b/tests/test-webapps/test-openid-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-owb-cdi-webapp/pom.xml b/tests/test-webapps/test-owb-cdi-webapp/pom.xml index c81f41f3c249..bc91082c11aa 100644 --- a/tests/test-webapps/test-owb-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-owb-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-simple-session-webapp/pom.xml b/tests/test-webapps/test-simple-session-webapp/pom.xml index e30d2e560b9b..0d8ab540679d 100644 --- a/tests/test-webapps/test-simple-session-webapp/pom.xml +++ b/tests/test-webapps/test-simple-session-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17 + 11.0.18-SNAPSHOT test-simple-session-webapp diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 93589816b951..b21bd71a0ab1 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17 + 11.0.18-SNAPSHOT test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 diff --git a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml index 323cc6a99550..df7ddfa0940a 100644 --- a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-websocket-client-webapp/pom.xml b/tests/test-webapps/test-websocket-client-webapp/pom.xml index 2abc767a5f18..dc65dde5fbf8 100644 --- a/tests/test-webapps/test-websocket-client-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-websocket-webapp/pom.xml b/tests/test-webapps/test-websocket-webapp/pom.xml index 0c30f29d1b37..79869ad482e8 100644 --- a/tests/test-webapps/test-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-weld-cdi-webapp/pom.xml b/tests/test-webapps/test-weld-cdi-webapp/pom.xml index 507bd8db79da..6b757bfa4b12 100644 --- a/tests/test-webapps/test-weld-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-weld-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 diff --git a/tests/test-websocket-autobahn/pom.xml b/tests/test-websocket-autobahn/pom.xml index da71f51f9bcd..5dca5079477e 100644 --- a/tests/test-websocket-autobahn/pom.xml +++ b/tests/test-websocket-autobahn/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 11.0.17 + 11.0.18-SNAPSHOT 4.0.0 From 70b1fd40efe0f15c8797851700a24995c6b242bb Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 10 Oct 2023 11:26:55 +1100 Subject: [PATCH 23/31] fix infinite recursion in server dump with Path Signed-off-by: Lachlan Roberts --- .../jetty/util/component/Dumpable.java | 10 ++++- .../tests/distribution/DemoModulesTests.java | 44 +++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/Dumpable.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/Dumpable.java index 6b41542a7e5f..7c728f5a36f2 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/Dumpable.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/Dumpable.java @@ -15,10 +15,12 @@ import java.io.IOException; import java.lang.reflect.Array; +import java.nio.file.Path; import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.Map; +import java.util.Objects; import java.util.stream.Stream; import org.eclipse.jetty.util.StringUtil; @@ -155,7 +157,8 @@ static void dumpObjects(Appendable out, String indent, Object object, Object... { dumpContainer(out, indent, (Container)object, extras == 0); } - if (object instanceof Iterable) + // Dump an Iterable Path because it may contain itself. + if (object instanceof Iterable && !(object instanceof Path)) { dumpIterable(out, indent, (Iterable)object, extras == 0); } @@ -231,12 +234,15 @@ else if (containerLifeCycle != null && containerLifeCycle.isUnmanaged(bean)) } } } - + static void dumpIterable(Appendable out, String indent, Iterable iterable, boolean last) throws IOException { for (Iterator i = iterable.iterator(); i.hasNext(); ) { Object item = i.next(); + // Safety net to stop iteration when an Iterable contains itself e.g. Path. + if (Objects.equals(item, iterable)) + return; String nextIndent = indent + ((i.hasNext() || !last) ? "| " : " "); out.append(indent).append("+: "); if (item instanceof Dumpable) diff --git a/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DemoModulesTests.java b/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DemoModulesTests.java index 7e0bf3f6063f..24cc52e14a2c 100644 --- a/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DemoModulesTests.java +++ b/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DemoModulesTests.java @@ -652,4 +652,48 @@ public void testStaticContent(String env) throws Exception } } } + + @ParameterizedTest + @MethodSource("provideEnvironmentsToTest") + public void testJettyDemo(String env) throws Exception + { + Path jettyBase = newTestJettyBaseDirectory(); + String jettyVersion = System.getProperty("jettyVersion"); + JettyHomeTester distribution = JettyHomeTester.Builder.newInstance() + .jettyVersion(jettyVersion) + .jettyBase(jettyBase) + .build(); + + int httpPort = distribution.freePort(); + int sslPort = distribution.freePort(); + + String[] argsConfig = { + "--add-modules=http," + toEnvironment("demos", env) + }; + + try (JettyHomeTester.Run runConfig = distribution.start(argsConfig)) + { + assertTrue(runConfig.awaitFor(START_TIMEOUT, TimeUnit.SECONDS)); + assertEquals(0, runConfig.getExitValue()); + + String[] argsStart = { + "jetty.http.port=" + httpPort, + "jetty.ssl.port=" + sslPort, + "jetty.server.dumpAfterStart=true" + }; + + try (JettyHomeTester.Run runStart = distribution.start(argsStart)) + { + assertTrue(runStart.awaitConsoleLogsFor("Started oejs.Server@", START_TIMEOUT, TimeUnit.SECONDS)); + startHttpClient(); + String baseURI = "http://localhost:%d/%s-test".formatted(httpPort, env); + + ContentResponse response = client.POST(baseURI + "/dump/info").send(); + assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response)); + assertThat(response.getContentAsString(), containsString("Dump Servlet")); + assertThat(response.getContentAsString(), containsString("context-override-example: a context value")); + } + } + } + } From b01e3611cfcec50c9157c50f6d32a93515e01510 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 9 Oct 2023 20:59:14 -0500 Subject: [PATCH 24/31] Updating to version 12.0.2 --- VERSION.txt | 97 +++++++++++---- build/build-resources/pom.xml | 2 +- build/pom.xml | 2 +- .../jetty-asciidoctor-extensions/pom.xml | 2 +- documentation/jetty-documentation/pom.xml | 2 +- documentation/pom.xml | 2 +- javadoc/pom.xml | 2 +- .../jetty-alpn/jetty-alpn-client/pom.xml | 2 +- .../jetty-alpn-conscrypt-client/pom.xml | 2 +- .../jetty-alpn-conscrypt-server/pom.xml | 2 +- .../jetty-alpn/jetty-alpn-java-client/pom.xml | 2 +- .../jetty-alpn/jetty-alpn-java-server/pom.xml | 2 +- .../jetty-alpn/jetty-alpn-server/pom.xml | 2 +- jetty-core/jetty-alpn/pom.xml | 2 +- jetty-core/jetty-bom/pom.xml | 112 +++++++++--------- jetty-core/jetty-client/pom.xml | 2 +- .../jetty-demos/jetty-demo-handler/pom.xml | 2 +- jetty-core/jetty-demos/pom.xml | 2 +- jetty-core/jetty-deploy/pom.xml | 2 +- .../jetty-fcgi/jetty-fcgi-client/pom.xml | 2 +- .../jetty-fcgi/jetty-fcgi-proxy/pom.xml | 2 +- .../jetty-fcgi/jetty-fcgi-server/pom.xml | 2 +- jetty-core/jetty-fcgi/pom.xml | 2 +- jetty-core/jetty-http-spi/pom.xml | 2 +- jetty-core/jetty-http-tools/pom.xml | 2 +- jetty-core/jetty-http/pom.xml | 2 +- .../jetty-http2-client-transport/pom.xml | 2 +- .../jetty-http2/jetty-http2-client/pom.xml | 2 +- .../jetty-http2/jetty-http2-common/pom.xml | 2 +- .../jetty-http2/jetty-http2-hpack/pom.xml | 2 +- .../jetty-http2/jetty-http2-server/pom.xml | 2 +- .../jetty-http2/jetty-http2-tests/pom.xml | 2 +- jetty-core/jetty-http2/pom.xml | 2 +- .../jetty-http3-client-transport/pom.xml | 2 +- .../jetty-http3/jetty-http3-client/pom.xml | 2 +- .../jetty-http3/jetty-http3-common/pom.xml | 2 +- .../jetty-http3/jetty-http3-qpack/pom.xml | 2 +- .../jetty-http3/jetty-http3-server/pom.xml | 2 +- .../jetty-http3/jetty-http3-tests/pom.xml | 2 +- jetty-core/jetty-http3/pom.xml | 2 +- jetty-core/jetty-io/pom.xml | 2 +- jetty-core/jetty-jmx/pom.xml | 2 +- jetty-core/jetty-jndi/pom.xml | 2 +- jetty-core/jetty-keystore/pom.xml | 2 +- jetty-core/jetty-openid/pom.xml | 2 +- jetty-core/jetty-osgi/pom.xml | 2 +- jetty-core/jetty-proxy/pom.xml | 2 +- .../jetty-quic/jetty-quic-client/pom.xml | 2 +- .../jetty-quic/jetty-quic-common/pom.xml | 2 +- .../jetty-quic-quiche-common/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-quic-quiche-jna/pom.xml | 2 +- .../jetty-quic/jetty-quic-quiche/pom.xml | 2 +- .../jetty-quic/jetty-quic-server/pom.xml | 2 +- jetty-core/jetty-quic/pom.xml | 2 +- jetty-core/jetty-rewrite/pom.xml | 2 +- jetty-core/jetty-security/pom.xml | 2 +- jetty-core/jetty-server/pom.xml | 2 +- jetty-core/jetty-session/pom.xml | 2 +- jetty-core/jetty-slf4j-impl/pom.xml | 2 +- jetty-core/jetty-start/pom.xml | 2 +- .../jetty-test-client-transports/pom.xml | 2 +- jetty-core/jetty-tests/pom.xml | 2 +- jetty-core/jetty-unixdomain-server/pom.xml | 2 +- jetty-core/jetty-util-ajax/pom.xml | 2 +- jetty-core/jetty-util/pom.xml | 2 +- .../jetty-websocket-core-client/pom.xml | 2 +- .../jetty-websocket-core-common/pom.xml | 2 +- .../jetty-websocket-core-server/pom.xml | 2 +- .../jetty-websocket-core-tests/pom.xml | 2 +- .../jetty-websocket-jetty-api/pom.xml | 2 +- .../jetty-websocket-jetty-client/pom.xml | 2 +- .../jetty-websocket-jetty-common/pom.xml | 2 +- .../jetty-websocket-jetty-server/pom.xml | 2 +- .../jetty-websocket-jetty-tests/pom.xml | 2 +- jetty-core/jetty-websocket/pom.xml | 2 +- jetty-core/jetty-xml/pom.xml | 2 +- jetty-core/pom.xml | 2 +- jetty-ee10/jetty-ee10-annotations/pom.xml | 2 +- jetty-ee10/jetty-ee10-apache-jsp/pom.xml | 2 +- jetty-ee10/jetty-ee10-bom/pom.xml | 54 ++++----- jetty-ee10/jetty-ee10-cdi/pom.xml | 2 +- .../jetty-ee10-demo-async-rest-jar/pom.xml | 2 +- .../jetty-ee10-demo-async-rest-server/pom.xml | 2 +- .../jetty-ee10-demo-async-rest-webapp/pom.xml | 2 +- .../jetty-ee10-demo-async-rest/pom.xml | 2 +- .../jetty-ee10-demo-embedded/pom.xml | 2 +- .../jetty-ee10-demo-jaas-webapp/pom.xml | 2 +- .../jetty-ee10-demo-jetty-webapp/pom.xml | 2 +- .../jetty-ee10-demo-jndi-webapp/pom.xml | 2 +- .../jetty-ee10-demo-jsp-webapp/pom.xml | 2 +- .../jetty-ee10-demo-mock-resources/pom.xml | 2 +- .../jetty-ee10-demo-proxy-webapp/pom.xml | 2 +- .../jetty-ee10-demo-simple-webapp/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee10-demo-spec-webapp/pom.xml | 2 +- .../jetty-ee10-demo-web-fragment/pom.xml | 2 +- .../jetty-ee10-demo-spec/pom.xml | 2 +- .../jetty-ee10-demo-template/pom.xml | 2 +- jetty-ee10/jetty-ee10-demos/pom.xml | 2 +- jetty-ee10/jetty-ee10-examples/pom.xml | 2 +- jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml | 2 +- jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml | 2 +- jetty-ee10/jetty-ee10-home/pom.xml | 2 +- jetty-ee10/jetty-ee10-jaspi/pom.xml | 2 +- jetty-ee10/jetty-ee10-jndi/pom.xml | 2 +- .../jetty-ee10-jspc-maven-plugin/pom.xml | 2 +- jetty-ee10/jetty-ee10-maven-plugin/pom.xml | 2 +- .../jetty-ee10-osgi-alpn/pom.xml | 2 +- .../jetty-ee10-osgi-boot-jsp/pom.xml | 2 +- .../jetty-ee10-osgi-boot/pom.xml | 2 +- jetty-ee10/jetty-ee10-osgi/pom.xml | 2 +- .../test-jetty-ee10-osgi-fragment/pom.xml | 2 +- .../test-jetty-ee10-osgi-server/pom.xml | 2 +- .../pom.xml | 2 +- .../test-jetty-ee10-osgi/pom.xml | 2 +- jetty-ee10/jetty-ee10-plus/pom.xml | 2 +- jetty-ee10/jetty-ee10-proxy/pom.xml | 2 +- jetty-ee10/jetty-ee10-quickstart/pom.xml | 2 +- jetty-ee10/jetty-ee10-runner/pom.xml | 2 +- jetty-ee10/jetty-ee10-servlet/pom.xml | 2 +- jetty-ee10/jetty-ee10-servlets/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee10-test-badinit-webapp/pom.xml | 2 +- .../jetty-ee10-test-cdi-common-webapp/pom.xml | 2 +- .../jetty-ee10-test-cdi/pom.xml | 2 +- .../jetty-ee10-test-client-transports/pom.xml | 2 +- .../jetty-ee10-test-felix-webapp/pom.xml | 2 +- .../jetty-ee10-test-http2-webapp/pom.xml | 2 +- .../jetty-ee10-test-integration/pom.xml | 2 +- .../jetty-ee10-jmx-webapp-it/pom.xml | 2 +- .../jetty-ee10-jmx-webapp/pom.xml | 2 +- .../jetty-ee10-test-jmx/pom.xml | 2 +- .../jetty-ee10-test-jndi/pom.xml | 2 +- .../jetty-ee10-test-loginservice/pom.xml | 2 +- .../jetty-ee10-test-openid-webapp/pom.xml | 2 +- .../jetty-ee10-test-owb-cdi-webapp/pom.xml | 2 +- .../jetty-ee10-test-quickstart/pom.xml | 2 +- .../jetty-ee10-test-sessions-common/pom.xml | 2 +- .../jetty-ee10-test-sessions-file/pom.xml | 2 +- .../jetty-ee10-test-sessions-gcloud/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee10-test-sessions-jdbc/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee10-test-sessions-mongodb/pom.xml | 2 +- .../jetty-ee10-test-sessions/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee10-test-webapp-rfc2616/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee10-test-websocket-webapp/pom.xml | 2 +- .../jetty-ee10-test-weld-cdi-webapp/pom.xml | 2 +- jetty-ee10/jetty-ee10-tests/pom.xml | 2 +- jetty-ee10/jetty-ee10-webapp/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee10-websocket-jetty-server/pom.xml | 2 +- .../jetty-ee10-websocket-jetty-tests/pom.xml | 2 +- .../jetty-ee10-websocket-servlet/pom.xml | 2 +- jetty-ee10/jetty-ee10-websocket/pom.xml | 2 +- jetty-ee10/pom.xml | 2 +- jetty-ee8/jetty-ee8-annotations/pom.xml | 2 +- jetty-ee8/jetty-ee8-apache-jsp/pom.xml | 2 +- jetty-ee8/jetty-ee8-bom/pom.xml | 48 ++++---- .../jetty-ee8-demo-async-rest-jar/pom.xml | 2 +- .../jetty-ee8-demo-async-rest-server/pom.xml | 2 +- .../jetty-ee8-demo-async-rest-webapp/pom.xml | 2 +- .../jetty-ee8-demo-async-rest/pom.xml | 2 +- .../jetty-ee8-demo-jaas-webapp/pom.xml | 2 +- .../jetty-ee8-demo-jetty-webapp/pom.xml | 2 +- .../jetty-ee8-demo-jndi-webapp/pom.xml | 2 +- .../jetty-ee8-demo-jsp-webapp/pom.xml | 2 +- .../jetty-ee8-demo-mock-resources/pom.xml | 2 +- .../jetty-ee8-demo-proxy-webapp/pom.xml | 2 +- .../jetty-ee8-demo-simple-webapp/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee8-demo-spec-webapp/pom.xml | 2 +- .../jetty-ee8-demo-web-fragment/pom.xml | 2 +- .../jetty-ee8-demo-spec/pom.xml | 2 +- jetty-ee8/jetty-ee8-demos/pom.xml | 2 +- jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml | 2 +- jetty-ee8/jetty-ee8-home/pom.xml | 2 +- jetty-ee8/jetty-ee8-jaspi/pom.xml | 2 +- jetty-ee8/jetty-ee8-jndi/pom.xml | 2 +- jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml | 2 +- jetty-ee8/jetty-ee8-maven-plugin/pom.xml | 2 +- jetty-ee8/jetty-ee8-nested/pom.xml | 2 +- jetty-ee8/jetty-ee8-openid/pom.xml | 2 +- jetty-ee8/jetty-ee8-plus/pom.xml | 2 +- jetty-ee8/jetty-ee8-proxy/pom.xml | 2 +- jetty-ee8/jetty-ee8-quickstart/pom.xml | 2 +- jetty-ee8/jetty-ee8-security/pom.xml | 2 +- jetty-ee8/jetty-ee8-servlet/pom.xml | 2 +- jetty-ee8/jetty-ee8-servlets/pom.xml | 2 +- jetty-ee8/jetty-ee8-webapp/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee8-websocket-javax-client/pom.xml | 2 +- .../jetty-ee8-websocket-javax-common/pom.xml | 2 +- .../jetty-ee8-websocket-javax-server/pom.xml | 2 +- .../jetty-ee8-websocket-javax-tests/pom.xml | 2 +- .../jetty-ee8-websocket-jetty-api/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee8-websocket-jetty-client/pom.xml | 2 +- .../jetty-ee8-websocket-jetty-common/pom.xml | 2 +- .../jetty-ee8-websocket-jetty-server/pom.xml | 2 +- .../jetty-ee8-websocket-jetty-tests/pom.xml | 2 +- .../jetty-ee8-websocket-servlet/pom.xml | 2 +- jetty-ee8/jetty-ee8-websocket/pom.xml | 2 +- jetty-ee8/pom.xml | 2 +- jetty-ee9/jetty-ee9-annotations/pom.xml | 2 +- jetty-ee9/jetty-ee9-apache-jsp/pom.xml | 2 +- jetty-ee9/jetty-ee9-bom/pom.xml | 60 +++++----- jetty-ee9/jetty-ee9-cdi/pom.xml | 2 +- .../jetty-ee9-demo-async-rest-jar/pom.xml | 2 +- .../jetty-ee9-demo-async-rest-server/pom.xml | 2 +- .../jetty-ee9-demo-async-rest-webapp/pom.xml | 2 +- .../jetty-ee9-demo-async-rest/pom.xml | 2 +- .../jetty-ee9-demo-embedded/pom.xml | 2 +- .../jetty-ee9-demo-jaas-webapp/pom.xml | 2 +- .../jetty-ee9-demo-jetty-webapp/pom.xml | 2 +- .../jetty-ee9-demo-jndi-webapp/pom.xml | 2 +- .../jetty-ee9-demo-jsp-webapp/pom.xml | 2 +- .../jetty-ee9-demo-mock-resources/pom.xml | 2 +- .../jetty-ee9-demo-proxy-webapp/pom.xml | 2 +- .../jetty-ee9-demo-simple-webapp/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee9-demo-spec-webapp/pom.xml | 2 +- .../jetty-ee9-demo-web-fragment/pom.xml | 2 +- .../jetty-ee9-demo-spec/pom.xml | 2 +- .../jetty-ee9-demo-template/pom.xml | 2 +- jetty-ee9/jetty-ee9-demos/pom.xml | 2 +- jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml | 2 +- jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml | 2 +- jetty-ee9/jetty-ee9-home/pom.xml | 2 +- jetty-ee9/jetty-ee9-jaspi/pom.xml | 2 +- jetty-ee9/jetty-ee9-jndi/pom.xml | 2 +- jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml | 2 +- jetty-ee9/jetty-ee9-maven-plugin/pom.xml | 2 +- jetty-ee9/jetty-ee9-nested/pom.xml | 2 +- jetty-ee9/jetty-ee9-openid/pom.xml | 2 +- .../jetty-ee9-osgi-boot-jsp/pom.xml | 2 +- .../jetty-ee9-osgi-boot/pom.xml | 2 +- jetty-ee9/jetty-ee9-osgi/pom.xml | 2 +- .../test-jetty-ee9-osgi-fragment/pom.xml | 2 +- .../test-jetty-ee9-osgi-server/pom.xml | 2 +- .../pom.xml | 2 +- .../test-jetty-ee9-osgi/pom.xml | 2 +- jetty-ee9/jetty-ee9-plus/pom.xml | 2 +- jetty-ee9/jetty-ee9-proxy/pom.xml | 2 +- jetty-ee9/jetty-ee9-quickstart/pom.xml | 2 +- jetty-ee9/jetty-ee9-runner/pom.xml | 2 +- jetty-ee9/jetty-ee9-security/pom.xml | 2 +- jetty-ee9/jetty-ee9-servlet/pom.xml | 2 +- jetty-ee9/jetty-ee9-servlets/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee9-test-badinit-webapp/pom.xml | 2 +- .../jetty-ee9-test-cdi-common-webapp/pom.xml | 2 +- .../jetty-ee9-test-cdi/pom.xml | 2 +- .../jetty-ee9-test-client-transports/pom.xml | 2 +- .../jetty-ee9-test-felix-webapp/pom.xml | 2 +- .../jetty-ee9-test-http2-webapp/pom.xml | 2 +- .../jetty-ee9-test-integration/pom.xml | 2 +- .../jetty-ee9-jmx-webapp-it/pom.xml | 2 +- .../jetty-ee9-jmx-webapp/pom.xml | 2 +- .../jetty-ee9-test-jmx/pom.xml | 2 +- .../jetty-ee9-test-jndi/pom.xml | 2 +- .../jetty-ee9-test-loginservice/pom.xml | 2 +- .../jetty-ee9-test-openid-webapp/pom.xml | 2 +- .../jetty-ee9-test-owb-cdi-webapp/pom.xml | 2 +- .../jetty-ee9-test-quickstart/pom.xml | 2 +- .../jetty-ee9-test-sessions-common/pom.xml | 2 +- .../jetty-ee9-test-sessions-file/pom.xml | 2 +- .../jetty-ee9-test-sessions-gcloud/pom.xml | 2 +- .../jetty-ee9-test-sessions-hazelcast/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee9-test-sessions-jdbc/pom.xml | 2 +- .../jetty-ee9-test-sessions-memcached/pom.xml | 2 +- .../jetty-ee9-test-sessions-mongodb/pom.xml | 2 +- .../jetty-ee9-test-sessions/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee9-test-webapp-rfc2616/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee9-test-websocket-webapp/pom.xml | 2 +- .../jetty-ee9-test-weld-cdi-webapp/pom.xml | 2 +- jetty-ee9/jetty-ee9-tests/pom.xml | 2 +- jetty-ee9/jetty-ee9-webapp/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee9-websocket-jakarta-tests/pom.xml | 2 +- .../jetty-ee9-websocket-jetty-api/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee9-websocket-jetty-client/pom.xml | 2 +- .../jetty-ee9-websocket-jetty-common/pom.xml | 2 +- .../jetty-ee9-websocket-jetty-server/pom.xml | 2 +- .../jetty-ee9-websocket-jetty-tests/pom.xml | 2 +- .../jetty-ee9-websocket-servlet/pom.xml | 2 +- jetty-ee9/jetty-ee9-websocket/pom.xml | 2 +- jetty-ee9/pom.xml | 2 +- jetty-home/pom.xml | 2 +- .../jetty-gcloud-session-manager/pom.xml | 2 +- jetty-integrations/jetty-gcloud/pom.xml | 2 +- jetty-integrations/jetty-hazelcast/pom.xml | 2 +- .../jetty-infinispan-common/pom.xml | 2 +- .../jetty-infinispan-embedded-query/pom.xml | 2 +- .../jetty-infinispan-embedded/pom.xml | 2 +- .../jetty-infinispan-remote-query/pom.xml | 2 +- .../jetty-infinispan-remote/pom.xml | 2 +- jetty-integrations/jetty-infinispan/pom.xml | 2 +- .../jetty-memcached-sessions/pom.xml | 2 +- jetty-integrations/jetty-memcached/pom.xml | 2 +- jetty-integrations/jetty-nosql/pom.xml | 2 +- jetty-integrations/pom.xml | 2 +- pom.xml | 2 +- tests/jetty-home-tester/pom.xml | 2 +- tests/jetty-jmh/pom.xml | 2 +- tests/jetty-test-session-common/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-distribution/pom.xml | 2 +- .../test-distribution-common/pom.xml | 2 +- .../test-ee10-distribution/pom.xml | 2 +- .../test-ee9-distribution/pom.xml | 2 +- tests/test-integration/pom.xml | 2 +- 330 files changed, 537 insertions(+), 484 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 0c7bef3874e5..5b689e0e69a9 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,12 +1,50 @@ -jetty-12.0.2-SNAPSHOT +jetty-12.0.2 - 09 October 2023 + + 7408 Change scope of maven plugin dependencies + + 9665 `HttpCookieStore` incorrectly rejects cookies for domains that are an + IPv6 address + + 9777 CrossOriginFilter does not return Vary header on no-cors mode + + 9928 Backport `Request.getBeginNanoTime()` + + 10219 Review HTTP Cookie parsing + + 10271 jetty.sh does not stop jetty anymore + + 10328 Review `ResourceFactory.newSystemResource(String)` behavior & javadoc + + 10361 Introduce QoSHandler + + 10382 NPE thrown during HttpClient tests + + 10388 Jetty10 inetaccess mod started error + + 10440 ClassCastException with `` use in + `jetty-ee10-maven-plugin` + + 10441 Jetty 12 ee8 jaspi is missing + + 10442 Reduce verbosity when JMX finds overloaded setter + + 10463 Jetty 12 throws Exception handling static files when using response + wrapper + + 10466 Review HTTP session documentation + + 10473 Startup Script reports `ok` too fast, and doesn't wait for actual + start of Jetty + + 10474 Jetty 12 default error handler throws IllegalStateException for + application/json + + 10475 Update Jetty 12 MANIFEST's Bundle-Copyright + + 10482 RewriteHandler with multiple HeaderPatternRules + + 10490 Jetty 12 Jakarta Websockets user principal is always null + + 10498 NullPointerException from call to UpgradeRequest#getUserPrincipal with + Jetty 12 + + 10500 Jetty 12 HTTP SPI does not preserve double-quotes on valid request + headers + + 10508 Jetty 12 IllegalArgumentExeption when setting a HTTP header to null + + 10513 Lockup processing POST request body with Jetty 12.0.1 using http/2 + + 10543 Review HttpStream.consumeAvailable() implementations + + 10547 Cannot customize Executor on WebSocketClient + + 10557 Update quiche to 0.18.0 + + 10558 NPE when forwarding a request to default servlet which should redirect + to a subdirectory with trailing slash + + 10665 Wrong BREE in Jetty jars + + 10679 Review HTTP/2 rate control jetty-12.0.1 - 29 August 2023 + 8926 HttpClient GZIPContentDecoder should remove Content-Length and Content-Encoding: gzip + 9169 Idle timeout is ignored if callback is not completed + 9900 Improve `Request.getBeginNanoTime()` accuracy - + 10158 Deploying on Jetty 12 using context XML files will only work - when a .properties file with the EE details is also present + + 10158 Deploying on Jetty 12 using context XML files will only work when a + .properties file with the EE details is also present + 10207 Update failed JSP deployment message + 10213 UnknownFormatConversionException in `start.jar --debug` if path has `%` sign @@ -15,8 +53,7 @@ jetty-12.0.1 - 29 August 2023 + 10274 java.nio.file.FileSystemNotFoundException when creating a resource from a JAR URL + 10294 Request.getContext().getContextPath() - + 10295 FormAuthenticator does not dispatch to an error page but - redirect + + 10295 FormAuthenticator does not dispatch to an error page but redirect + 10306 Jetty 12 generates wrong Host header + 10309 Jetty 12: X-Powered-By header is added 2 times (if enabled) + 10312 Remove jetty-home-with-docs to eliminate build time cyclic @@ -239,7 +276,8 @@ jetty-12.0.0.beta1 - 02 May 2023 + 9444 Unexpected encoding in request.getPathInfo() with Jetty 12 beta 0 + 9459 Path is missing from JSESSIONID cookie in 12 beta 0 + 9463 NPE when starting jetty-ee10-maven-plugin - + 9464 Add optional configuration to log user out after OpenID idToken expires (CVE-2023-41900) + + 9464 Add optional configuration to log user out after OpenID idToken expires + (CVE-2023-41900) + 9466 WebSocket `DeploymentException` is not thrown by client nor server + 9467 Jetty 12 - Review BOMs + 9468 Jetty 11.0.14 is less tolerant of non-compliant cookies than 11.0.13 @@ -449,7 +487,8 @@ jetty-11.0.15 - 11 April 2023 + 9309 `jetty.sh` cannot handle complex Jetty properties from `start.d/*.ini` + 9400 Jetty logs warning with stacktrace when annotation parser encounters module-info.class file inside elasticsearch-x-content jar - + 9464 Add optional configuration to log user out after OpenID idToken expires (CVE-2023-41900) + + 9464 Add optional configuration to log user out after OpenID idToken expires + (CVE-2023-41900) + 9468 Jetty 11.0.14 is less tolerant of non-compliant cookies than 11.0.13 + 9497 Maven plugin effective web xml: add support for jar projects + 9501 jetty client with proxy - ssl traffic between both proxy and servers @@ -463,7 +502,8 @@ jetty-10.0.15 - 11 April 2023 + 9309 `jetty.sh` cannot handle complex Jetty properties from `start.d/*.ini` + 9400 Jetty logs warning with stacktrace when annotation parser encounters module-info.class file inside elasticsearch-x-content jar - + 9464 Add optional configuration to log user out after OpenID idToken expires (CVE-2023-41900) + + 9464 Add optional configuration to log user out after OpenID idToken expires + (CVE-2023-41900) + 9468 Jetty 11.0.14 is less tolerant of non-compliant cookies than 11.0.13 + 9497 Maven plugin effective web xml: add support for jar projects + 9501 jetty client with proxy - ssl traffic between both proxy and servers @@ -1378,7 +1418,8 @@ jetty-10.0.3 - 20 May 2021 + 6254 Total timeout not enforced for queued requests + 6263 Review URI encoding in ConcatServlet & WelcomeFilter (CVE-2021-28169) + 6272 Reduce allocation in HttpClient when notifying content listeners - + 6277 Better handle exceptions thrown from session destroy listener (CVE-2021-34428) + + 6277 Better handle exceptions thrown from session destroy listener + (CVE-2021-34428) + 6280 Copy ServletHolder class/instance properly during startWebapp + 6287 Class loading broken for WebSocketClient used inside webapp @@ -1632,7 +1673,7 @@ jetty-11.0.0.beta1 - 10 July 2020 SETTINGS Frame. + 4903 Give better errors for non public Websocket Endpoints + 4904 WebsocketClient creates more connections than needed - + 4907 + + 4907 org.eclipse.jetty.websocket.tests.SuspendResumeTest#testSuspendAfterClose + 4920 Restore ability to delete sessions on stop + 4921 Quickstart run improperly runs dynamically added context initializers @@ -1682,7 +1723,8 @@ jetty-10.0.2 - 26 March 2021 + 6037 Review logging modules for j.u.l + 6050 Websocket: NotUtf8Exception after upgrade 9.4.35 -> 9.4.36 or newer + 6063 Allow override of hazelcast version when using module - + 6072 jetty server high CPU when client send data length > 17408 (CVE-2021-28165) + + 6072 jetty server high CPU when client send data length > 17408 + (CVE-2021-28165) + 6076 Embedded Jetty throws null pointer exception + 6082 SslConnection compacting + 6085 Jetty keeps Sessions in use after "Duplicate valid session cookies" @@ -1758,7 +1800,8 @@ jetty-10.0.0 - 02 December 2020 + 5555 NPE for servlet with no mapping + 5562 ArrayTernaryTrie consumes too much memory + 5575 Add SEARCH as a known HttpMethod - + 5605 java.io.IOException: unconsumed input during http request parsing (CVE-2020-27218) + + 5605 java.io.IOException: unconsumed input during http request parsing + (CVE-2020-27218) + 5633 Allow to configure HttpClient request authority + 5679 Distro argument --list-all-modules does not work + 5680 No way to see which modules are enabled for the distro @@ -2045,7 +2088,8 @@ jetty-9.4.41.v20210516 - 16 May 2021 `AsyncContext.dispatch` + 6254 Total timeout not enforced for queued requests + 6263 Review URI encoding in ConcatServlet & WelcomeFilter (CVE-2021-28169) - + 6277 Better handle exceptions thrown from session destroy listener (CVE-2021-34428) + + 6277 Better handle exceptions thrown from session destroy listener + (CVE-2021-34428) + 6280 Copy ServletHolder class/instance properly during startWebapp jetty-9.4.40.v20210413 - 13 April 2021 @@ -2061,7 +2105,8 @@ jetty-9.4.39.v20210325 - 25 March 2021 + 6052 Cleanup TypeUtil and ModuleLocation to allow jetty-client/hybrid to work on Android + 6063 Allow override of hazelcast version when using module - + 6072 jetty server high CPU when client send data length > 17408 (CVE-2021-28165) + + 6072 jetty server high CPU when client send data length > 17408 + (CVE-2021-28165) + 6085 Jetty keeps Sessions in use after "Duplicate valid session cookies" Message + 6101 Normalize ambiguous URIs (CVE-2021-28164) @@ -2117,7 +2162,8 @@ jetty-9.4.35.v20201120 - 20 November 2020 + 5539 StatisticsServlet output is not valid + 5562 ArrayTernaryTrie consumes too much memory + 5575 Add SEARCH as a known HttpMethod - + 5605 java.io.IOException: unconsumed input during http request parsing (CVE-2020-27218) + + 5605 java.io.IOException: unconsumed input during http request parsing + (CVE-2020-27218) + 5633 Allow to configure HttpClient request authority jetty-9.4.34.v20201102 - 02 November 2020 @@ -2611,8 +2657,10 @@ jetty-9.4.18.v20190429 - 29 April 2019 jetty-9.4.17.v20190418 - 18 April 2019 + 2140 Infinispan and hazelcast changes to scavenge zombie expired sessions + 3464 Split SslContextFactory into Client and Server - + 3549 Directory Listing on Windows reveals Resource Base path (CVE-2019-10246) - + 3555 DefaultHandler Reveals Base Resource Path of each Context (CVE-2019-10247) + + 3549 Directory Listing on Windows reveals Resource Base path + (CVE-2019-10246) + + 3555 DefaultHandler Reveals Base Resource Path of each Context + (CVE-2019-10247) jetty-9.4.16.v20190411 - 11 April 2019 + 1861 Limit total bytes pooled by ByteBufferPools @@ -2693,8 +2741,10 @@ jetty-9.3.28.v20191105 - 05 November 2019 + 4217 SslConnection.DecryptedEnpoint.flush eternal busy loop jetty-9.3.27.v20190418 - 18 April 2019 - + 3549 Directory Listing on Windows reveals Resource Base path (CVE-2019-10246) - + 3555 DefaultHandler Reveals Base Resource Path of each Context (CVE-2019-10247) + + 3549 Directory Listing on Windows reveals Resource Base path + (CVE-2019-10246) + + 3555 DefaultHandler Reveals Base Resource Path of each Context + (CVE-2019-10247) jetty-9.3.26.v20190403 - 03 April 2019 + 2954 Improve cause reporting for HttpClient failures @@ -2708,11 +2758,14 @@ jetty-9.2.29.v20191105 - 05 November 2019 + 4217 SslConnection.DecryptedEnpoint.flush eternal busy loop jetty-9.2.28.v20190418 - 18 April 2019 - + 3549 Directory Listing on Windows reveals Resource Base path (CVE-2019-10246) - + 3555 DefaultHandler Reveals Base Resource Path of each Context (CVE-2019-10247) + + 3549 Directory Listing on Windows reveals Resource Base path + (CVE-2019-10246) + + 3555 DefaultHandler Reveals Base Resource Path of each Context + (CVE-2019-10247) jetty-9.2.27.v20190403 - 03 April 2019 - + 3319 Refactored Directory Listing to modernize and avoid XSS (CVE-2019-10241) + + 3319 Refactored Directory Listing to modernize and avoid XSS + (CVE-2019-10241) jetty-9.4.14.v20181114 - 14 November 2018 + 3097 Duplicated programmatic Servlet Listeners causing duplicate calls diff --git a/build/build-resources/pom.xml b/build/build-resources/pom.xml index 5960280149b9..4a342ec66f19 100644 --- a/build/build-resources/pom.xml +++ b/build/build-resources/pom.xml @@ -7,7 +7,7 @@ --> org.eclipse.jetty build-resources - 12.0.2-SNAPSHOT + 12.0.2 Build :: Resources jar diff --git a/build/pom.xml b/build/pom.xml index 7e75bb49fb37..f8a5c49b6539 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml index c1556620c1a5..fc8f058de2ea 100644 --- a/documentation/jetty-asciidoctor-extensions/pom.xml +++ b/documentation/jetty-asciidoctor-extensions/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.documentation documentation - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index e0658bab62d3..5ea04d365591 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.documentation documentation - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/documentation/pom.xml b/documentation/pom.xml index e6ea4326d0a1..8ede8458e3d5 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/javadoc/pom.xml b/javadoc/pom.xml index cb9b51ce3e89..25e0e9c4aa7c 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml index d7dd2b008cf2..f767ea286c20 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-alpn-client diff --git a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index 1d998fce47e7..103b86a85f0a 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index a312b4ad89a4..02f3232e9f05 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml index 2c4133801785..af8b430b6214 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml index 5fe3fa677784..7cb00b0f2541 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml index b757eacbbea9..d72db936608d 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-alpn-server diff --git a/jetty-core/jetty-alpn/pom.xml b/jetty-core/jetty-alpn/pom.xml index d53b63dab7aa..6197e534e55c 100644 --- a/jetty-core/jetty-alpn/pom.xml +++ b/jetty-core/jetty-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-alpn diff --git a/jetty-core/jetty-bom/pom.xml b/jetty-core/jetty-bom/pom.xml index c03e9d50224a..98b2e1f75ac9 100644 --- a/jetty-core/jetty-bom/pom.xml +++ b/jetty-core/jetty-bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 jetty-bom @@ -42,277 +42,277 @@ org.eclipse.jetty jetty-alpn-client - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-alpn-conscrypt-client - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-alpn-conscrypt-server - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-alpn-java-client - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-alpn-java-server - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-alpn-server - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-client - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-deploy - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-http - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-http-spi - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-http-tools - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-io - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-jmx - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-jndi - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-keystore - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-openid - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-osgi - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-proxy - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-rewrite - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-server - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-session - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-slf4j-impl - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-start - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-security - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-unixdomain-server - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-util - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-util-ajax - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty jetty-xml - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.demos jetty-demo-handler - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.fcgi jetty-fcgi-client - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.fcgi jetty-fcgi-proxy - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.fcgi jetty-fcgi-server - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.http2 jetty-http2-client - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.http2 jetty-http2-client-transport - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.http2 jetty-http2-common - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.http2 jetty-http2-hpack - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.http2 jetty-http2-server - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.http3 jetty-http3-client - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.http3 jetty-http3-client-transport - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.http3 jetty-http3-common - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.http3 jetty-http3-qpack - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.http3 jetty-http3-server - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.quic jetty-quic-client - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.quic jetty-quic-common - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.quic jetty-quic-quiche-common - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.quic jetty-quic-quiche-foreign-incubator - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.quic jetty-quic-quiche-jna - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.quic jetty-quic-server - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.websocket jetty-websocket-core-client - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.websocket jetty-websocket-core-common - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.websocket jetty-websocket-core-server - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.websocket jetty-websocket-jetty-api - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.websocket jetty-websocket-jetty-client - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.websocket jetty-websocket-jetty-common - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.websocket jetty-websocket-jetty-server - 12.0.2-SNAPSHOT + 12.0.2 diff --git a/jetty-core/jetty-client/pom.xml b/jetty-core/jetty-client/pom.xml index e9fff869812b..bc3c0ab3dc90 100644 --- a/jetty-core/jetty-client/pom.xml +++ b/jetty-core/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-demos/jetty-demo-handler/pom.xml b/jetty-core/jetty-demos/jetty-demo-handler/pom.xml index 4b23ad10d5d2..e6ce7f669f41 100644 --- a/jetty-core/jetty-demos/jetty-demo-handler/pom.xml +++ b/jetty-core/jetty-demos/jetty-demo-handler/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos jetty-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-demo-handler diff --git a/jetty-core/jetty-demos/pom.xml b/jetty-core/jetty-demos/pom.xml index a0df5e300754..846689b89e3b 100644 --- a/jetty-core/jetty-demos/pom.xml +++ b/jetty-core/jetty-demos/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-deploy/pom.xml b/jetty-core/jetty-deploy/pom.xml index ea3be250a060..223104c0da7d 100644 --- a/jetty-core/jetty-deploy/pom.xml +++ b/jetty-core/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml index ef75c9e917f3..1022d70b6e09 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml +++ b/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi jetty-fcgi - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml index fccf13c50311..5fea6c3f3e7f 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml +++ b/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi jetty-fcgi - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml index 2714732b0aaf..555fb26ab391 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml +++ b/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi jetty-fcgi - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-fcgi/pom.xml b/jetty-core/jetty-fcgi/pom.xml index 1c2940bf8efd..9c57290ac311 100644 --- a/jetty-core/jetty-fcgi/pom.xml +++ b/jetty-core/jetty-fcgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-http-spi/pom.xml b/jetty-core/jetty-http-spi/pom.xml index dc7385178535..200c158cb584 100644 --- a/jetty-core/jetty-http-spi/pom.xml +++ b/jetty-core/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-http-spi diff --git a/jetty-core/jetty-http-tools/pom.xml b/jetty-core/jetty-http-tools/pom.xml index 31741f2055fc..60ec942285b7 100644 --- a/jetty-core/jetty-http-tools/pom.xml +++ b/jetty-core/jetty-http-tools/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-http/pom.xml b/jetty-core/jetty-http/pom.xml index 77514c6597c7..21a45247cc95 100644 --- a/jetty-core/jetty-http/pom.xml +++ b/jetty-core/jetty-http/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml b/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml index dea7b1d84e15..d2edc20ecda0 100644 --- a/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 jetty-http2 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-http2/jetty-http2-client/pom.xml b/jetty-core/jetty-http2/jetty-http2-client/pom.xml index 9e00c328e842..100d13655dd2 100644 --- a/jetty-core/jetty-http2/jetty-http2-client/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 jetty-http2 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-http2/jetty-http2-common/pom.xml b/jetty-core/jetty-http2/jetty-http2-common/pom.xml index bae58272b2ec..fe71d5177fc7 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 jetty-http2 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml b/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml index 0b69a4aac6c2..1c32194b3588 100644 --- a/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 jetty-http2 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-http2/jetty-http2-server/pom.xml b/jetty-core/jetty-http2/jetty-http2-server/pom.xml index 27ffe7e91847..bd11dd64c2c6 100644 --- a/jetty-core/jetty-http2/jetty-http2-server/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 jetty-http2 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-http2/jetty-http2-tests/pom.xml b/jetty-core/jetty-http2/jetty-http2-tests/pom.xml index c5330f2c6ab2..458ebf1cd539 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 jetty-http2 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-http2/pom.xml b/jetty-core/jetty-http2/pom.xml index f91f66b3bf46..1d8caf9039ff 100644 --- a/jetty-core/jetty-http2/pom.xml +++ b/jetty-core/jetty-http2/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml b/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml index 3c175c9345c9..cca14b0baf48 100644 --- a/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 jetty-http3 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-http3/jetty-http3-client/pom.xml b/jetty-core/jetty-http3/jetty-http3-client/pom.xml index 7f37c85d027d..61080bb7f4a3 100644 --- a/jetty-core/jetty-http3/jetty-http3-client/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 jetty-http3 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-http3/jetty-http3-common/pom.xml b/jetty-core/jetty-http3/jetty-http3-common/pom.xml index 5cf117e57550..e283c82f3655 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 jetty-http3 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml b/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml index 56f9ec031674..65a531005520 100644 --- a/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 jetty-http3 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-http3/jetty-http3-server/pom.xml b/jetty-core/jetty-http3/jetty-http3-server/pom.xml index 59beeb6e9509..81ab13b0be44 100644 --- a/jetty-core/jetty-http3/jetty-http3-server/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 jetty-http3 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-http3/jetty-http3-tests/pom.xml b/jetty-core/jetty-http3/jetty-http3-tests/pom.xml index 1d86d5f6db83..7465412c7ac2 100644 --- a/jetty-core/jetty-http3/jetty-http3-tests/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 jetty-http3 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-http3/pom.xml b/jetty-core/jetty-http3/pom.xml index c795b988252f..7b59427b2cb3 100644 --- a/jetty-core/jetty-http3/pom.xml +++ b/jetty-core/jetty-http3/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-io/pom.xml b/jetty-core/jetty-io/pom.xml index e57f528229a5..8dcc4592ac05 100644 --- a/jetty-core/jetty-io/pom.xml +++ b/jetty-core/jetty-io/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-io diff --git a/jetty-core/jetty-jmx/pom.xml b/jetty-core/jetty-jmx/pom.xml index ce409fa1d870..3bb3aa2061de 100644 --- a/jetty-core/jetty-jmx/pom.xml +++ b/jetty-core/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-jmx diff --git a/jetty-core/jetty-jndi/pom.xml b/jetty-core/jetty-jndi/pom.xml index 04cc6fd4a418..c96d26f8db27 100644 --- a/jetty-core/jetty-jndi/pom.xml +++ b/jetty-core/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-keystore/pom.xml b/jetty-core/jetty-keystore/pom.xml index 8a585ebd4eae..30dc1cfe3af4 100644 --- a/jetty-core/jetty-keystore/pom.xml +++ b/jetty-core/jetty-keystore/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-keystore diff --git a/jetty-core/jetty-openid/pom.xml b/jetty-core/jetty-openid/pom.xml index 11c03db1cf04..c146e9e67392 100644 --- a/jetty-core/jetty-openid/pom.xml +++ b/jetty-core/jetty-openid/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-osgi/pom.xml b/jetty-core/jetty-osgi/pom.xml index c3e3e2a03812..faff4310322a 100644 --- a/jetty-core/jetty-osgi/pom.xml +++ b/jetty-core/jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-proxy/pom.xml b/jetty-core/jetty-proxy/pom.xml index 2551e15a6ea4..7f4db554b737 100644 --- a/jetty-core/jetty-proxy/pom.xml +++ b/jetty-core/jetty-proxy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-quic/jetty-quic-client/pom.xml b/jetty-core/jetty-quic/jetty-quic-client/pom.xml index 82f1de3ef993..d9f91ece1e19 100644 --- a/jetty-core/jetty-quic/jetty-quic-client/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic jetty-quic - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-quic/jetty-quic-common/pom.xml b/jetty-core/jetty-quic/jetty-quic-common/pom.xml index 5adffe6c1a8e..bf9b60224e2e 100644 --- a/jetty-core/jetty-quic/jetty-quic-common/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic jetty-quic - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml index dc067fd8645c..21c7de7a71ee 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic jetty-quic-quiche - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml index 646c08711aff..e4a0f0cfdf69 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic jetty-quic-quiche - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/pom.xml index 79f5fe277954..0eff777e8ab0 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic jetty-quic-quiche - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/pom.xml index a2380586530f..ebe1941924ea 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic jetty-quic - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-quic/jetty-quic-server/pom.xml b/jetty-core/jetty-quic/jetty-quic-server/pom.xml index 73b95f6a1422..02934354432f 100644 --- a/jetty-core/jetty-quic/jetty-quic-server/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic jetty-quic - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-quic/pom.xml b/jetty-core/jetty-quic/pom.xml index f5b15d7b7581..8c1a18143f44 100644 --- a/jetty-core/jetty-quic/pom.xml +++ b/jetty-core/jetty-quic/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-rewrite/pom.xml b/jetty-core/jetty-rewrite/pom.xml index 14375ff90e01..4f45d2de7332 100644 --- a/jetty-core/jetty-rewrite/pom.xml +++ b/jetty-core/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-security/pom.xml b/jetty-core/jetty-security/pom.xml index a59acd0043a7..8768bd0036d4 100644 --- a/jetty-core/jetty-security/pom.xml +++ b/jetty-core/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-server/pom.xml b/jetty-core/jetty-server/pom.xml index 5b720181db60..d56f9fa79404 100644 --- a/jetty-core/jetty-server/pom.xml +++ b/jetty-core/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-session/pom.xml b/jetty-core/jetty-session/pom.xml index 3975a03ed432..1d24fbf923ed 100644 --- a/jetty-core/jetty-session/pom.xml +++ b/jetty-core/jetty-session/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-slf4j-impl/pom.xml b/jetty-core/jetty-slf4j-impl/pom.xml index 0e6e6cb74512..6d2a0c0dd6d0 100644 --- a/jetty-core/jetty-slf4j-impl/pom.xml +++ b/jetty-core/jetty-slf4j-impl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-start/pom.xml b/jetty-core/jetty-start/pom.xml index e030d85fd40d..cc0e74f43628 100644 --- a/jetty-core/jetty-start/pom.xml +++ b/jetty-core/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-start diff --git a/jetty-core/jetty-tests/jetty-test-client-transports/pom.xml b/jetty-core/jetty-tests/jetty-test-client-transports/pom.xml index b3884d08b0af..76cb15c13838 100644 --- a/jetty-core/jetty-tests/jetty-test-client-transports/pom.xml +++ b/jetty-core/jetty-tests/jetty-test-client-transports/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-tests/pom.xml b/jetty-core/jetty-tests/pom.xml index 8744441da41f..0431dc7245b1 100644 --- a/jetty-core/jetty-tests/pom.xml +++ b/jetty-core/jetty-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-unixdomain-server/pom.xml b/jetty-core/jetty-unixdomain-server/pom.xml index 49b1c0a5051e..ef5a716676fe 100644 --- a/jetty-core/jetty-unixdomain-server/pom.xml +++ b/jetty-core/jetty-unixdomain-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-util-ajax/pom.xml b/jetty-core/jetty-util-ajax/pom.xml index 9f644de3d5ff..694be881f930 100644 --- a/jetty-core/jetty-util-ajax/pom.xml +++ b/jetty-core/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-util-ajax diff --git a/jetty-core/jetty-util/pom.xml b/jetty-core/jetty-util/pom.xml index 780ee4c98af8..b23460e75e8f 100644 --- a/jetty-core/jetty-util/pom.xml +++ b/jetty-core/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-util diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml index 1f378b859c4d..ce6a492b0a29 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml index 53638783a430..1851a4b6772c 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml index 04c78396b12f..f25d54098808 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml index d7bf62004a3e..2d3a1239b6f9 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml index d6ed20b27226..d8f5d633f095 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml index 65bbcefb7319..31bffe4aca73 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml index 932ac057d382..4cdabd8c8e03 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml index 80779fe3ae0e..bdf52863a2a1 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml index ccde778e43d2..5b06919cdc02 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-websocket/pom.xml b/jetty-core/jetty-websocket/pom.xml index 152ec8e5c827..5ebc0265e917 100644 --- a/jetty-core/jetty-websocket/pom.xml +++ b/jetty-core/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-core/jetty-xml/pom.xml b/jetty-core/jetty-xml/pom.xml index dbf13b7a6dd9..afe95b7198ed 100644 --- a/jetty-core/jetty-xml/pom.xml +++ b/jetty-core/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-xml diff --git a/jetty-core/pom.xml b/jetty-core/pom.xml index 1d3b41250dc7..6523b5b68e99 100644 --- a/jetty-core/pom.xml +++ b/jetty-core/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-annotations/pom.xml b/jetty-ee10/jetty-ee10-annotations/pom.xml index 1e27295808ce..8fedb5c0200c 100644 --- a/jetty-ee10/jetty-ee10-annotations/pom.xml +++ b/jetty-ee10/jetty-ee10-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-apache-jsp/pom.xml b/jetty-ee10/jetty-ee10-apache-jsp/pom.xml index d84f74d5af60..1a9a635de430 100644 --- a/jetty-ee10/jetty-ee10-apache-jsp/pom.xml +++ b/jetty-ee10/jetty-ee10-apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-bom/pom.xml b/jetty-ee10/jetty-ee10-bom/pom.xml index 6ed67cdb090d..f2d8f790c59e 100644 --- a/jetty-ee10/jetty-ee10-bom/pom.xml +++ b/jetty-ee10/jetty-ee10-bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-bom @@ -43,132 +43,132 @@ org.eclipse.jetty.ee10 jetty-ee10-annotations - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10 jetty-ee10-apache-jsp - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10 jetty-ee10-cdi - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10 jetty-ee10-fcgi-proxy - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10 jetty-ee10-glassfish-jstl - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10 jetty-ee10-jaspi - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10 jetty-ee10-jndi - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10 jetty-ee10-jspc-maven-plugin - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10 jetty-ee10-maven-plugin - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10 jetty-ee10-plus - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10 jetty-ee10-proxy - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10 jetty-ee10-quickstart - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10 jetty-ee10-runner - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10 jetty-ee10-servlets - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10 jetty-ee10-webapp - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi-alpn - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi-boot - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi-boot-jsp - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-jakarta-client - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-jakarta-client-webapp - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-jakarta-common - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-jakarta-server - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-jetty-client-webapp - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-jetty-server - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-servlet - 12.0.2-SNAPSHOT + 12.0.2 diff --git a/jetty-ee10/jetty-ee10-cdi/pom.xml b/jetty-ee10/jetty-ee10-cdi/pom.xml index 014a041ccca5..20ae120c020b 100644 --- a/jetty-ee10/jetty-ee10-cdi/pom.xml +++ b/jetty-ee10/jetty-ee10-cdi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee10-cdi diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml index 1a6068291691..b35741cf2098 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml index 2d3eed831301..104dda002e38 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml index 94de0eaba596..8589a923c426 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml index c98db74073e5..c660e2092a07 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml index eb0d82eacdaa..a82dc1afbac3 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee10-demo-embedded diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml index 64dd435bc1eb..282b4c677019 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-demo-jaas-webapp EE10 :: Demo :: JAAS WebApp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/pom.xml index d90433644331..ac8875684d41 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee10-demo-jetty-webapp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml index 52fdba5ad02d..f2be19ad7b19 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-demo-jndi-webapp EE10 :: Demo :: JNDI WebApp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml index 7d1ae686225d..0e13e6bb268f 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml index 7a428d193390..cf96aa341588 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2-SNAPSHOT + 12.0.2 EE10 :: Demo :: Mock Resources jetty-ee10-demo-mock-resources diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml index 7e7f2516c761..f43981684f78 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee10-demo-proxy-webapp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-simple-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-simple-webapp/pom.xml index d839ca171a51..852f8e5276e1 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-simple-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-simple-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml index 32fe2122a65f..d48109e165db 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2-SNAPSHOT + 12.0.2 ../../pom.xml jetty-ee10-demo-container-initializer diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml index 8fb1fd6092ee..f98406a287bb 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2-SNAPSHOT + 12.0.2 ../../pom.xml EE10 :: Demo :: Servlet Spec :: WebApp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml index 45db3575479d..65f4fcccc2a4 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2-SNAPSHOT + 12.0.2 ../../pom.xml diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/pom.xml index 974b6da09176..3dbc9cb45167 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2-SNAPSHOT + 12.0.2 EE10 :: Demo :: Servlet Spec jetty-ee10-demo-spec diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/pom.xml index 5cd6efd4ed35..1ba423c291e4 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-demos/pom.xml b/jetty-ee10/jetty-ee10-demos/pom.xml index fce267b99fb0..f336fd27d51a 100644 --- a/jetty-ee10/jetty-ee10-demos/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-examples/pom.xml b/jetty-ee10/jetty-ee10-examples/pom.xml index 8fa7589f146a..5d1f8f83de70 100644 --- a/jetty-ee10/jetty-ee10-examples/pom.xml +++ b/jetty-ee10/jetty-ee10-examples/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml b/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml index d27ef964869a..b91c6af1ff05 100644 --- a/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml +++ b/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml b/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml index d7fd1cd4fae3..5e3d8b4b6371 100644 --- a/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml +++ b/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee10-glassfish-jstl diff --git a/jetty-ee10/jetty-ee10-home/pom.xml b/jetty-ee10/jetty-ee10-home/pom.xml index 8216348e7bae..821eb6fce840 100644 --- a/jetty-ee10/jetty-ee10-home/pom.xml +++ b/jetty-ee10/jetty-ee10-home/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 ../pom.xml 4.0.0 diff --git a/jetty-ee10/jetty-ee10-jaspi/pom.xml b/jetty-ee10/jetty-ee10-jaspi/pom.xml index f67cd5443ad7..80cb7fe6ceff 100644 --- a/jetty-ee10/jetty-ee10-jaspi/pom.xml +++ b/jetty-ee10/jetty-ee10-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-jndi/pom.xml b/jetty-ee10/jetty-ee10-jndi/pom.xml index 1c63fd381f4f..3844ee048587 100644 --- a/jetty-ee10/jetty-ee10-jndi/pom.xml +++ b/jetty-ee10/jetty-ee10-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml b/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml index 0b34ee0a3b52..2d2f0f9afe5f 100644 --- a/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml +++ b/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee10-jspc-maven-plugin diff --git a/jetty-ee10/jetty-ee10-maven-plugin/pom.xml b/jetty-ee10/jetty-ee10-maven-plugin/pom.xml index ca8fbabf0d98..445e49eee11a 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/pom.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 ../pom.xml 4.0.0 diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-alpn/pom.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-alpn/pom.xml index 2156e801845d..f421c65230fa 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-alpn/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi - 12.0.2-SNAPSHOT + 12.0.2 diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml index c91a9696ccef..8660871a9163 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee10-osgi-boot-jsp diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml index 2ae1ea9846e5..1ba8c64cfed9 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee10-osgi-boot diff --git a/jetty-ee10/jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/pom.xml index c2fd8871f77b..d0ea84562a75 100644 --- a/jetty-ee10/jetty-ee10-osgi/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml index 071406d1972e..598ed328a725 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 test-jetty-ee10-osgi-fragment diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml index 26031e368c96..c8e36c5feaa1 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 test-jetty-ee10-osgi-server diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml index 4de44e73116e..6b6974995247 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 test-jetty-ee10-osgi-webapp-resources diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml index e77492875d44..fee7c05f685e 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 test-jetty-ee10-osgi diff --git a/jetty-ee10/jetty-ee10-plus/pom.xml b/jetty-ee10/jetty-ee10-plus/pom.xml index dfbcd88f03e1..d5a324845767 100644 --- a/jetty-ee10/jetty-ee10-plus/pom.xml +++ b/jetty-ee10/jetty-ee10-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-proxy/pom.xml b/jetty-ee10/jetty-ee10-proxy/pom.xml index eb1d76ed0a3e..c7945b89f46a 100644 --- a/jetty-ee10/jetty-ee10-proxy/pom.xml +++ b/jetty-ee10/jetty-ee10-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-quickstart/pom.xml b/jetty-ee10/jetty-ee10-quickstart/pom.xml index 4bfc711e2800..3b45c51f9678 100644 --- a/jetty-ee10/jetty-ee10-quickstart/pom.xml +++ b/jetty-ee10/jetty-ee10-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-runner/pom.xml b/jetty-ee10/jetty-ee10-runner/pom.xml index d88b748e7e44..6b51a82073c9 100644 --- a/jetty-ee10/jetty-ee10-runner/pom.xml +++ b/jetty-ee10/jetty-ee10-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee10-runner diff --git a/jetty-ee10/jetty-ee10-servlet/pom.xml b/jetty-ee10/jetty-ee10-servlet/pom.xml index b09777b3ae45..aee35429b2df 100644 --- a/jetty-ee10/jetty-ee10-servlet/pom.xml +++ b/jetty-ee10/jetty-ee10-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-servlets/pom.xml b/jetty-ee10/jetty-ee10-servlets/pom.xml index 245f1e3d43e6..ba06891f4433 100644 --- a/jetty-ee10/jetty-ee10-servlets/pom.xml +++ b/jetty-ee10/jetty-ee10-servlets/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-bad-websocket-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-bad-websocket-webapp/pom.xml index 31831f6acf1b..8c2f0f312bed 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-bad-websocket-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-bad-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-badinit-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-badinit-webapp/pom.xml index 5aa65f8da37f..523a047f2bc0 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-badinit-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-badinit-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-test-badinit-webapp diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi-common-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi-common-webapp/pom.xml index 317c2fb06f1b..b47439c47ac9 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi-common-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi-common-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/pom.xml index ca6f68d7ef95..63a495c7a240 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/pom.xml index 51df7916b835..2261b2bbf8e3 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-felix-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-felix-webapp/pom.xml index 7649348884de..71af26bf6bd5 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-felix-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-felix-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml index 33e5f2b7c9ee..369588e886dd 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml index e0f2c98d922e..dc487f0ade10 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee10-test-integration diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp-it/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp-it/pom.xml index 6d63f6196cb0..ffc697031ca2 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp-it/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp-it/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-jmx - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee10-jmx-webapp-it diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp/pom.xml index d9f925936a79..0fd0f91752ba 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-jmx - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-jmx-webapp war diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/pom.xml index bdc5a916d846..417ad6b82aea 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee10-test-jmx diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jndi/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jndi/pom.xml index 00ba3700c783..b431533de74c 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jndi/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jndi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 ../pom.xml diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-loginservice/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-loginservice/pom.xml index 5952cefc3d7e..060ca9ef9f4e 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-loginservice/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-loginservice/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-test-loginservice EE10 :: Tests :: Login Service diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-openid-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-openid-webapp/pom.xml index 6c334f4f89d5..33e6cd712240 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-openid-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-openid-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-owb-cdi-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-owb-cdi-webapp/pom.xml index df38632a317d..b4c87c2f3cdc 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-owb-cdi-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-owb-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-quickstart/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-quickstart/pom.xml index 2d943d6a081d..844443714bc4 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-quickstart/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-quickstart/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee10-test-quickstart diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml index 1110090e0735..491f6f30815a 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-sessions - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-test-sessions-common EE10 :: Tests :: Sessions :: Common diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-file/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-file/pom.xml index 4cc8c0672d0b..6ee08fa0708b 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-file/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-file/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-sessions - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-test-sessions-file EE10 :: Tests :: Sessions :: File diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-gcloud/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-gcloud/pom.xml index 6908351dc8ee..43d2b2e9142b 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-gcloud/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-gcloud/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-sessions - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-test-sessions-gcloud EE10 :: Tests :: Sessions :: GCloud diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-hazelcast/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-hazelcast/pom.xml index 941c2aa19e7e..04e2c8f74f9a 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-hazelcast/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-hazelcast/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-sessions - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-test-sessions-hazelcast EE10 :: Tests :: Sessions :: Hazelcast diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml index d22d2bd24408..04927ede60cd 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-sessions - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-test-sessions-infinispan EE10 :: Tests :: Sessions :: Infinispan diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-jdbc/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-jdbc/pom.xml index e3b950fcea75..c53e963dcbee 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-jdbc/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-jdbc/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-sessions - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-test-sessions-jdbc EE10 :: Tests :: Sessions :: JDBC diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-memcached/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-memcached/pom.xml index f43343734630..6c20569eb6a2 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-memcached/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-memcached/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-sessions - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-test-sessions-memcached EE10 :: Tests :: Sessions :: Memcached diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-mongodb/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-mongodb/pom.xml index 1b69e4787001..42a9769db80a 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-mongodb/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-mongodb/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-sessions - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-test-sessions-mongodb EE10 :: Tests :: Sessions :: Mongo diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/pom.xml index 87a29680b6d7..53118afc5528 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-test-sessions EE10 :: Tests :: Sessions diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-simple-session-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-simple-session-webapp/pom.xml index e45e15a0c973..3ae0766e8bd5 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-simple-session-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-simple-session-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-test-simple-session-webapp diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-webapp-rfc2616/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-webapp-rfc2616/pom.xml index d117208dfe4e..c98552e8f143 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-webapp-rfc2616/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-webapp-rfc2616/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee10-test-webapp-rfc2616 EE10 :: Tests :: RFC2616 WebApp diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/pom.xml index 115922c07a64..31b05255fe8f 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-webapp/pom.xml index 077dc1868519..05ced258ecbe 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-webapp/pom.xml index 8e8e088c3942..443f63486596 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-weld-cdi-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-weld-cdi-webapp/pom.xml index a5bd94479301..a3f222a73df7 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-weld-cdi-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-weld-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/pom.xml b/jetty-ee10/jetty-ee10-tests/pom.xml index 859b25aeb135..8fb582a21a85 100644 --- a/jetty-ee10/jetty-ee10-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 ../pom.xml diff --git a/jetty-ee10/jetty-ee10-webapp/pom.xml b/jetty-ee10/jetty-ee10-webapp/pom.xml index 553fa907084f..e59c34fe5751 100644 --- a/jetty-ee10/jetty-ee10-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml index f90446c0af79..13415954ba46 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml index b5535b045afc..ca06497dd227 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml index 4a3aabfbbe29..7cf904579a55 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml index 378778ceb831..edb952f5a92c 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml index d9f0a3b7e8a4..40ed6cf5266b 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml index 53f344257889..c342c84b2df1 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml index 8bf2abbba479..e97a3d6b32da 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml index 94fd08b2cf52..217fc9d89eea 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml index bf79f1ec5c27..2561b089cf2a 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/pom.xml b/jetty-ee10/jetty-ee10-websocket/pom.xml index 6f5520060288..3c7918993d38 100644 --- a/jetty-ee10/jetty-ee10-websocket/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee10/pom.xml b/jetty-ee10/pom.xml index a7a3375281e2..b3521728afa4 100644 --- a/jetty-ee10/pom.xml +++ b/jetty-ee10/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-annotations/pom.xml b/jetty-ee8/jetty-ee8-annotations/pom.xml index c769788286ca..c1f6ddbadab0 100644 --- a/jetty-ee8/jetty-ee8-annotations/pom.xml +++ b/jetty-ee8/jetty-ee8-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-apache-jsp/pom.xml b/jetty-ee8/jetty-ee8-apache-jsp/pom.xml index 5fcda8eb88fe..b6ac29f37bdb 100644 --- a/jetty-ee8/jetty-ee8-apache-jsp/pom.xml +++ b/jetty-ee8/jetty-ee8-apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-bom/pom.xml b/jetty-ee8/jetty-ee8-bom/pom.xml index 704b2c42852d..107538bef946 100644 --- a/jetty-ee8/jetty-ee8-bom/pom.xml +++ b/jetty-ee8/jetty-ee8-bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee8-bom @@ -43,117 +43,117 @@ org.eclipse.jetty.ee8 jetty-ee8-annotations - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8 jetty-ee8-apache-jsp - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8 jetty-ee8-glassfish-jstl - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8 jetty-ee8-jndi - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8 jetty-ee8-nested - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8 jetty-ee8-openid - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8 jetty-ee8-plus - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8 jetty-ee8-proxy - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8 jetty-ee8-quickstart - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8 jetty-ee8-security - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8 jetty-ee8-servlet - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8 jetty-ee8-servlets - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8 jetty-ee8-webapp - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-javax-client - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-javax-client-webapp - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-javax-common - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-javax-server - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-jetty-api - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-jetty-client - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-jetty-client-webapp - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-jetty-common - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-jetty-server - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-servlet - 12.0.2-SNAPSHOT + 12.0.2 diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-jar/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-jar/pom.xml index d09f6ae16308..4347f1c4f6dc 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-jar/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-jar/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demo-async-rest - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-server/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-server/pom.xml index 78d0c157f7e7..025c2cf797a4 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-server/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demo-async-rest - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/pom.xml index f2b44b6f71e6..d23de737f770 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demo-async-rest - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/pom.xml index 60e9e0b3a45f..cacfd83ed6a8 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/pom.xml index 44afae0df8a3..b364258444b7 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee8-demo-jaas-webapp EE8 :: Demo :: JAAS WebApp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/pom.xml index 0aed79e1a050..24d62bafcd2f 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee8-demo-jetty-webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/pom.xml index da6ad5fadd82..791b36ae51b0 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee8-demo-jndi-webapp EE8 :: Demo :: JNDI WebApp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jsp-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jsp-webapp/pom.xml index 1b008caf1010..9ee740a1dbcb 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jsp-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jsp-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/pom.xml index d81bc8a1041b..88d0c0862dae 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2-SNAPSHOT + 12.0.2 EE8 :: Demo :: Mock Resources jetty-ee8-demo-mock-resources diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/pom.xml index bb21a9d9a706..89093675caba 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee8-demo-proxy-webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-simple-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-simple-webapp/pom.xml index 0468ea16042f..e95dfd8f7228 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-simple-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-simple-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-container-initializer/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-container-initializer/pom.xml index 97ff7af1b1ce..ecb9c13654a8 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-container-initializer/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-container-initializer/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demo-spec - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee8-demo-container-initializer jar diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml index 98e9de7ba328..d9af7d6556ee 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demo-spec - 12.0.2-SNAPSHOT + 12.0.2 EE8 :: Demo :: Servlet Spec :: WebApp jetty-ee8-demo-spec-webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-web-fragment/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-web-fragment/pom.xml index 0a3524f5a5fc..5667aa327542 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-web-fragment/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-web-fragment/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demo-spec - 12.0.2-SNAPSHOT + 12.0.2 EE8 :: Demo :: Servlet Spec :: Fragment Jar diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/pom.xml index 6f0061e326ab..dc3da32bfb70 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2-SNAPSHOT + 12.0.2 EE8 :: Demo :: Servlet Spec jetty-ee8-demo-spec diff --git a/jetty-ee8/jetty-ee8-demos/pom.xml b/jetty-ee8/jetty-ee8-demos/pom.xml index ab7d292d1dab..d113f9465796 100644 --- a/jetty-ee8/jetty-ee8-demos/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml b/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml index b20d2875bdde..8ef500415276 100644 --- a/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml +++ b/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee8-glassfish-jstl diff --git a/jetty-ee8/jetty-ee8-home/pom.xml b/jetty-ee8/jetty-ee8-home/pom.xml index a096911c11b4..ef330d18c447 100644 --- a/jetty-ee8/jetty-ee8-home/pom.xml +++ b/jetty-ee8/jetty-ee8-home/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee8-home diff --git a/jetty-ee8/jetty-ee8-jaspi/pom.xml b/jetty-ee8/jetty-ee8-jaspi/pom.xml index 63f224bf9060..7673b4e9665f 100644 --- a/jetty-ee8/jetty-ee8-jaspi/pom.xml +++ b/jetty-ee8/jetty-ee8-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-jndi/pom.xml b/jetty-ee8/jetty-ee8-jndi/pom.xml index bece58850077..99a4257374f1 100644 --- a/jetty-ee8/jetty-ee8-jndi/pom.xml +++ b/jetty-ee8/jetty-ee8-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml b/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml index 62bf3a5f7b03..2573ca4fbfe1 100644 --- a/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml +++ b/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee8-jspc-maven-plugin diff --git a/jetty-ee8/jetty-ee8-maven-plugin/pom.xml b/jetty-ee8/jetty-ee8-maven-plugin/pom.xml index e426e73c0aa3..91361d598b2f 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/pom.xml +++ b/jetty-ee8/jetty-ee8-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee8-maven-plugin diff --git a/jetty-ee8/jetty-ee8-nested/pom.xml b/jetty-ee8/jetty-ee8-nested/pom.xml index f415557e7ae2..7041c60e3f3c 100644 --- a/jetty-ee8/jetty-ee8-nested/pom.xml +++ b/jetty-ee8/jetty-ee8-nested/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-openid/pom.xml b/jetty-ee8/jetty-ee8-openid/pom.xml index e97a1e234480..00eca66853b7 100644 --- a/jetty-ee8/jetty-ee8-openid/pom.xml +++ b/jetty-ee8/jetty-ee8-openid/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-plus/pom.xml b/jetty-ee8/jetty-ee8-plus/pom.xml index bf12ea3763a0..9c481da3c891 100644 --- a/jetty-ee8/jetty-ee8-plus/pom.xml +++ b/jetty-ee8/jetty-ee8-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-proxy/pom.xml b/jetty-ee8/jetty-ee8-proxy/pom.xml index 37a87a859a1e..be79eb21fb96 100644 --- a/jetty-ee8/jetty-ee8-proxy/pom.xml +++ b/jetty-ee8/jetty-ee8-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-quickstart/pom.xml b/jetty-ee8/jetty-ee8-quickstart/pom.xml index 545b11870576..7b849ca6c94d 100644 --- a/jetty-ee8/jetty-ee8-quickstart/pom.xml +++ b/jetty-ee8/jetty-ee8-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-security/pom.xml b/jetty-ee8/jetty-ee8-security/pom.xml index c8d67867a2f9..e122073e3040 100644 --- a/jetty-ee8/jetty-ee8-security/pom.xml +++ b/jetty-ee8/jetty-ee8-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-servlet/pom.xml b/jetty-ee8/jetty-ee8-servlet/pom.xml index 40eb38d5f1df..54f8cc177aa6 100644 --- a/jetty-ee8/jetty-ee8-servlet/pom.xml +++ b/jetty-ee8/jetty-ee8-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-servlets/pom.xml b/jetty-ee8/jetty-ee8-servlets/pom.xml index 30af9201ce49..574cf989a3c8 100644 --- a/jetty-ee8/jetty-ee8-servlets/pom.xml +++ b/jetty-ee8/jetty-ee8-servlets/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-webapp/pom.xml b/jetty-ee8/jetty-ee8-webapp/pom.xml index 41b2571c3088..553c112eaef6 100644 --- a/jetty-ee8/jetty-ee8-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml index a6b5873a2f8c..1bf0e02f4876 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2-SNAPSHOT + 12.0.2 ../pom.xml diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml index 8d1770799d82..ba5ef548c47b 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2-SNAPSHOT + 12.0.2 ../pom.xml diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml index 94cda6d1fbd5..129d4709749a 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml index 86f282e81630..299388b1337f 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml index 698a2f624b82..ae8ff36d99fd 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml index 68df274f1cd5..80474c8136c7 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml index a237e38bb0a9..7805692669af 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml index 50e772b66704..2fb860c587c9 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml index 5fc93e5a7074..5c45e3188073 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml index da999eaaa38f..bdb45370565c 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml index 003655683f90..1f6efc83aaed 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml index ccdb0cd4d0a2..e5bba44535d2 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/pom.xml b/jetty-ee8/jetty-ee8-websocket/pom.xml index d7fa4781aa33..21cee7fd0d51 100644 --- a/jetty-ee8/jetty-ee8-websocket/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2-SNAPSHOT + 12.0.2 ../pom.xml diff --git a/jetty-ee8/pom.xml b/jetty-ee8/pom.xml index 2ed73c0396f4..d83ec2f601ea 100644 --- a/jetty-ee8/pom.xml +++ b/jetty-ee8/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-annotations/pom.xml b/jetty-ee9/jetty-ee9-annotations/pom.xml index 0177348369ee..a69958534e5e 100644 --- a/jetty-ee9/jetty-ee9-annotations/pom.xml +++ b/jetty-ee9/jetty-ee9-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-apache-jsp/pom.xml b/jetty-ee9/jetty-ee9-apache-jsp/pom.xml index 52f084c94ad8..e21972d997d3 100644 --- a/jetty-ee9/jetty-ee9-apache-jsp/pom.xml +++ b/jetty-ee9/jetty-ee9-apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-bom/pom.xml b/jetty-ee9/jetty-ee9-bom/pom.xml index 2a7adacfdfdb..50f4037d2794 100644 --- a/jetty-ee9/jetty-ee9-bom/pom.xml +++ b/jetty-ee9/jetty-ee9-bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee9-bom @@ -43,147 +43,147 @@ org.eclipse.jetty.ee9 jetty-ee9-annotations - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9 jetty-ee9-apache-jsp - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9 jetty-ee9-cdi - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9 jetty-ee9-fcgi-proxy - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9 jetty-ee9-glassfish-jstl - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9 jetty-ee9-jaspi - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9 jetty-ee9-jndi - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9 jetty-ee9-nested - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9 jetty-ee9-openid - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9 jetty-ee9-plus - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9 jetty-ee9-proxy - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9 jetty-ee9-quickstart - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9 jetty-ee9-runner - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9 jetty-ee9-security - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9 jetty-ee9-servlet - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9 jetty-ee9-servlets - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9 jetty-ee9-webapp - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi-boot - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi-boot-jsp - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-client - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-client-webapp - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-common - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-server - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jetty-api - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jetty-client - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jetty-client-webapp - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jetty-common - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jetty-server - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-servlet - 12.0.2-SNAPSHOT + 12.0.2 diff --git a/jetty-ee9/jetty-ee9-cdi/pom.xml b/jetty-ee9/jetty-ee9-cdi/pom.xml index cc0f1d9bd864..b05c62faa6b5 100644 --- a/jetty-ee9/jetty-ee9-cdi/pom.xml +++ b/jetty-ee9/jetty-ee9-cdi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee9-cdi diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-jar/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-jar/pom.xml index 41994cdbc4e1..8281c04977a1 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-jar/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-jar/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demo-async-rest - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-server/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-server/pom.xml index 9aa6fb8c20f8..4de9c9dcc2da 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-server/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demo-async-rest - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/pom.xml index 44f2e87b2fba..888eed294d7e 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demo-async-rest - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/pom.xml index dcb91d48b96a..bd4326b7f13c 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml index 6d6f05496749..c9707f5a9cd5 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee9-demo-embedded diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/pom.xml index 2dc7896bc833..fdd7e35fa87b 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee9-demo-jaas-webapp EE9 :: Demo :: JAAS WebApp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/pom.xml index b9ea28e8dedb..ae876bc49b52 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee9-demo-jetty-webapp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/pom.xml index e12408df35b7..71c8b247e292 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee9-demo-jndi-webapp EE9 :: Demo :: JNDI WebApp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/pom.xml index c8e4aa98620e..955370d2e58e 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/pom.xml index 322eea5efcc0..d973e0f6f67c 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2-SNAPSHOT + 12.0.2 EE9 :: Demo :: Mock Resources jetty-ee9-demo-mock-resources diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml index 9372adb92859..ee93bf6d767d 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee9-demo-proxy-webapp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-simple-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-simple-webapp/pom.xml index fc3b82e164c2..e8cdfa93002f 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-simple-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-simple-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer/pom.xml index 8cb8f7d82cc6..5efc5af05043 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2-SNAPSHOT + 12.0.2 ../../pom.xml jetty-ee9-demo-container-initializer diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml index 4ea34156abfc..f98a3a72909a 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2-SNAPSHOT + 12.0.2 ../../pom.xml EE9 :: Demo :: Servlet Spec :: WebApp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment/pom.xml index 650752ff7da2..2f0de93ecfa3 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2-SNAPSHOT + 12.0.2 ../../pom.xml diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/pom.xml index 11fe46410fb0..1ed55a36aee1 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2-SNAPSHOT + 12.0.2 EE9 :: Demo :: Servlet Spec jetty-ee9-demo-spec diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/pom.xml index 76a7efba8438..46fffe2f6f51 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-demos/pom.xml b/jetty-ee9/jetty-ee9-demos/pom.xml index 4a59f735f5a0..d8edc3c4bb1e 100644 --- a/jetty-ee9/jetty-ee9-demos/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml b/jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml index 38cc17769358..9bbbc5c568ee 100644 --- a/jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml +++ b/jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml b/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml index 77e875207dbf..436f04acfbd3 100644 --- a/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml +++ b/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee9-glassfish-jstl diff --git a/jetty-ee9/jetty-ee9-home/pom.xml b/jetty-ee9/jetty-ee9-home/pom.xml index 540495d1dace..3825b0689580 100644 --- a/jetty-ee9/jetty-ee9-home/pom.xml +++ b/jetty-ee9/jetty-ee9-home/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee9-home diff --git a/jetty-ee9/jetty-ee9-jaspi/pom.xml b/jetty-ee9/jetty-ee9-jaspi/pom.xml index 57b70c4f65f1..e4c2f3751d24 100644 --- a/jetty-ee9/jetty-ee9-jaspi/pom.xml +++ b/jetty-ee9/jetty-ee9-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-jndi/pom.xml b/jetty-ee9/jetty-ee9-jndi/pom.xml index 07aaad855b4f..93aa75df3f1b 100644 --- a/jetty-ee9/jetty-ee9-jndi/pom.xml +++ b/jetty-ee9/jetty-ee9-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml b/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml index f3770b4de837..f6396622e515 100644 --- a/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml +++ b/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee9-jspc-maven-plugin diff --git a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml index e64c56206d21..a3265024fc1c 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml +++ b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee9-maven-plugin diff --git a/jetty-ee9/jetty-ee9-nested/pom.xml b/jetty-ee9/jetty-ee9-nested/pom.xml index d83f5f9c1c51..c394aaa3bb5e 100644 --- a/jetty-ee9/jetty-ee9-nested/pom.xml +++ b/jetty-ee9/jetty-ee9-nested/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-openid/pom.xml b/jetty-ee9/jetty-ee9-openid/pom.xml index 9f07e1d592b8..e62202274a49 100644 --- a/jetty-ee9/jetty-ee9-openid/pom.xml +++ b/jetty-ee9/jetty-ee9-openid/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml index 74777db8e9d7..2157a36f0e19 100644 --- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.osgi jetty-ee9-osgi - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee9-osgi-boot-jsp diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml index e403e4f0fc7e..9d84b035c314 100644 --- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.osgi jetty-ee9-osgi - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee9-osgi-boot diff --git a/jetty-ee9/jetty-ee9-osgi/pom.xml b/jetty-ee9/jetty-ee9-osgi/pom.xml index 2abb6644c41f..f9abb5e84b44 100644 --- a/jetty-ee9/jetty-ee9-osgi/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-fragment/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-fragment/pom.xml index de67c74fb54a..82d4ff712d6e 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-fragment/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-fragment/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.osgi jetty-ee9-osgi - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 test-jetty-ee9-osgi-fragment diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-server/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-server/pom.xml index 9e6ee57f5fa2..45e7314c96d7 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-server/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.osgi jetty-ee9-osgi - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 test-jetty-ee9-osgi-server diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-webapp-resources/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-webapp-resources/pom.xml index cdc4c9fd8700..df08588e3257 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-webapp-resources/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-webapp-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.osgi jetty-ee9-osgi - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 test-jetty-ee9-osgi-webapp-resources diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml index 06e47aba0017..136aaea82e04 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.osgi jetty-ee9-osgi - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 test-jetty-ee9-osgi diff --git a/jetty-ee9/jetty-ee9-plus/pom.xml b/jetty-ee9/jetty-ee9-plus/pom.xml index 30456c20d6cf..080f2ae96873 100644 --- a/jetty-ee9/jetty-ee9-plus/pom.xml +++ b/jetty-ee9/jetty-ee9-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-proxy/pom.xml b/jetty-ee9/jetty-ee9-proxy/pom.xml index 1db49a23333c..6e09a70f858a 100644 --- a/jetty-ee9/jetty-ee9-proxy/pom.xml +++ b/jetty-ee9/jetty-ee9-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-quickstart/pom.xml b/jetty-ee9/jetty-ee9-quickstart/pom.xml index 90e1cf31deaa..963b3c058fa7 100644 --- a/jetty-ee9/jetty-ee9-quickstart/pom.xml +++ b/jetty-ee9/jetty-ee9-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-runner/pom.xml b/jetty-ee9/jetty-ee9-runner/pom.xml index 2f0a58f2637b..9408c7a521dc 100644 --- a/jetty-ee9/jetty-ee9-runner/pom.xml +++ b/jetty-ee9/jetty-ee9-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee9-runner diff --git a/jetty-ee9/jetty-ee9-security/pom.xml b/jetty-ee9/jetty-ee9-security/pom.xml index bdc877221c64..63ef6eaa354c 100644 --- a/jetty-ee9/jetty-ee9-security/pom.xml +++ b/jetty-ee9/jetty-ee9-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-servlet/pom.xml b/jetty-ee9/jetty-ee9-servlet/pom.xml index 350e6f678bc0..7ada4b1a4795 100644 --- a/jetty-ee9/jetty-ee9-servlet/pom.xml +++ b/jetty-ee9/jetty-ee9-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-servlets/pom.xml b/jetty-ee9/jetty-ee9-servlets/pom.xml index f1af96a5053c..2abd3b04f74a 100644 --- a/jetty-ee9/jetty-ee9-servlets/pom.xml +++ b/jetty-ee9/jetty-ee9-servlets/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-bad-websocket-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-bad-websocket-webapp/pom.xml index 4edf68e506b6..86e1dcb41e8e 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-bad-websocket-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-bad-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/pom.xml index 7f1f5cdb380e..cc2cec3fd731 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee9-test-badinit-webapp diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi-common-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi-common-webapp/pom.xml index e56aac7d7af9..0c0a06f53a32 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi-common-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi-common-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/pom.xml index 29191d330e96..7aec21efe00c 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-client-transports/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-client-transports/pom.xml index 5008089b3885..496de8f0eb40 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-client-transports/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-client-transports/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-felix-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-felix-webapp/pom.xml index c2e7d58fb3c8..52a3fb8439c7 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-felix-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-felix-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml index c46e26238bf7..f4f676cca5d2 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml index 92cc1fcd06ae..27869707a6b1 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee9-test-integration diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp-it/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp-it/pom.xml index 9be42e33df50..f709e154902e 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp-it/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp-it/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-jmx - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee9-jmx-webapp-it diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp/pom.xml index fc63dd404bf1..af63099293f4 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-jmx - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee9-jmx-webapp war diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/pom.xml index 974113dedacb..fc105ede30f4 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee9-test-jmx diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jndi/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jndi/pom.xml index f92bff574148..da7c2dbae243 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jndi/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jndi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-loginservice/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-loginservice/pom.xml index a2b2bcc6d000..104b8e80922e 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-loginservice/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-loginservice/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee9-test-loginservice EE9 :: Tests :: Login Service diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-openid-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-openid-webapp/pom.xml index b70638b056a0..2f7f9ce665b6 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-openid-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-openid-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/pom.xml index 130603af02f5..aa3fe939a0c5 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml index 8921836756cf..9216aeedcc4f 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-ee9-test-quickstart diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml index 96724422bcb1..434fc2574a07 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-sessions - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee9-test-sessions-common EE9 :: Tests :: Sessions :: Common diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-file/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-file/pom.xml index 4919f0fbac06..e0037a2ae25e 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-file/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-file/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-sessions - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee9-test-sessions-file EE9 :: Tests :: Sessions :: File diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-gcloud/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-gcloud/pom.xml index d6b6a63f8a6d..e3dafb91e133 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-gcloud/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-gcloud/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-sessions - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee9-test-sessions-gcloud EE9 :: Tests :: Sessions :: GCloud diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-hazelcast/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-hazelcast/pom.xml index 83be735b59bd..9188da936cd9 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-hazelcast/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-hazelcast/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-sessions - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee9-test-sessions-hazelcast EE9 :: Tests :: Sessions :: Hazelcast diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml index 2fa7a3ddf329..1fc61954cb8d 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-sessions - 12.0.2-SNAPSHOT + 12.0.2 ../pom.xml jetty-ee9-test-sessions-infinispan diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-jdbc/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-jdbc/pom.xml index daadcfe83415..79d33ec1d9ef 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-jdbc/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-jdbc/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-sessions - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee9-test-sessions-jdbc EE9 :: Tests :: Sessions :: JDBC diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-memcached/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-memcached/pom.xml index be8cdb76a706..cfb1f7a788bb 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-memcached/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-memcached/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-sessions - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee9-test-sessions-memcached EE9 :: Tests :: Sessions :: Memcached diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-mongodb/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-mongodb/pom.xml index 16a64dcc3f9d..2e6286c8ec42 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-mongodb/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-mongodb/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-sessions - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee9-test-sessions-mongodb EE9 :: Tests :: Sessions :: Mongo diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/pom.xml index 4c0d818ee9ef..eba4825b97d1 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee9-test-sessions EE9 :: Tests :: Sessions diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-simple-session-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-simple-session-webapp/pom.xml index 9b270c45aecb..009d36f55704 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-simple-session-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-simple-session-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee9-test-simple-session-webapp diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-webapp-rfc2616/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-webapp-rfc2616/pom.xml index 6d355115a7aa..ad3310e72ed6 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-webapp-rfc2616/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-webapp-rfc2616/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 jetty-ee9-test-webapp-rfc2616 EE9 :: Tests :: RFC2616 WebApp diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-provided-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-provided-webapp/pom.xml index 67bd8ead3b6f..52447e671c1a 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-provided-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-provided-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-webapp/pom.xml index 5ce3c2d25749..899ae62da662 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-webapp/pom.xml index 3f79c95abe5d..48cdd7b3317f 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-weld-cdi-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-weld-cdi-webapp/pom.xml index eb4856241f0a..727c2444dc72 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-weld-cdi-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-weld-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/pom.xml b/jetty-ee9/jetty-ee9-tests/pom.xml index 5d9f069b87e4..0169504917df 100644 --- a/jetty-ee9/jetty-ee9-tests/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-webapp/pom.xml b/jetty-ee9/jetty-ee9-webapp/pom.xml index 44881543ab1d..b3daaae62cc1 100644 --- a/jetty-ee9/jetty-ee9-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/pom.xml index 1679198b452f..8a59c865d500 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2-SNAPSHOT + 12.0.2 ../pom.xml diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml index 31c29439a24a..6da6809540b9 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2-SNAPSHOT + 12.0.2 ../pom.xml diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml index d4b4cbd2e2a8..1cfda1cea23a 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/pom.xml index 5983306f4eac..0c01d27c9c9e 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/pom.xml index b0430a2a6cd4..af5f464029e8 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-api/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-api/pom.xml index b6a4fee269dd..10fc76ab0c9c 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-api/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-api/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml index ec835c806ecf..6ac5124a4e23 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml index 55c9143e4282..2dbe19b02c69 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml index d9d606998eec..d5cb4aed7b2a 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/pom.xml index 1552f7817bfb..14691923e471 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml index ca164762ce26..622271fe090b 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml index a58cb4ebc910..8d4d04e890c2 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/pom.xml b/jetty-ee9/jetty-ee9-websocket/pom.xml index c0a411e6a20e..c157e815ddda 100644 --- a/jetty-ee9/jetty-ee9-websocket/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2-SNAPSHOT + 12.0.2 ../pom.xml diff --git a/jetty-ee9/pom.xml b/jetty-ee9/pom.xml index 54f766bc3ee6..854f5dc3204b 100644 --- a/jetty-ee9/pom.xml +++ b/jetty-ee9/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 285d99e5f752..d7dc50fade68 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 12.0.2-SNAPSHOT + 12.0.2 ../pom.xml 4.0.0 diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index 8e1a33243e6b..2d4ee7218934 100644 --- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.gcloud jetty-gcloud - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-integrations/jetty-gcloud/pom.xml b/jetty-integrations/jetty-gcloud/pom.xml index d41e41a02bfc..e82997da0e98 100644 --- a/jetty-integrations/jetty-gcloud/pom.xml +++ b/jetty-integrations/jetty-gcloud/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-integrations - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-integrations/jetty-hazelcast/pom.xml b/jetty-integrations/jetty-hazelcast/pom.xml index 237c76987358..b272b8e7c042 100644 --- a/jetty-integrations/jetty-hazelcast/pom.xml +++ b/jetty-integrations/jetty-hazelcast/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-integrations - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml index c24a66da1350..0a15df20ab9a 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-infinispan - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-infinispan-common diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml index b49095078950..c891533f56c1 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-infinispan - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-infinispan-embedded-query diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml index f29f4afe736a..9778a7c6ca3e 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-infinispan - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-infinispan-embedded diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml index 3d3ef0937142..a8275faab511 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-infinispan - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-infinispan-remote-query diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml index c7ad3043dc51..32089423b188 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-infinispan - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-infinispan-remote diff --git a/jetty-integrations/jetty-infinispan/pom.xml b/jetty-integrations/jetty-infinispan/pom.xml index 5fb241bcfcb0..26d1a8f2491e 100644 --- a/jetty-integrations/jetty-infinispan/pom.xml +++ b/jetty-integrations/jetty-infinispan/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-integrations - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml index 43c5b0d996a8..1b2859870967 100644 --- a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml +++ b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.memcached jetty-memcached - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-integrations/jetty-memcached/pom.xml b/jetty-integrations/jetty-memcached/pom.xml index 76bd3eb2f8c3..08762c5dbd9e 100644 --- a/jetty-integrations/jetty-memcached/pom.xml +++ b/jetty-integrations/jetty-memcached/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-integrations - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/jetty-integrations/jetty-nosql/pom.xml b/jetty-integrations/jetty-nosql/pom.xml index 470cd0454ab3..8a79b894cccf 100644 --- a/jetty-integrations/jetty-nosql/pom.xml +++ b/jetty-integrations/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-integrations - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 jetty-nosql diff --git a/jetty-integrations/pom.xml b/jetty-integrations/pom.xml index afd63c657cee..96996c879ad4 100644 --- a/jetty-integrations/pom.xml +++ b/jetty-integrations/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/pom.xml b/pom.xml index 7247067f1568..d23157c7f6f9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty jetty-project - 12.0.2-SNAPSHOT + 12.0.2 Jetty :: Project The Eclipse Jetty Project pom diff --git a/tests/jetty-home-tester/pom.xml b/tests/jetty-home-tester/pom.xml index 05fd2af17275..b55e1d4df0cb 100644 --- a/tests/jetty-home-tester/pom.xml +++ b/tests/jetty-home-tester/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index 0559795eb1e8..0e2439e81c6a 100644 --- a/tests/jetty-jmh/pom.xml +++ b/tests/jetty-jmh/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/tests/jetty-test-session-common/pom.xml b/tests/jetty-test-session-common/pom.xml index 3b1356b1d575..263d671b9b41 100644 --- a/tests/jetty-test-session-common/pom.xml +++ b/tests/jetty-test-session-common/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/tests/pom.xml b/tests/pom.xml index 44fbe3ff7492..e67ffa0715c5 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 12.0.2-SNAPSHOT + 12.0.2 org.eclipse.jetty.tests tests diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 4b26c7860a6c..6cc3f50b592f 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/tests/test-distribution/test-distribution-common/pom.xml b/tests/test-distribution/test-distribution-common/pom.xml index f650abee87d4..c1ac07a861b3 100644 --- a/tests/test-distribution/test-distribution-common/pom.xml +++ b/tests/test-distribution/test-distribution-common/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests test-distribution - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/tests/test-distribution/test-ee10-distribution/pom.xml b/tests/test-distribution/test-ee10-distribution/pom.xml index 3e0e2f6fc32f..5d12e2e98c06 100644 --- a/tests/test-distribution/test-ee10-distribution/pom.xml +++ b/tests/test-distribution/test-ee10-distribution/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests test-distribution - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/tests/test-distribution/test-ee9-distribution/pom.xml b/tests/test-distribution/test-ee9-distribution/pom.xml index 4ff61d986deb..66fab1dc8ed1 100644 --- a/tests/test-distribution/test-ee9-distribution/pom.xml +++ b/tests/test-distribution/test-ee9-distribution/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests test-distribution - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index c367ea215ccb..3a9ab360e3d6 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests - 12.0.2-SNAPSHOT + 12.0.2 4.0.0 test-integration From 6b3f760b80b9507ca3b23be86f3ae5ef3a9277ab Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 9 Oct 2023 21:16:46 -0500 Subject: [PATCH 25/31] Updating to version 12.0.3-SNAPSHOT --- VERSION.txt | 2 + build/build-resources/pom.xml | 2 +- build/pom.xml | 2 +- .../jetty-asciidoctor-extensions/pom.xml | 2 +- documentation/jetty-documentation/pom.xml | 2 +- documentation/pom.xml | 2 +- javadoc/pom.xml | 2 +- .../jetty-alpn/jetty-alpn-client/pom.xml | 2 +- .../jetty-alpn-conscrypt-client/pom.xml | 2 +- .../jetty-alpn-conscrypt-server/pom.xml | 2 +- .../jetty-alpn/jetty-alpn-java-client/pom.xml | 2 +- .../jetty-alpn/jetty-alpn-java-server/pom.xml | 2 +- .../jetty-alpn/jetty-alpn-server/pom.xml | 2 +- jetty-core/jetty-alpn/pom.xml | 2 +- jetty-core/jetty-bom/pom.xml | 112 +++++++++--------- jetty-core/jetty-client/pom.xml | 2 +- .../jetty-demos/jetty-demo-handler/pom.xml | 2 +- jetty-core/jetty-demos/pom.xml | 2 +- jetty-core/jetty-deploy/pom.xml | 2 +- .../jetty-fcgi/jetty-fcgi-client/pom.xml | 2 +- .../jetty-fcgi/jetty-fcgi-proxy/pom.xml | 2 +- .../jetty-fcgi/jetty-fcgi-server/pom.xml | 2 +- jetty-core/jetty-fcgi/pom.xml | 2 +- jetty-core/jetty-http-spi/pom.xml | 2 +- jetty-core/jetty-http-tools/pom.xml | 2 +- jetty-core/jetty-http/pom.xml | 2 +- .../jetty-http2-client-transport/pom.xml | 2 +- .../jetty-http2/jetty-http2-client/pom.xml | 2 +- .../jetty-http2/jetty-http2-common/pom.xml | 2 +- .../jetty-http2/jetty-http2-hpack/pom.xml | 2 +- .../jetty-http2/jetty-http2-server/pom.xml | 2 +- .../jetty-http2/jetty-http2-tests/pom.xml | 2 +- jetty-core/jetty-http2/pom.xml | 2 +- .../jetty-http3-client-transport/pom.xml | 2 +- .../jetty-http3/jetty-http3-client/pom.xml | 2 +- .../jetty-http3/jetty-http3-common/pom.xml | 2 +- .../jetty-http3/jetty-http3-qpack/pom.xml | 2 +- .../jetty-http3/jetty-http3-server/pom.xml | 2 +- .../jetty-http3/jetty-http3-tests/pom.xml | 2 +- jetty-core/jetty-http3/pom.xml | 2 +- jetty-core/jetty-io/pom.xml | 2 +- jetty-core/jetty-jmx/pom.xml | 2 +- jetty-core/jetty-jndi/pom.xml | 2 +- jetty-core/jetty-keystore/pom.xml | 2 +- jetty-core/jetty-openid/pom.xml | 2 +- jetty-core/jetty-osgi/pom.xml | 2 +- jetty-core/jetty-proxy/pom.xml | 2 +- .../jetty-quic/jetty-quic-client/pom.xml | 2 +- .../jetty-quic/jetty-quic-common/pom.xml | 2 +- .../jetty-quic-quiche-common/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-quic-quiche-jna/pom.xml | 2 +- .../jetty-quic/jetty-quic-quiche/pom.xml | 2 +- .../jetty-quic/jetty-quic-server/pom.xml | 2 +- jetty-core/jetty-quic/pom.xml | 2 +- jetty-core/jetty-rewrite/pom.xml | 2 +- jetty-core/jetty-security/pom.xml | 2 +- jetty-core/jetty-server/pom.xml | 2 +- jetty-core/jetty-session/pom.xml | 2 +- jetty-core/jetty-slf4j-impl/pom.xml | 2 +- jetty-core/jetty-start/pom.xml | 2 +- .../jetty-test-client-transports/pom.xml | 2 +- jetty-core/jetty-tests/pom.xml | 2 +- jetty-core/jetty-unixdomain-server/pom.xml | 2 +- jetty-core/jetty-util-ajax/pom.xml | 2 +- jetty-core/jetty-util/pom.xml | 2 +- .../jetty-websocket-core-client/pom.xml | 2 +- .../jetty-websocket-core-common/pom.xml | 2 +- .../jetty-websocket-core-server/pom.xml | 2 +- .../jetty-websocket-core-tests/pom.xml | 2 +- .../jetty-websocket-jetty-api/pom.xml | 2 +- .../jetty-websocket-jetty-client/pom.xml | 2 +- .../jetty-websocket-jetty-common/pom.xml | 2 +- .../jetty-websocket-jetty-server/pom.xml | 2 +- .../jetty-websocket-jetty-tests/pom.xml | 2 +- jetty-core/jetty-websocket/pom.xml | 2 +- jetty-core/jetty-xml/pom.xml | 2 +- jetty-core/pom.xml | 2 +- jetty-ee10/jetty-ee10-annotations/pom.xml | 2 +- jetty-ee10/jetty-ee10-apache-jsp/pom.xml | 2 +- jetty-ee10/jetty-ee10-bom/pom.xml | 54 ++++----- jetty-ee10/jetty-ee10-cdi/pom.xml | 2 +- .../jetty-ee10-demo-async-rest-jar/pom.xml | 2 +- .../jetty-ee10-demo-async-rest-server/pom.xml | 2 +- .../jetty-ee10-demo-async-rest-webapp/pom.xml | 2 +- .../jetty-ee10-demo-async-rest/pom.xml | 2 +- .../jetty-ee10-demo-embedded/pom.xml | 2 +- .../jetty-ee10-demo-jaas-webapp/pom.xml | 2 +- .../jetty-ee10-demo-jetty-webapp/pom.xml | 2 +- .../jetty-ee10-demo-jndi-webapp/pom.xml | 2 +- .../jetty-ee10-demo-jsp-webapp/pom.xml | 2 +- .../jetty-ee10-demo-mock-resources/pom.xml | 2 +- .../jetty-ee10-demo-proxy-webapp/pom.xml | 2 +- .../jetty-ee10-demo-simple-webapp/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee10-demo-spec-webapp/pom.xml | 2 +- .../jetty-ee10-demo-web-fragment/pom.xml | 2 +- .../jetty-ee10-demo-spec/pom.xml | 2 +- .../jetty-ee10-demo-template/pom.xml | 2 +- jetty-ee10/jetty-ee10-demos/pom.xml | 2 +- jetty-ee10/jetty-ee10-examples/pom.xml | 2 +- jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml | 2 +- jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml | 2 +- jetty-ee10/jetty-ee10-home/pom.xml | 2 +- jetty-ee10/jetty-ee10-jaspi/pom.xml | 2 +- jetty-ee10/jetty-ee10-jndi/pom.xml | 2 +- .../jetty-ee10-jspc-maven-plugin/pom.xml | 2 +- jetty-ee10/jetty-ee10-maven-plugin/pom.xml | 2 +- .../jetty-ee10-osgi-alpn/pom.xml | 2 +- .../jetty-ee10-osgi-boot-jsp/pom.xml | 2 +- .../jetty-ee10-osgi-boot/pom.xml | 2 +- jetty-ee10/jetty-ee10-osgi/pom.xml | 2 +- .../test-jetty-ee10-osgi-fragment/pom.xml | 2 +- .../test-jetty-ee10-osgi-server/pom.xml | 2 +- .../pom.xml | 2 +- .../test-jetty-ee10-osgi/pom.xml | 2 +- jetty-ee10/jetty-ee10-plus/pom.xml | 2 +- jetty-ee10/jetty-ee10-proxy/pom.xml | 2 +- jetty-ee10/jetty-ee10-quickstart/pom.xml | 2 +- jetty-ee10/jetty-ee10-runner/pom.xml | 2 +- jetty-ee10/jetty-ee10-servlet/pom.xml | 2 +- jetty-ee10/jetty-ee10-servlets/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee10-test-badinit-webapp/pom.xml | 2 +- .../jetty-ee10-test-cdi-common-webapp/pom.xml | 2 +- .../jetty-ee10-test-cdi/pom.xml | 2 +- .../jetty-ee10-test-client-transports/pom.xml | 2 +- .../jetty-ee10-test-felix-webapp/pom.xml | 2 +- .../jetty-ee10-test-http2-webapp/pom.xml | 2 +- .../jetty-ee10-test-integration/pom.xml | 2 +- .../jetty-ee10-jmx-webapp-it/pom.xml | 2 +- .../jetty-ee10-jmx-webapp/pom.xml | 2 +- .../jetty-ee10-test-jmx/pom.xml | 2 +- .../jetty-ee10-test-jndi/pom.xml | 2 +- .../jetty-ee10-test-loginservice/pom.xml | 2 +- .../jetty-ee10-test-openid-webapp/pom.xml | 2 +- .../jetty-ee10-test-owb-cdi-webapp/pom.xml | 2 +- .../jetty-ee10-test-quickstart/pom.xml | 2 +- .../jetty-ee10-test-sessions-common/pom.xml | 2 +- .../jetty-ee10-test-sessions-file/pom.xml | 2 +- .../jetty-ee10-test-sessions-gcloud/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee10-test-sessions-jdbc/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee10-test-sessions-mongodb/pom.xml | 2 +- .../jetty-ee10-test-sessions/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee10-test-webapp-rfc2616/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee10-test-websocket-webapp/pom.xml | 2 +- .../jetty-ee10-test-weld-cdi-webapp/pom.xml | 2 +- jetty-ee10/jetty-ee10-tests/pom.xml | 2 +- jetty-ee10/jetty-ee10-webapp/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee10-websocket-jetty-server/pom.xml | 2 +- .../jetty-ee10-websocket-jetty-tests/pom.xml | 2 +- .../jetty-ee10-websocket-servlet/pom.xml | 2 +- jetty-ee10/jetty-ee10-websocket/pom.xml | 2 +- jetty-ee10/pom.xml | 2 +- jetty-ee8/jetty-ee8-annotations/pom.xml | 2 +- jetty-ee8/jetty-ee8-apache-jsp/pom.xml | 2 +- jetty-ee8/jetty-ee8-bom/pom.xml | 48 ++++---- .../jetty-ee8-demo-async-rest-jar/pom.xml | 2 +- .../jetty-ee8-demo-async-rest-server/pom.xml | 2 +- .../jetty-ee8-demo-async-rest-webapp/pom.xml | 2 +- .../jetty-ee8-demo-async-rest/pom.xml | 2 +- .../jetty-ee8-demo-jaas-webapp/pom.xml | 2 +- .../jetty-ee8-demo-jetty-webapp/pom.xml | 2 +- .../jetty-ee8-demo-jndi-webapp/pom.xml | 2 +- .../jetty-ee8-demo-jsp-webapp/pom.xml | 2 +- .../jetty-ee8-demo-mock-resources/pom.xml | 2 +- .../jetty-ee8-demo-proxy-webapp/pom.xml | 2 +- .../jetty-ee8-demo-simple-webapp/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee8-demo-spec-webapp/pom.xml | 2 +- .../jetty-ee8-demo-web-fragment/pom.xml | 2 +- .../jetty-ee8-demo-spec/pom.xml | 2 +- jetty-ee8/jetty-ee8-demos/pom.xml | 2 +- jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml | 2 +- jetty-ee8/jetty-ee8-home/pom.xml | 2 +- jetty-ee8/jetty-ee8-jaspi/pom.xml | 2 +- jetty-ee8/jetty-ee8-jndi/pom.xml | 2 +- jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml | 2 +- jetty-ee8/jetty-ee8-maven-plugin/pom.xml | 2 +- jetty-ee8/jetty-ee8-nested/pom.xml | 2 +- jetty-ee8/jetty-ee8-openid/pom.xml | 2 +- jetty-ee8/jetty-ee8-plus/pom.xml | 2 +- jetty-ee8/jetty-ee8-proxy/pom.xml | 2 +- jetty-ee8/jetty-ee8-quickstart/pom.xml | 2 +- jetty-ee8/jetty-ee8-security/pom.xml | 2 +- jetty-ee8/jetty-ee8-servlet/pom.xml | 2 +- jetty-ee8/jetty-ee8-servlets/pom.xml | 2 +- jetty-ee8/jetty-ee8-webapp/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee8-websocket-javax-client/pom.xml | 2 +- .../jetty-ee8-websocket-javax-common/pom.xml | 2 +- .../jetty-ee8-websocket-javax-server/pom.xml | 2 +- .../jetty-ee8-websocket-javax-tests/pom.xml | 2 +- .../jetty-ee8-websocket-jetty-api/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee8-websocket-jetty-client/pom.xml | 2 +- .../jetty-ee8-websocket-jetty-common/pom.xml | 2 +- .../jetty-ee8-websocket-jetty-server/pom.xml | 2 +- .../jetty-ee8-websocket-jetty-tests/pom.xml | 2 +- .../jetty-ee8-websocket-servlet/pom.xml | 2 +- jetty-ee8/jetty-ee8-websocket/pom.xml | 2 +- jetty-ee8/pom.xml | 2 +- jetty-ee9/jetty-ee9-annotations/pom.xml | 2 +- jetty-ee9/jetty-ee9-apache-jsp/pom.xml | 2 +- jetty-ee9/jetty-ee9-bom/pom.xml | 60 +++++----- jetty-ee9/jetty-ee9-cdi/pom.xml | 2 +- .../jetty-ee9-demo-async-rest-jar/pom.xml | 2 +- .../jetty-ee9-demo-async-rest-server/pom.xml | 2 +- .../jetty-ee9-demo-async-rest-webapp/pom.xml | 2 +- .../jetty-ee9-demo-async-rest/pom.xml | 2 +- .../jetty-ee9-demo-embedded/pom.xml | 2 +- .../jetty-ee9-demo-jaas-webapp/pom.xml | 2 +- .../jetty-ee9-demo-jetty-webapp/pom.xml | 2 +- .../jetty-ee9-demo-jndi-webapp/pom.xml | 2 +- .../jetty-ee9-demo-jsp-webapp/pom.xml | 2 +- .../jetty-ee9-demo-mock-resources/pom.xml | 2 +- .../jetty-ee9-demo-proxy-webapp/pom.xml | 2 +- .../jetty-ee9-demo-simple-webapp/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee9-demo-spec-webapp/pom.xml | 2 +- .../jetty-ee9-demo-web-fragment/pom.xml | 2 +- .../jetty-ee9-demo-spec/pom.xml | 2 +- .../jetty-ee9-demo-template/pom.xml | 2 +- jetty-ee9/jetty-ee9-demos/pom.xml | 2 +- jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml | 2 +- jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml | 2 +- jetty-ee9/jetty-ee9-home/pom.xml | 2 +- jetty-ee9/jetty-ee9-jaspi/pom.xml | 2 +- jetty-ee9/jetty-ee9-jndi/pom.xml | 2 +- jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml | 2 +- jetty-ee9/jetty-ee9-maven-plugin/pom.xml | 2 +- jetty-ee9/jetty-ee9-nested/pom.xml | 2 +- jetty-ee9/jetty-ee9-openid/pom.xml | 2 +- .../jetty-ee9-osgi-boot-jsp/pom.xml | 2 +- .../jetty-ee9-osgi-boot/pom.xml | 2 +- jetty-ee9/jetty-ee9-osgi/pom.xml | 2 +- .../test-jetty-ee9-osgi-fragment/pom.xml | 2 +- .../test-jetty-ee9-osgi-server/pom.xml | 2 +- .../pom.xml | 2 +- .../test-jetty-ee9-osgi/pom.xml | 2 +- jetty-ee9/jetty-ee9-plus/pom.xml | 2 +- jetty-ee9/jetty-ee9-proxy/pom.xml | 2 +- jetty-ee9/jetty-ee9-quickstart/pom.xml | 2 +- jetty-ee9/jetty-ee9-runner/pom.xml | 2 +- jetty-ee9/jetty-ee9-security/pom.xml | 2 +- jetty-ee9/jetty-ee9-servlet/pom.xml | 2 +- jetty-ee9/jetty-ee9-servlets/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee9-test-badinit-webapp/pom.xml | 2 +- .../jetty-ee9-test-cdi-common-webapp/pom.xml | 2 +- .../jetty-ee9-test-cdi/pom.xml | 2 +- .../jetty-ee9-test-client-transports/pom.xml | 2 +- .../jetty-ee9-test-felix-webapp/pom.xml | 2 +- .../jetty-ee9-test-http2-webapp/pom.xml | 2 +- .../jetty-ee9-test-integration/pom.xml | 2 +- .../jetty-ee9-jmx-webapp-it/pom.xml | 2 +- .../jetty-ee9-jmx-webapp/pom.xml | 2 +- .../jetty-ee9-test-jmx/pom.xml | 2 +- .../jetty-ee9-test-jndi/pom.xml | 2 +- .../jetty-ee9-test-loginservice/pom.xml | 2 +- .../jetty-ee9-test-openid-webapp/pom.xml | 2 +- .../jetty-ee9-test-owb-cdi-webapp/pom.xml | 2 +- .../jetty-ee9-test-quickstart/pom.xml | 2 +- .../jetty-ee9-test-sessions-common/pom.xml | 2 +- .../jetty-ee9-test-sessions-file/pom.xml | 2 +- .../jetty-ee9-test-sessions-gcloud/pom.xml | 2 +- .../jetty-ee9-test-sessions-hazelcast/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee9-test-sessions-jdbc/pom.xml | 2 +- .../jetty-ee9-test-sessions-memcached/pom.xml | 2 +- .../jetty-ee9-test-sessions-mongodb/pom.xml | 2 +- .../jetty-ee9-test-sessions/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee9-test-webapp-rfc2616/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee9-test-websocket-webapp/pom.xml | 2 +- .../jetty-ee9-test-weld-cdi-webapp/pom.xml | 2 +- jetty-ee9/jetty-ee9-tests/pom.xml | 2 +- jetty-ee9/jetty-ee9-webapp/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee9-websocket-jakarta-tests/pom.xml | 2 +- .../jetty-ee9-websocket-jetty-api/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-ee9-websocket-jetty-client/pom.xml | 2 +- .../jetty-ee9-websocket-jetty-common/pom.xml | 2 +- .../jetty-ee9-websocket-jetty-server/pom.xml | 2 +- .../jetty-ee9-websocket-jetty-tests/pom.xml | 2 +- .../jetty-ee9-websocket-servlet/pom.xml | 2 +- jetty-ee9/jetty-ee9-websocket/pom.xml | 2 +- jetty-ee9/pom.xml | 2 +- jetty-home/pom.xml | 2 +- .../jetty-gcloud-session-manager/pom.xml | 2 +- jetty-integrations/jetty-gcloud/pom.xml | 2 +- jetty-integrations/jetty-hazelcast/pom.xml | 2 +- .../jetty-infinispan-common/pom.xml | 2 +- .../jetty-infinispan-embedded-query/pom.xml | 2 +- .../jetty-infinispan-embedded/pom.xml | 2 +- .../jetty-infinispan-remote-query/pom.xml | 2 +- .../jetty-infinispan-remote/pom.xml | 2 +- jetty-integrations/jetty-infinispan/pom.xml | 2 +- .../jetty-memcached-sessions/pom.xml | 2 +- jetty-integrations/jetty-memcached/pom.xml | 2 +- jetty-integrations/jetty-nosql/pom.xml | 2 +- jetty-integrations/pom.xml | 2 +- pom.xml | 2 +- tests/jetty-home-tester/pom.xml | 2 +- tests/jetty-jmh/pom.xml | 2 +- tests/jetty-test-session-common/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-distribution/pom.xml | 2 +- .../test-distribution-common/pom.xml | 2 +- .../test-ee10-distribution/pom.xml | 2 +- .../test-ee9-distribution/pom.xml | 2 +- tests/test-integration/pom.xml | 2 +- 330 files changed, 464 insertions(+), 462 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 5b689e0e69a9..cee3cfc844d6 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,5 @@ +jetty-12.0.3-SNAPSHOT + jetty-12.0.2 - 09 October 2023 + 7408 Change scope of maven plugin dependencies + 9665 `HttpCookieStore` incorrectly rejects cookies for domains that are an diff --git a/build/build-resources/pom.xml b/build/build-resources/pom.xml index 4a342ec66f19..5815481b61a2 100644 --- a/build/build-resources/pom.xml +++ b/build/build-resources/pom.xml @@ -7,7 +7,7 @@ --> org.eclipse.jetty build-resources - 12.0.2 + 12.0.3-SNAPSHOT Build :: Resources jar diff --git a/build/pom.xml b/build/pom.xml index f8a5c49b6539..2b3f7aba1c0a 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml index fc8f058de2ea..99886d7ddc3a 100644 --- a/documentation/jetty-asciidoctor-extensions/pom.xml +++ b/documentation/jetty-asciidoctor-extensions/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.documentation documentation - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index 5ea04d365591..23549b550606 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.documentation documentation - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/documentation/pom.xml b/documentation/pom.xml index 8ede8458e3d5..e5a4a2d93fcb 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/javadoc/pom.xml b/javadoc/pom.xml index 25e0e9c4aa7c..88eb5ae17a2b 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml index f767ea286c20..d2dee0c2f109 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-alpn-client diff --git a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index 103b86a85f0a..6b44105c7973 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index 02f3232e9f05..f7322f090a6e 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml index af8b430b6214..5066dbbbcf81 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml index 7cb00b0f2541..a309491de345 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml index d72db936608d..878129ea2243 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-alpn-server diff --git a/jetty-core/jetty-alpn/pom.xml b/jetty-core/jetty-alpn/pom.xml index 6197e534e55c..f725b3fbe187 100644 --- a/jetty-core/jetty-alpn/pom.xml +++ b/jetty-core/jetty-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-alpn diff --git a/jetty-core/jetty-bom/pom.xml b/jetty-core/jetty-bom/pom.xml index 98b2e1f75ac9..b9ca06c31c00 100644 --- a/jetty-core/jetty-bom/pom.xml +++ b/jetty-core/jetty-bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT jetty-bom @@ -42,277 +42,277 @@ org.eclipse.jetty jetty-alpn-client - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-alpn-conscrypt-client - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-alpn-conscrypt-server - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-alpn-java-client - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-alpn-java-server - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-alpn-server - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-client - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-deploy - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-http - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-http-spi - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-http-tools - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-io - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-jmx - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-jndi - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-keystore - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-openid - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-osgi - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-proxy - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-rewrite - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-server - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-session - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-slf4j-impl - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-start - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-security - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-unixdomain-server - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-util - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-util-ajax - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty jetty-xml - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.demos jetty-demo-handler - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.fcgi jetty-fcgi-client - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.fcgi jetty-fcgi-proxy - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.fcgi jetty-fcgi-server - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.http2 jetty-http2-client - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.http2 jetty-http2-client-transport - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.http2 jetty-http2-common - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.http2 jetty-http2-hpack - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.http2 jetty-http2-server - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.http3 jetty-http3-client - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.http3 jetty-http3-client-transport - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.http3 jetty-http3-common - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.http3 jetty-http3-qpack - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.http3 jetty-http3-server - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.quic jetty-quic-client - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.quic jetty-quic-common - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.quic jetty-quic-quiche-common - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.quic jetty-quic-quiche-foreign-incubator - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.quic jetty-quic-quiche-jna - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.quic jetty-quic-server - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.websocket jetty-websocket-core-client - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.websocket jetty-websocket-core-common - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.websocket jetty-websocket-core-server - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.websocket jetty-websocket-jetty-api - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.websocket jetty-websocket-jetty-client - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.websocket jetty-websocket-jetty-common - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.websocket jetty-websocket-jetty-server - 12.0.2 + 12.0.3-SNAPSHOT diff --git a/jetty-core/jetty-client/pom.xml b/jetty-core/jetty-client/pom.xml index bc3c0ab3dc90..be5f5dc20d30 100644 --- a/jetty-core/jetty-client/pom.xml +++ b/jetty-core/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-demos/jetty-demo-handler/pom.xml b/jetty-core/jetty-demos/jetty-demo-handler/pom.xml index e6ce7f669f41..d58de904da3b 100644 --- a/jetty-core/jetty-demos/jetty-demo-handler/pom.xml +++ b/jetty-core/jetty-demos/jetty-demo-handler/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos jetty-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-demo-handler diff --git a/jetty-core/jetty-demos/pom.xml b/jetty-core/jetty-demos/pom.xml index 846689b89e3b..b1e1bfe49740 100644 --- a/jetty-core/jetty-demos/pom.xml +++ b/jetty-core/jetty-demos/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-deploy/pom.xml b/jetty-core/jetty-deploy/pom.xml index 223104c0da7d..8fabf1761e84 100644 --- a/jetty-core/jetty-deploy/pom.xml +++ b/jetty-core/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml index 1022d70b6e09..5a6c97cde7b5 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml +++ b/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi jetty-fcgi - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml index 5fea6c3f3e7f..dd3316a7718f 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml +++ b/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi jetty-fcgi - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml index 555fb26ab391..d198df5730f6 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml +++ b/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi jetty-fcgi - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-fcgi/pom.xml b/jetty-core/jetty-fcgi/pom.xml index 9c57290ac311..b3f390c585f3 100644 --- a/jetty-core/jetty-fcgi/pom.xml +++ b/jetty-core/jetty-fcgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-http-spi/pom.xml b/jetty-core/jetty-http-spi/pom.xml index 200c158cb584..ba9acc4c722f 100644 --- a/jetty-core/jetty-http-spi/pom.xml +++ b/jetty-core/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-http-spi diff --git a/jetty-core/jetty-http-tools/pom.xml b/jetty-core/jetty-http-tools/pom.xml index 60ec942285b7..9103673036d1 100644 --- a/jetty-core/jetty-http-tools/pom.xml +++ b/jetty-core/jetty-http-tools/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-http/pom.xml b/jetty-core/jetty-http/pom.xml index 21a45247cc95..413f5230248b 100644 --- a/jetty-core/jetty-http/pom.xml +++ b/jetty-core/jetty-http/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml b/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml index d2edc20ecda0..f784d87f9827 100644 --- a/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 jetty-http2 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-http2/jetty-http2-client/pom.xml b/jetty-core/jetty-http2/jetty-http2-client/pom.xml index 100d13655dd2..d9928bd96b14 100644 --- a/jetty-core/jetty-http2/jetty-http2-client/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 jetty-http2 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-http2/jetty-http2-common/pom.xml b/jetty-core/jetty-http2/jetty-http2-common/pom.xml index fe71d5177fc7..f7ced365911d 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 jetty-http2 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml b/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml index 1c32194b3588..2becbf25f2a4 100644 --- a/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 jetty-http2 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-http2/jetty-http2-server/pom.xml b/jetty-core/jetty-http2/jetty-http2-server/pom.xml index bd11dd64c2c6..35c5a2c94309 100644 --- a/jetty-core/jetty-http2/jetty-http2-server/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 jetty-http2 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-http2/jetty-http2-tests/pom.xml b/jetty-core/jetty-http2/jetty-http2-tests/pom.xml index 458ebf1cd539..b10576f55bb0 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 jetty-http2 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-http2/pom.xml b/jetty-core/jetty-http2/pom.xml index 1d8caf9039ff..abd2c4605d4f 100644 --- a/jetty-core/jetty-http2/pom.xml +++ b/jetty-core/jetty-http2/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml b/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml index cca14b0baf48..25923c37b822 100644 --- a/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 jetty-http3 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-http3/jetty-http3-client/pom.xml b/jetty-core/jetty-http3/jetty-http3-client/pom.xml index 61080bb7f4a3..778d1ff16339 100644 --- a/jetty-core/jetty-http3/jetty-http3-client/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 jetty-http3 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-http3/jetty-http3-common/pom.xml b/jetty-core/jetty-http3/jetty-http3-common/pom.xml index e283c82f3655..55f0c99eb47b 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 jetty-http3 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml b/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml index 65a531005520..51d5e1f9f56b 100644 --- a/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 jetty-http3 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-http3/jetty-http3-server/pom.xml b/jetty-core/jetty-http3/jetty-http3-server/pom.xml index 81ab13b0be44..cb3fd0a957ac 100644 --- a/jetty-core/jetty-http3/jetty-http3-server/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 jetty-http3 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-http3/jetty-http3-tests/pom.xml b/jetty-core/jetty-http3/jetty-http3-tests/pom.xml index 7465412c7ac2..435563a682fc 100644 --- a/jetty-core/jetty-http3/jetty-http3-tests/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 jetty-http3 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-http3/pom.xml b/jetty-core/jetty-http3/pom.xml index 7b59427b2cb3..46725fd358ad 100644 --- a/jetty-core/jetty-http3/pom.xml +++ b/jetty-core/jetty-http3/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-io/pom.xml b/jetty-core/jetty-io/pom.xml index 8dcc4592ac05..f5e0437168cb 100644 --- a/jetty-core/jetty-io/pom.xml +++ b/jetty-core/jetty-io/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-io diff --git a/jetty-core/jetty-jmx/pom.xml b/jetty-core/jetty-jmx/pom.xml index 3bb3aa2061de..2075162946c8 100644 --- a/jetty-core/jetty-jmx/pom.xml +++ b/jetty-core/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-jmx diff --git a/jetty-core/jetty-jndi/pom.xml b/jetty-core/jetty-jndi/pom.xml index c96d26f8db27..5a1e6eb4696a 100644 --- a/jetty-core/jetty-jndi/pom.xml +++ b/jetty-core/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-keystore/pom.xml b/jetty-core/jetty-keystore/pom.xml index 30dc1cfe3af4..3488b52c9d29 100644 --- a/jetty-core/jetty-keystore/pom.xml +++ b/jetty-core/jetty-keystore/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-keystore diff --git a/jetty-core/jetty-openid/pom.xml b/jetty-core/jetty-openid/pom.xml index c146e9e67392..d5aa9de26021 100644 --- a/jetty-core/jetty-openid/pom.xml +++ b/jetty-core/jetty-openid/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-osgi/pom.xml b/jetty-core/jetty-osgi/pom.xml index faff4310322a..e5ac3bf1d75d 100644 --- a/jetty-core/jetty-osgi/pom.xml +++ b/jetty-core/jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-proxy/pom.xml b/jetty-core/jetty-proxy/pom.xml index 7f4db554b737..be0db49cf2ef 100644 --- a/jetty-core/jetty-proxy/pom.xml +++ b/jetty-core/jetty-proxy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-quic/jetty-quic-client/pom.xml b/jetty-core/jetty-quic/jetty-quic-client/pom.xml index d9f91ece1e19..3dea38b4ac7d 100644 --- a/jetty-core/jetty-quic/jetty-quic-client/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic jetty-quic - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-quic/jetty-quic-common/pom.xml b/jetty-core/jetty-quic/jetty-quic-common/pom.xml index bf9b60224e2e..1cab0d45f102 100644 --- a/jetty-core/jetty-quic/jetty-quic-common/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic jetty-quic - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml index 21c7de7a71ee..863499bd3420 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic jetty-quic-quiche - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml index e4a0f0cfdf69..6c6677971bba 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic jetty-quic-quiche - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/pom.xml index 0eff777e8ab0..884f7f6924b8 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic jetty-quic-quiche - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/pom.xml index ebe1941924ea..43620591f577 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic jetty-quic - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-quic/jetty-quic-server/pom.xml b/jetty-core/jetty-quic/jetty-quic-server/pom.xml index 02934354432f..58878e6ae611 100644 --- a/jetty-core/jetty-quic/jetty-quic-server/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic jetty-quic - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-quic/pom.xml b/jetty-core/jetty-quic/pom.xml index 8c1a18143f44..f44fdedc90db 100644 --- a/jetty-core/jetty-quic/pom.xml +++ b/jetty-core/jetty-quic/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-rewrite/pom.xml b/jetty-core/jetty-rewrite/pom.xml index 4f45d2de7332..67736b73f558 100644 --- a/jetty-core/jetty-rewrite/pom.xml +++ b/jetty-core/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-security/pom.xml b/jetty-core/jetty-security/pom.xml index 8768bd0036d4..bb84e2283ec6 100644 --- a/jetty-core/jetty-security/pom.xml +++ b/jetty-core/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-server/pom.xml b/jetty-core/jetty-server/pom.xml index d56f9fa79404..1891ea1defbb 100644 --- a/jetty-core/jetty-server/pom.xml +++ b/jetty-core/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-session/pom.xml b/jetty-core/jetty-session/pom.xml index 1d24fbf923ed..45c6957bde2e 100644 --- a/jetty-core/jetty-session/pom.xml +++ b/jetty-core/jetty-session/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-slf4j-impl/pom.xml b/jetty-core/jetty-slf4j-impl/pom.xml index 6d2a0c0dd6d0..08456b7e5894 100644 --- a/jetty-core/jetty-slf4j-impl/pom.xml +++ b/jetty-core/jetty-slf4j-impl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-start/pom.xml b/jetty-core/jetty-start/pom.xml index cc0e74f43628..c1616015ae00 100644 --- a/jetty-core/jetty-start/pom.xml +++ b/jetty-core/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-start diff --git a/jetty-core/jetty-tests/jetty-test-client-transports/pom.xml b/jetty-core/jetty-tests/jetty-test-client-transports/pom.xml index 76cb15c13838..7f27ee952451 100644 --- a/jetty-core/jetty-tests/jetty-test-client-transports/pom.xml +++ b/jetty-core/jetty-tests/jetty-test-client-transports/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-tests/pom.xml b/jetty-core/jetty-tests/pom.xml index 0431dc7245b1..54b480c21672 100644 --- a/jetty-core/jetty-tests/pom.xml +++ b/jetty-core/jetty-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-unixdomain-server/pom.xml b/jetty-core/jetty-unixdomain-server/pom.xml index ef5a716676fe..4e8f3ddf5f1d 100644 --- a/jetty-core/jetty-unixdomain-server/pom.xml +++ b/jetty-core/jetty-unixdomain-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-util-ajax/pom.xml b/jetty-core/jetty-util-ajax/pom.xml index 694be881f930..bff31fda19ef 100644 --- a/jetty-core/jetty-util-ajax/pom.xml +++ b/jetty-core/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-util-ajax diff --git a/jetty-core/jetty-util/pom.xml b/jetty-core/jetty-util/pom.xml index b23460e75e8f..762a2b847cbc 100644 --- a/jetty-core/jetty-util/pom.xml +++ b/jetty-core/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-util diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml index ce6a492b0a29..f519d973e17b 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml index 1851a4b6772c..16ba14292479 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml index f25d54098808..a87e774b1a0e 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml index 2d3a1239b6f9..9385bdd779f2 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml index d8f5d633f095..084b323c5a13 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml index 31bffe4aca73..9126268bcb42 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml index 4cdabd8c8e03..edc2569a593f 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml index bdf52863a2a1..2b636eba9521 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml index 5b06919cdc02..54de7fb41119 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket jetty-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-websocket/pom.xml b/jetty-core/jetty-websocket/pom.xml index 5ebc0265e917..d8ce92f3486a 100644 --- a/jetty-core/jetty-websocket/pom.xml +++ b/jetty-core/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-core/jetty-xml/pom.xml b/jetty-core/jetty-xml/pom.xml index afe95b7198ed..280226b59eed 100644 --- a/jetty-core/jetty-xml/pom.xml +++ b/jetty-core/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-core - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-xml diff --git a/jetty-core/pom.xml b/jetty-core/pom.xml index 6523b5b68e99..f9ce0b8b4440 100644 --- a/jetty-core/pom.xml +++ b/jetty-core/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-annotations/pom.xml b/jetty-ee10/jetty-ee10-annotations/pom.xml index 8fedb5c0200c..d97bc63c2384 100644 --- a/jetty-ee10/jetty-ee10-annotations/pom.xml +++ b/jetty-ee10/jetty-ee10-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-apache-jsp/pom.xml b/jetty-ee10/jetty-ee10-apache-jsp/pom.xml index 1a9a635de430..02a6886b78e1 100644 --- a/jetty-ee10/jetty-ee10-apache-jsp/pom.xml +++ b/jetty-ee10/jetty-ee10-apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-bom/pom.xml b/jetty-ee10/jetty-ee10-bom/pom.xml index f2d8f790c59e..976cfeefa25b 100644 --- a/jetty-ee10/jetty-ee10-bom/pom.xml +++ b/jetty-ee10/jetty-ee10-bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-bom @@ -43,132 +43,132 @@ org.eclipse.jetty.ee10 jetty-ee10-annotations - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10 jetty-ee10-apache-jsp - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10 jetty-ee10-cdi - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10 jetty-ee10-fcgi-proxy - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10 jetty-ee10-glassfish-jstl - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10 jetty-ee10-jaspi - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10 jetty-ee10-jndi - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10 jetty-ee10-jspc-maven-plugin - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10 jetty-ee10-maven-plugin - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10 jetty-ee10-plus - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10 jetty-ee10-proxy - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10 jetty-ee10-quickstart - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10 jetty-ee10-runner - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10 jetty-ee10-servlets - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10 jetty-ee10-webapp - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10.osgi jetty-ee10-osgi-alpn - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10.osgi jetty-ee10-osgi-boot - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10.osgi jetty-ee10-osgi-boot-jsp - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-jakarta-client - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-jakarta-client-webapp - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-jakarta-common - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-jakarta-server - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-jetty-client-webapp - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-jetty-server - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-servlet - 12.0.2 + 12.0.3-SNAPSHOT diff --git a/jetty-ee10/jetty-ee10-cdi/pom.xml b/jetty-ee10/jetty-ee10-cdi/pom.xml index 20ae120c020b..259319c661ba 100644 --- a/jetty-ee10/jetty-ee10-cdi/pom.xml +++ b/jetty-ee10/jetty-ee10-cdi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee10-cdi diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml index b35741cf2098..e2a6c6724a74 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml index 104dda002e38..68735b180d88 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml index 8589a923c426..c2dd417e8616 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml index c660e2092a07..06d83da355c9 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml index a82dc1afbac3..9bf84ab9e7f4 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee10-demo-embedded diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml index 282b4c677019..415be50809b1 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-demo-jaas-webapp EE10 :: Demo :: JAAS WebApp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/pom.xml index ac8875684d41..cce91a4c96d9 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee10-demo-jetty-webapp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml index f2be19ad7b19..dbee8fcaece9 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-demo-jndi-webapp EE10 :: Demo :: JNDI WebApp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml index 0e13e6bb268f..6dc9e8cb706a 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml index cf96aa341588..95b95c541e3b 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2 + 12.0.3-SNAPSHOT EE10 :: Demo :: Mock Resources jetty-ee10-demo-mock-resources diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml index f43981684f78..d9df25db1ca2 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee10-demo-proxy-webapp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-simple-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-simple-webapp/pom.xml index 852f8e5276e1..abfbe40009f3 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-simple-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-simple-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml index d48109e165db..3de439ac436e 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2 + 12.0.3-SNAPSHOT ../../pom.xml jetty-ee10-demo-container-initializer diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml index f98406a287bb..aedcc125b3cc 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2 + 12.0.3-SNAPSHOT ../../pom.xml EE10 :: Demo :: Servlet Spec :: WebApp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml index 65f4fcccc2a4..39fc3bc47ea3 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2 + 12.0.3-SNAPSHOT ../../pom.xml diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/pom.xml index 3dbc9cb45167..c57b6f8d5318 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2 + 12.0.3-SNAPSHOT EE10 :: Demo :: Servlet Spec jetty-ee10-demo-spec diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/pom.xml index 1ba423c291e4..d2a62638796e 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-demos/pom.xml b/jetty-ee10/jetty-ee10-demos/pom.xml index f336fd27d51a..d28208ae0373 100644 --- a/jetty-ee10/jetty-ee10-demos/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-examples/pom.xml b/jetty-ee10/jetty-ee10-examples/pom.xml index 5d1f8f83de70..df7eaba3f6f4 100644 --- a/jetty-ee10/jetty-ee10-examples/pom.xml +++ b/jetty-ee10/jetty-ee10-examples/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml b/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml index b91c6af1ff05..a10a72aa0e27 100644 --- a/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml +++ b/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml b/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml index 5e3d8b4b6371..99f7fb878dce 100644 --- a/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml +++ b/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee10-glassfish-jstl diff --git a/jetty-ee10/jetty-ee10-home/pom.xml b/jetty-ee10/jetty-ee10-home/pom.xml index 821eb6fce840..315a51fd1969 100644 --- a/jetty-ee10/jetty-ee10-home/pom.xml +++ b/jetty-ee10/jetty-ee10-home/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-ee10/jetty-ee10-jaspi/pom.xml b/jetty-ee10/jetty-ee10-jaspi/pom.xml index 80cb7fe6ceff..03563af3b667 100644 --- a/jetty-ee10/jetty-ee10-jaspi/pom.xml +++ b/jetty-ee10/jetty-ee10-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-jndi/pom.xml b/jetty-ee10/jetty-ee10-jndi/pom.xml index 3844ee048587..23464c15a9bb 100644 --- a/jetty-ee10/jetty-ee10-jndi/pom.xml +++ b/jetty-ee10/jetty-ee10-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml b/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml index 2d2f0f9afe5f..b10048bad51b 100644 --- a/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml +++ b/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee10-jspc-maven-plugin diff --git a/jetty-ee10/jetty-ee10-maven-plugin/pom.xml b/jetty-ee10/jetty-ee10-maven-plugin/pom.xml index 445e49eee11a..956ba6a836ff 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/pom.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-alpn/pom.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-alpn/pom.xml index f421c65230fa..a7874ee4f822 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-alpn/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi - 12.0.2 + 12.0.3-SNAPSHOT diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml index 8660871a9163..a302589b4fdf 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee10-osgi-boot-jsp diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml index 1ba8c64cfed9..a3f742e1cac0 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee10-osgi-boot diff --git a/jetty-ee10/jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/pom.xml index d0ea84562a75..5efd7e819e46 100644 --- a/jetty-ee10/jetty-ee10-osgi/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml index 598ed328a725..c308821bbd7b 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 test-jetty-ee10-osgi-fragment diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml index c8e36c5feaa1..3701d94c3b50 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 test-jetty-ee10-osgi-server diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml index 6b6974995247..49d23a952833 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 test-jetty-ee10-osgi-webapp-resources diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml index fee7c05f685e..5612a85248cc 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 test-jetty-ee10-osgi diff --git a/jetty-ee10/jetty-ee10-plus/pom.xml b/jetty-ee10/jetty-ee10-plus/pom.xml index d5a324845767..6033b45be506 100644 --- a/jetty-ee10/jetty-ee10-plus/pom.xml +++ b/jetty-ee10/jetty-ee10-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-proxy/pom.xml b/jetty-ee10/jetty-ee10-proxy/pom.xml index c7945b89f46a..95373dffe49b 100644 --- a/jetty-ee10/jetty-ee10-proxy/pom.xml +++ b/jetty-ee10/jetty-ee10-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-quickstart/pom.xml b/jetty-ee10/jetty-ee10-quickstart/pom.xml index 3b45c51f9678..4c9c322b8f75 100644 --- a/jetty-ee10/jetty-ee10-quickstart/pom.xml +++ b/jetty-ee10/jetty-ee10-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-runner/pom.xml b/jetty-ee10/jetty-ee10-runner/pom.xml index 6b51a82073c9..82ecc3112909 100644 --- a/jetty-ee10/jetty-ee10-runner/pom.xml +++ b/jetty-ee10/jetty-ee10-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee10-runner diff --git a/jetty-ee10/jetty-ee10-servlet/pom.xml b/jetty-ee10/jetty-ee10-servlet/pom.xml index aee35429b2df..fde865234e4f 100644 --- a/jetty-ee10/jetty-ee10-servlet/pom.xml +++ b/jetty-ee10/jetty-ee10-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-servlets/pom.xml b/jetty-ee10/jetty-ee10-servlets/pom.xml index ba06891f4433..6cd3b81805ec 100644 --- a/jetty-ee10/jetty-ee10-servlets/pom.xml +++ b/jetty-ee10/jetty-ee10-servlets/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-bad-websocket-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-bad-websocket-webapp/pom.xml index 8c2f0f312bed..39a5e261f30d 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-bad-websocket-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-bad-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-badinit-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-badinit-webapp/pom.xml index 523a047f2bc0..5fec35497784 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-badinit-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-badinit-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-test-badinit-webapp diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi-common-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi-common-webapp/pom.xml index b47439c47ac9..cffd2add4414 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi-common-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi-common-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/pom.xml index 63a495c7a240..68245e7077c6 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/pom.xml index 2261b2bbf8e3..eb286e40f4af 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-felix-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-felix-webapp/pom.xml index 71af26bf6bd5..15d881099f59 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-felix-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-felix-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml index 369588e886dd..b2d72018c657 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml index dc487f0ade10..2a8f6a595acb 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee10-test-integration diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp-it/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp-it/pom.xml index ffc697031ca2..795204e0a971 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp-it/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp-it/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-jmx - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee10-jmx-webapp-it diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp/pom.xml index 0fd0f91752ba..89a6fbd223e8 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-jmx - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-jmx-webapp war diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/pom.xml index 417ad6b82aea..3c4e4b6a8ac9 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee10-test-jmx diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jndi/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jndi/pom.xml index b431533de74c..6f4e847e8390 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jndi/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jndi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT ../pom.xml diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-loginservice/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-loginservice/pom.xml index 060ca9ef9f4e..fe38a4a319a8 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-loginservice/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-loginservice/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-test-loginservice EE10 :: Tests :: Login Service diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-openid-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-openid-webapp/pom.xml index 33e6cd712240..f8505eec02d3 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-openid-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-openid-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-owb-cdi-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-owb-cdi-webapp/pom.xml index b4c87c2f3cdc..173960ff8e19 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-owb-cdi-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-owb-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-quickstart/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-quickstart/pom.xml index 844443714bc4..d947ca5b2894 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-quickstart/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-quickstart/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee10-test-quickstart diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml index 491f6f30815a..be9a9eac873f 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-sessions - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-test-sessions-common EE10 :: Tests :: Sessions :: Common diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-file/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-file/pom.xml index 6ee08fa0708b..cca6e9b18b25 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-file/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-file/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-sessions - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-test-sessions-file EE10 :: Tests :: Sessions :: File diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-gcloud/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-gcloud/pom.xml index 43d2b2e9142b..3a9ea8e912f1 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-gcloud/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-gcloud/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-sessions - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-test-sessions-gcloud EE10 :: Tests :: Sessions :: GCloud diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-hazelcast/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-hazelcast/pom.xml index 04e2c8f74f9a..777bc56791fe 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-hazelcast/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-hazelcast/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-sessions - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-test-sessions-hazelcast EE10 :: Tests :: Sessions :: Hazelcast diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml index 04927ede60cd..2698484dfcaa 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-sessions - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-test-sessions-infinispan EE10 :: Tests :: Sessions :: Infinispan diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-jdbc/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-jdbc/pom.xml index c53e963dcbee..da3a0ea48ed5 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-jdbc/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-jdbc/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-sessions - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-test-sessions-jdbc EE10 :: Tests :: Sessions :: JDBC diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-memcached/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-memcached/pom.xml index 6c20569eb6a2..eb40a31ed12f 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-memcached/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-memcached/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-sessions - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-test-sessions-memcached EE10 :: Tests :: Sessions :: Memcached diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-mongodb/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-mongodb/pom.xml index 42a9769db80a..7af35af25d46 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-mongodb/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-mongodb/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-test-sessions - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-test-sessions-mongodb EE10 :: Tests :: Sessions :: Mongo diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/pom.xml index 53118afc5528..0ee4263dedf7 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-test-sessions EE10 :: Tests :: Sessions diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-simple-session-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-simple-session-webapp/pom.xml index 3ae0766e8bd5..bd1db2b391bc 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-simple-session-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-simple-session-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-test-simple-session-webapp diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-webapp-rfc2616/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-webapp-rfc2616/pom.xml index c98552e8f143..33dce3bc4e3d 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-webapp-rfc2616/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-webapp-rfc2616/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee10-test-webapp-rfc2616 EE10 :: Tests :: RFC2616 WebApp diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/pom.xml index 31b05255fe8f..e47ec525e567 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-webapp/pom.xml index 05ced258ecbe..c91dc9da70bb 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-webapp/pom.xml index 443f63486596..66d53cf44843 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-weld-cdi-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-weld-cdi-webapp/pom.xml index a3f222a73df7..de2d5f6074d5 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-weld-cdi-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-weld-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-tests/pom.xml b/jetty-ee10/jetty-ee10-tests/pom.xml index 8fb582a21a85..e271148bd01f 100644 --- a/jetty-ee10/jetty-ee10-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT ../pom.xml diff --git a/jetty-ee10/jetty-ee10-webapp/pom.xml b/jetty-ee10/jetty-ee10-webapp/pom.xml index e59c34fe5751..fd16eb641269 100644 --- a/jetty-ee10/jetty-ee10-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml index 13415954ba46..13cbba5c15f7 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml index ca06497dd227..19e8f7bb605a 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml index 7cf904579a55..b4ab7c3a7e19 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml index edb952f5a92c..8771ed30022e 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml index 40ed6cf5266b..5e2a020a7e9a 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml index c342c84b2df1..b1b64e8a93e7 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml index e97a3d6b32da..a89db268c34d 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml index 217fc9d89eea..6d2bb69fb50c 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml index 2561b089cf2a..d7f539a8292d 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/jetty-ee10-websocket/pom.xml b/jetty-ee10/jetty-ee10-websocket/pom.xml index 3c7918993d38..d3746bcb3840 100644 --- a/jetty-ee10/jetty-ee10-websocket/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee10 jetty-ee10 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee10/pom.xml b/jetty-ee10/pom.xml index b3521728afa4..7f1aa34eed40 100644 --- a/jetty-ee10/pom.xml +++ b/jetty-ee10/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-annotations/pom.xml b/jetty-ee8/jetty-ee8-annotations/pom.xml index c1f6ddbadab0..ca8c82a060ed 100644 --- a/jetty-ee8/jetty-ee8-annotations/pom.xml +++ b/jetty-ee8/jetty-ee8-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-apache-jsp/pom.xml b/jetty-ee8/jetty-ee8-apache-jsp/pom.xml index b6ac29f37bdb..8d1b48ab9a60 100644 --- a/jetty-ee8/jetty-ee8-apache-jsp/pom.xml +++ b/jetty-ee8/jetty-ee8-apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-bom/pom.xml b/jetty-ee8/jetty-ee8-bom/pom.xml index 107538bef946..a259f29bd0b3 100644 --- a/jetty-ee8/jetty-ee8-bom/pom.xml +++ b/jetty-ee8/jetty-ee8-bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee8-bom @@ -43,117 +43,117 @@ org.eclipse.jetty.ee8 jetty-ee8-annotations - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8 jetty-ee8-apache-jsp - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8 jetty-ee8-glassfish-jstl - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8 jetty-ee8-jndi - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8 jetty-ee8-nested - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8 jetty-ee8-openid - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8 jetty-ee8-plus - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8 jetty-ee8-proxy - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8 jetty-ee8-quickstart - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8 jetty-ee8-security - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8 jetty-ee8-servlet - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8 jetty-ee8-servlets - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8 jetty-ee8-webapp - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-javax-client - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-javax-client-webapp - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-javax-common - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-javax-server - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-jetty-api - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-jetty-client - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-jetty-client-webapp - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-jetty-common - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-jetty-server - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-servlet - 12.0.2 + 12.0.3-SNAPSHOT diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-jar/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-jar/pom.xml index 4347f1c4f6dc..904319779c3a 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-jar/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-jar/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demo-async-rest - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-server/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-server/pom.xml index 025c2cf797a4..d8ba53fca9d4 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-server/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demo-async-rest - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/pom.xml index d23de737f770..96435bcedd95 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demo-async-rest - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/pom.xml index cacfd83ed6a8..d8b25175bd1e 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/pom.xml index b364258444b7..5af6cd8111b2 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee8-demo-jaas-webapp EE8 :: Demo :: JAAS WebApp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/pom.xml index 24d62bafcd2f..a219041f4611 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee8-demo-jetty-webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/pom.xml index 791b36ae51b0..a976e2dd945c 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee8-demo-jndi-webapp EE8 :: Demo :: JNDI WebApp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jsp-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jsp-webapp/pom.xml index 9ee740a1dbcb..28699f31c956 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jsp-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jsp-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/pom.xml index 88d0c0862dae..beffcc38967c 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2 + 12.0.3-SNAPSHOT EE8 :: Demo :: Mock Resources jetty-ee8-demo-mock-resources diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/pom.xml index 89093675caba..fe9df35b4fd6 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee8-demo-proxy-webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-simple-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-simple-webapp/pom.xml index e95dfd8f7228..3dad68c56a90 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-simple-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-simple-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-container-initializer/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-container-initializer/pom.xml index ecb9c13654a8..49ba1412a37c 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-container-initializer/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-container-initializer/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demo-spec - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee8-demo-container-initializer jar diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml index d9af7d6556ee..d21eeab4e105 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demo-spec - 12.0.2 + 12.0.3-SNAPSHOT EE8 :: Demo :: Servlet Spec :: WebApp jetty-ee8-demo-spec-webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-web-fragment/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-web-fragment/pom.xml index 5667aa327542..4c8a7ffe84b3 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-web-fragment/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-web-fragment/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demo-spec - 12.0.2 + 12.0.3-SNAPSHOT EE8 :: Demo :: Servlet Spec :: Fragment Jar diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/pom.xml index dc3da32bfb70..210b2f3fac1a 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demos - 12.0.2 + 12.0.3-SNAPSHOT EE8 :: Demo :: Servlet Spec jetty-ee8-demo-spec diff --git a/jetty-ee8/jetty-ee8-demos/pom.xml b/jetty-ee8/jetty-ee8-demos/pom.xml index d113f9465796..281d469cd9e7 100644 --- a/jetty-ee8/jetty-ee8-demos/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml b/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml index 8ef500415276..aab1712c8ff5 100644 --- a/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml +++ b/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee8-glassfish-jstl diff --git a/jetty-ee8/jetty-ee8-home/pom.xml b/jetty-ee8/jetty-ee8-home/pom.xml index ef330d18c447..891c35b05460 100644 --- a/jetty-ee8/jetty-ee8-home/pom.xml +++ b/jetty-ee8/jetty-ee8-home/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee8-home diff --git a/jetty-ee8/jetty-ee8-jaspi/pom.xml b/jetty-ee8/jetty-ee8-jaspi/pom.xml index 7673b4e9665f..ade86a2d4713 100644 --- a/jetty-ee8/jetty-ee8-jaspi/pom.xml +++ b/jetty-ee8/jetty-ee8-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-jndi/pom.xml b/jetty-ee8/jetty-ee8-jndi/pom.xml index 99a4257374f1..2bcb1b48e467 100644 --- a/jetty-ee8/jetty-ee8-jndi/pom.xml +++ b/jetty-ee8/jetty-ee8-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml b/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml index 2573ca4fbfe1..4bbcfbb55515 100644 --- a/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml +++ b/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee8-jspc-maven-plugin diff --git a/jetty-ee8/jetty-ee8-maven-plugin/pom.xml b/jetty-ee8/jetty-ee8-maven-plugin/pom.xml index 91361d598b2f..c05fc8aab599 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/pom.xml +++ b/jetty-ee8/jetty-ee8-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee8-maven-plugin diff --git a/jetty-ee8/jetty-ee8-nested/pom.xml b/jetty-ee8/jetty-ee8-nested/pom.xml index 7041c60e3f3c..c42a83231997 100644 --- a/jetty-ee8/jetty-ee8-nested/pom.xml +++ b/jetty-ee8/jetty-ee8-nested/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-openid/pom.xml b/jetty-ee8/jetty-ee8-openid/pom.xml index 00eca66853b7..323171fd2a24 100644 --- a/jetty-ee8/jetty-ee8-openid/pom.xml +++ b/jetty-ee8/jetty-ee8-openid/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-plus/pom.xml b/jetty-ee8/jetty-ee8-plus/pom.xml index 9c481da3c891..4e7b5911fb90 100644 --- a/jetty-ee8/jetty-ee8-plus/pom.xml +++ b/jetty-ee8/jetty-ee8-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-proxy/pom.xml b/jetty-ee8/jetty-ee8-proxy/pom.xml index be79eb21fb96..4d024766f3d8 100644 --- a/jetty-ee8/jetty-ee8-proxy/pom.xml +++ b/jetty-ee8/jetty-ee8-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-quickstart/pom.xml b/jetty-ee8/jetty-ee8-quickstart/pom.xml index 7b849ca6c94d..1a590fe47283 100644 --- a/jetty-ee8/jetty-ee8-quickstart/pom.xml +++ b/jetty-ee8/jetty-ee8-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-security/pom.xml b/jetty-ee8/jetty-ee8-security/pom.xml index e122073e3040..33ea8024012e 100644 --- a/jetty-ee8/jetty-ee8-security/pom.xml +++ b/jetty-ee8/jetty-ee8-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-servlet/pom.xml b/jetty-ee8/jetty-ee8-servlet/pom.xml index 54f8cc177aa6..44ce98dc8e3f 100644 --- a/jetty-ee8/jetty-ee8-servlet/pom.xml +++ b/jetty-ee8/jetty-ee8-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-servlets/pom.xml b/jetty-ee8/jetty-ee8-servlets/pom.xml index 574cf989a3c8..26b4c2f81906 100644 --- a/jetty-ee8/jetty-ee8-servlets/pom.xml +++ b/jetty-ee8/jetty-ee8-servlets/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-webapp/pom.xml b/jetty-ee8/jetty-ee8-webapp/pom.xml index 553c112eaef6..95be0e8df412 100644 --- a/jetty-ee8/jetty-ee8-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml index 1bf0e02f4876..bbd1924ac142 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2 + 12.0.3-SNAPSHOT ../pom.xml diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml index ba5ef548c47b..f69c3860f46b 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2 + 12.0.3-SNAPSHOT ../pom.xml diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml index 129d4709749a..47808afffb5c 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml index 299388b1337f..469428e5a22e 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml index ae8ff36d99fd..976608facbb5 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml index 80474c8136c7..301465e96501 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml index 7805692669af..cf9e1843552f 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml index 2fb860c587c9..b847c88e54b9 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml index 5c45e3188073..b0b74e91dfde 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml index bdb45370565c..572da497761c 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml index 1f6efc83aaed..391a221b332b 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml index e5bba44535d2..4d66a02f6189 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee8/jetty-ee8-websocket/pom.xml b/jetty-ee8/jetty-ee8-websocket/pom.xml index 21cee7fd0d51..91d15e6b6ba7 100644 --- a/jetty-ee8/jetty-ee8-websocket/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee8 jetty-ee8 - 12.0.2 + 12.0.3-SNAPSHOT ../pom.xml diff --git a/jetty-ee8/pom.xml b/jetty-ee8/pom.xml index d83ec2f601ea..aae28ab0bc16 100644 --- a/jetty-ee8/pom.xml +++ b/jetty-ee8/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-annotations/pom.xml b/jetty-ee9/jetty-ee9-annotations/pom.xml index a69958534e5e..a2966b741282 100644 --- a/jetty-ee9/jetty-ee9-annotations/pom.xml +++ b/jetty-ee9/jetty-ee9-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-apache-jsp/pom.xml b/jetty-ee9/jetty-ee9-apache-jsp/pom.xml index e21972d997d3..1eb7d7135a3b 100644 --- a/jetty-ee9/jetty-ee9-apache-jsp/pom.xml +++ b/jetty-ee9/jetty-ee9-apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-bom/pom.xml b/jetty-ee9/jetty-ee9-bom/pom.xml index 50f4037d2794..f0bd9f88f531 100644 --- a/jetty-ee9/jetty-ee9-bom/pom.xml +++ b/jetty-ee9/jetty-ee9-bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee9-bom @@ -43,147 +43,147 @@ org.eclipse.jetty.ee9 jetty-ee9-annotations - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9 jetty-ee9-apache-jsp - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9 jetty-ee9-cdi - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9 jetty-ee9-fcgi-proxy - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9 jetty-ee9-glassfish-jstl - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9 jetty-ee9-jaspi - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9 jetty-ee9-jndi - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9 jetty-ee9-nested - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9 jetty-ee9-openid - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9 jetty-ee9-plus - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9 jetty-ee9-proxy - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9 jetty-ee9-quickstart - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9 jetty-ee9-runner - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9 jetty-ee9-security - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9 jetty-ee9-servlet - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9 jetty-ee9-servlets - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9 jetty-ee9-webapp - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9.osgi jetty-ee9-osgi-boot - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9.osgi jetty-ee9-osgi-boot-jsp - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-client - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-client-webapp - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-common - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-server - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jetty-api - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jetty-client - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jetty-client-webapp - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jetty-common - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jetty-server - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-servlet - 12.0.2 + 12.0.3-SNAPSHOT diff --git a/jetty-ee9/jetty-ee9-cdi/pom.xml b/jetty-ee9/jetty-ee9-cdi/pom.xml index b05c62faa6b5..fc407b9cc5f2 100644 --- a/jetty-ee9/jetty-ee9-cdi/pom.xml +++ b/jetty-ee9/jetty-ee9-cdi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee9-cdi diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-jar/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-jar/pom.xml index 8281c04977a1..3749953aeda3 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-jar/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-jar/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demo-async-rest - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-server/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-server/pom.xml index 4de9c9dcc2da..f619d7903ffa 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-server/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demo-async-rest - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/pom.xml index 888eed294d7e..4b543911a24d 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demo-async-rest - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/pom.xml index bd4326b7f13c..05c60914ca41 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml index c9707f5a9cd5..cf99a90c29ed 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee9-demo-embedded diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/pom.xml index fdd7e35fa87b..1d84017a0678 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee9-demo-jaas-webapp EE9 :: Demo :: JAAS WebApp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/pom.xml index ae876bc49b52..c8bafbe8a1a8 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee9-demo-jetty-webapp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/pom.xml index 71c8b247e292..cf8ef310a6e0 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee9-demo-jndi-webapp EE9 :: Demo :: JNDI WebApp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/pom.xml index 955370d2e58e..785302e4b16f 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/pom.xml index d973e0f6f67c..f4ee0ad83bc6 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2 + 12.0.3-SNAPSHOT EE9 :: Demo :: Mock Resources jetty-ee9-demo-mock-resources diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml index ee93bf6d767d..a049b605bd1b 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee9-demo-proxy-webapp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-simple-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-simple-webapp/pom.xml index e8cdfa93002f..9e73f3659f31 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-simple-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-simple-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer/pom.xml index 5efc5af05043..ef34d634fc69 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2 + 12.0.3-SNAPSHOT ../../pom.xml jetty-ee9-demo-container-initializer diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml index f98a3a72909a..79e2adf72074 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2 + 12.0.3-SNAPSHOT ../../pom.xml EE9 :: Demo :: Servlet Spec :: WebApp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment/pom.xml index 2f0de93ecfa3..8474f10717a4 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2 + 12.0.3-SNAPSHOT ../../pom.xml diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/pom.xml index 1ed55a36aee1..48dcf2d4dd19 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2 + 12.0.3-SNAPSHOT EE9 :: Demo :: Servlet Spec jetty-ee9-demo-spec diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/pom.xml index 46fffe2f6f51..88714baa2878 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demos - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-demos/pom.xml b/jetty-ee9/jetty-ee9-demos/pom.xml index d8edc3c4bb1e..c9cc33793550 100644 --- a/jetty-ee9/jetty-ee9-demos/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml b/jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml index 9bbbc5c568ee..f1cccff7f059 100644 --- a/jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml +++ b/jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml b/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml index 436f04acfbd3..0fac6191c472 100644 --- a/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml +++ b/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee9-glassfish-jstl diff --git a/jetty-ee9/jetty-ee9-home/pom.xml b/jetty-ee9/jetty-ee9-home/pom.xml index 3825b0689580..1250447ba644 100644 --- a/jetty-ee9/jetty-ee9-home/pom.xml +++ b/jetty-ee9/jetty-ee9-home/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee9-home diff --git a/jetty-ee9/jetty-ee9-jaspi/pom.xml b/jetty-ee9/jetty-ee9-jaspi/pom.xml index e4c2f3751d24..08305370fc14 100644 --- a/jetty-ee9/jetty-ee9-jaspi/pom.xml +++ b/jetty-ee9/jetty-ee9-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-jndi/pom.xml b/jetty-ee9/jetty-ee9-jndi/pom.xml index 93aa75df3f1b..b12437507b82 100644 --- a/jetty-ee9/jetty-ee9-jndi/pom.xml +++ b/jetty-ee9/jetty-ee9-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml b/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml index f6396622e515..103e3d104bc6 100644 --- a/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml +++ b/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee9-jspc-maven-plugin diff --git a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml index a3265024fc1c..313a188cde03 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml +++ b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee9-maven-plugin diff --git a/jetty-ee9/jetty-ee9-nested/pom.xml b/jetty-ee9/jetty-ee9-nested/pom.xml index c394aaa3bb5e..32b37ccffeaf 100644 --- a/jetty-ee9/jetty-ee9-nested/pom.xml +++ b/jetty-ee9/jetty-ee9-nested/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-openid/pom.xml b/jetty-ee9/jetty-ee9-openid/pom.xml index e62202274a49..4b9cd993093e 100644 --- a/jetty-ee9/jetty-ee9-openid/pom.xml +++ b/jetty-ee9/jetty-ee9-openid/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml index 2157a36f0e19..14e4144a6e2f 100644 --- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.osgi jetty-ee9-osgi - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee9-osgi-boot-jsp diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml index 9d84b035c314..765220c6ffe1 100644 --- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.osgi jetty-ee9-osgi - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee9-osgi-boot diff --git a/jetty-ee9/jetty-ee9-osgi/pom.xml b/jetty-ee9/jetty-ee9-osgi/pom.xml index f9abb5e84b44..1caa6b108950 100644 --- a/jetty-ee9/jetty-ee9-osgi/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-fragment/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-fragment/pom.xml index 82d4ff712d6e..9cceab838325 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-fragment/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-fragment/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.osgi jetty-ee9-osgi - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 test-jetty-ee9-osgi-fragment diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-server/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-server/pom.xml index 45e7314c96d7..2fb39532639c 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-server/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.osgi jetty-ee9-osgi - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 test-jetty-ee9-osgi-server diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-webapp-resources/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-webapp-resources/pom.xml index df08588e3257..ede854c0511a 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-webapp-resources/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-webapp-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.osgi jetty-ee9-osgi - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 test-jetty-ee9-osgi-webapp-resources diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml index 136aaea82e04..45bc5ff67671 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9.osgi jetty-ee9-osgi - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 test-jetty-ee9-osgi diff --git a/jetty-ee9/jetty-ee9-plus/pom.xml b/jetty-ee9/jetty-ee9-plus/pom.xml index 080f2ae96873..ba7a1ca23664 100644 --- a/jetty-ee9/jetty-ee9-plus/pom.xml +++ b/jetty-ee9/jetty-ee9-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-proxy/pom.xml b/jetty-ee9/jetty-ee9-proxy/pom.xml index 6e09a70f858a..77ec0681f086 100644 --- a/jetty-ee9/jetty-ee9-proxy/pom.xml +++ b/jetty-ee9/jetty-ee9-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-quickstart/pom.xml b/jetty-ee9/jetty-ee9-quickstart/pom.xml index 963b3c058fa7..20e02edaf00b 100644 --- a/jetty-ee9/jetty-ee9-quickstart/pom.xml +++ b/jetty-ee9/jetty-ee9-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-runner/pom.xml b/jetty-ee9/jetty-ee9-runner/pom.xml index 9408c7a521dc..9be1dd096999 100644 --- a/jetty-ee9/jetty-ee9-runner/pom.xml +++ b/jetty-ee9/jetty-ee9-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee9-runner diff --git a/jetty-ee9/jetty-ee9-security/pom.xml b/jetty-ee9/jetty-ee9-security/pom.xml index 63ef6eaa354c..2ef2f204f4cd 100644 --- a/jetty-ee9/jetty-ee9-security/pom.xml +++ b/jetty-ee9/jetty-ee9-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-servlet/pom.xml b/jetty-ee9/jetty-ee9-servlet/pom.xml index 7ada4b1a4795..f36fcc01dc6f 100644 --- a/jetty-ee9/jetty-ee9-servlet/pom.xml +++ b/jetty-ee9/jetty-ee9-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-servlets/pom.xml b/jetty-ee9/jetty-ee9-servlets/pom.xml index 2abd3b04f74a..326afcb94d6e 100644 --- a/jetty-ee9/jetty-ee9-servlets/pom.xml +++ b/jetty-ee9/jetty-ee9-servlets/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-bad-websocket-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-bad-websocket-webapp/pom.xml index 86e1dcb41e8e..582f67110368 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-bad-websocket-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-bad-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/pom.xml index cc2cec3fd731..7b79c2fd8d7f 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee9-test-badinit-webapp diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi-common-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi-common-webapp/pom.xml index 0c0a06f53a32..13e6ecc9cea9 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi-common-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi-common-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/pom.xml index 7aec21efe00c..bccb5438146c 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-client-transports/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-client-transports/pom.xml index 496de8f0eb40..87bad34df7e0 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-client-transports/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-client-transports/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-felix-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-felix-webapp/pom.xml index 52a3fb8439c7..27f22158f628 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-felix-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-felix-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml index f4f676cca5d2..46e465b35b22 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml index 27869707a6b1..2e94568cb5eb 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee9-test-integration diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp-it/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp-it/pom.xml index f709e154902e..f5dae81a4e22 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp-it/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp-it/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-jmx - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee9-jmx-webapp-it diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp/pom.xml index af63099293f4..d1e9a20afdb4 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-jmx - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee9-jmx-webapp war diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/pom.xml index fc105ede30f4..41c7590080ab 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee9-test-jmx diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jndi/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jndi/pom.xml index da7c2dbae243..33d25ed44256 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jndi/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jndi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-loginservice/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-loginservice/pom.xml index 104b8e80922e..697c8c0708dd 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-loginservice/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-loginservice/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee9-test-loginservice EE9 :: Tests :: Login Service diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-openid-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-openid-webapp/pom.xml index 2f7f9ce665b6..675c7a8fae1f 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-openid-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-openid-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/pom.xml index aa3fe939a0c5..c09250d72424 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml index 9216aeedcc4f..8add51195b4f 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-ee9-test-quickstart diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml index 434fc2574a07..d1b04f26c92a 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-sessions - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee9-test-sessions-common EE9 :: Tests :: Sessions :: Common diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-file/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-file/pom.xml index e0037a2ae25e..7264097c87f0 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-file/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-file/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-sessions - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee9-test-sessions-file EE9 :: Tests :: Sessions :: File diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-gcloud/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-gcloud/pom.xml index e3dafb91e133..e5625745152e 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-gcloud/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-gcloud/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-sessions - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee9-test-sessions-gcloud EE9 :: Tests :: Sessions :: GCloud diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-hazelcast/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-hazelcast/pom.xml index 9188da936cd9..bc2a24678c3e 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-hazelcast/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-hazelcast/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-sessions - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee9-test-sessions-hazelcast EE9 :: Tests :: Sessions :: Hazelcast diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml index 1fc61954cb8d..e375be805704 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-sessions - 12.0.2 + 12.0.3-SNAPSHOT ../pom.xml jetty-ee9-test-sessions-infinispan diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-jdbc/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-jdbc/pom.xml index 79d33ec1d9ef..1bd25f268a02 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-jdbc/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-jdbc/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-sessions - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee9-test-sessions-jdbc EE9 :: Tests :: Sessions :: JDBC diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-memcached/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-memcached/pom.xml index cfb1f7a788bb..04de285071a3 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-memcached/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-memcached/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-sessions - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee9-test-sessions-memcached EE9 :: Tests :: Sessions :: Memcached diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-mongodb/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-mongodb/pom.xml index 2e6286c8ec42..542530a1212b 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-mongodb/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-mongodb/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-test-sessions - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee9-test-sessions-mongodb EE9 :: Tests :: Sessions :: Mongo diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/pom.xml index eba4825b97d1..ae6c46d3d6f7 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee9-test-sessions EE9 :: Tests :: Sessions diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-simple-session-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-simple-session-webapp/pom.xml index 009d36f55704..58f5ec565a82 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-simple-session-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-simple-session-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee9-test-simple-session-webapp diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-webapp-rfc2616/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-webapp-rfc2616/pom.xml index ad3310e72ed6..74fdb2629b9c 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-webapp-rfc2616/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-webapp-rfc2616/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT jetty-ee9-test-webapp-rfc2616 EE9 :: Tests :: RFC2616 WebApp diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-provided-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-provided-webapp/pom.xml index 52447e671c1a..4330a877f06c 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-provided-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-provided-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-webapp/pom.xml index 899ae62da662..bc7a1bb6f70d 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-webapp/pom.xml index 48cdd7b3317f..cdee008ecd55 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-weld-cdi-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-weld-cdi-webapp/pom.xml index 727c2444dc72..c6909aec6117 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-weld-cdi-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-weld-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9-tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-tests/pom.xml b/jetty-ee9/jetty-ee9-tests/pom.xml index 0169504917df..17089fa3946e 100644 --- a/jetty-ee9/jetty-ee9-tests/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-webapp/pom.xml b/jetty-ee9/jetty-ee9-webapp/pom.xml index b3daaae62cc1..db656d456637 100644 --- a/jetty-ee9/jetty-ee9-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/pom.xml index 8a59c865d500..f30fa845b247 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2 + 12.0.3-SNAPSHOT ../pom.xml diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml index 6da6809540b9..5d1c24c25d32 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2 + 12.0.3-SNAPSHOT ../pom.xml diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml index 1cfda1cea23a..a6632f89b399 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/pom.xml index 0c01d27c9c9e..3f37c774236e 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/pom.xml index af5f464029e8..2350b4383b97 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-api/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-api/pom.xml index 10fc76ab0c9c..725a278473fe 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-api/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-api/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml index 6ac5124a4e23..410b53ae5855 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml index 2dbe19b02c69..1107e2920b6e 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml index d5cb4aed7b2a..e09ce502980b 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/pom.xml index 14691923e471..a0b7d56be02b 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml index 622271fe090b..767fbd35505d 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml index 8d4d04e890c2..7305bf4d1e9c 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-ee9/jetty-ee9-websocket/pom.xml b/jetty-ee9/jetty-ee9-websocket/pom.xml index c157e815ddda..b42b32bfc004 100644 --- a/jetty-ee9/jetty-ee9-websocket/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.ee9 jetty-ee9 - 12.0.2 + 12.0.3-SNAPSHOT ../pom.xml diff --git a/jetty-ee9/pom.xml b/jetty-ee9/pom.xml index 854f5dc3204b..5795a4baf99a 100644 --- a/jetty-ee9/pom.xml +++ b/jetty-ee9/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index d7dc50fade68..450eea5b8dd5 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 12.0.2 + 12.0.3-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index 2d4ee7218934..6e4c3a4bddd1 100644 --- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.gcloud jetty-gcloud - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-integrations/jetty-gcloud/pom.xml b/jetty-integrations/jetty-gcloud/pom.xml index e82997da0e98..d911da0ea49d 100644 --- a/jetty-integrations/jetty-gcloud/pom.xml +++ b/jetty-integrations/jetty-gcloud/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-integrations - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-integrations/jetty-hazelcast/pom.xml b/jetty-integrations/jetty-hazelcast/pom.xml index b272b8e7c042..8330db1983c9 100644 --- a/jetty-integrations/jetty-hazelcast/pom.xml +++ b/jetty-integrations/jetty-hazelcast/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-integrations - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml index 0a15df20ab9a..02f46aff0b38 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-infinispan - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-infinispan-common diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml index c891533f56c1..9fe2b9c3fdbf 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-infinispan - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-infinispan-embedded-query diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml index 9778a7c6ca3e..9ab9ec7086c8 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-infinispan - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-infinispan-embedded diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml index a8275faab511..0f4b361f2f2c 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-infinispan - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-infinispan-remote-query diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml index 32089423b188..a79af41fa1b5 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-infinispan - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-infinispan-remote diff --git a/jetty-integrations/jetty-infinispan/pom.xml b/jetty-integrations/jetty-infinispan/pom.xml index 26d1a8f2491e..a9f807c774db 100644 --- a/jetty-integrations/jetty-infinispan/pom.xml +++ b/jetty-integrations/jetty-infinispan/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-integrations - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml index 1b2859870967..2bb909fd59e0 100644 --- a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml +++ b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.memcached jetty-memcached - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-integrations/jetty-memcached/pom.xml b/jetty-integrations/jetty-memcached/pom.xml index 08762c5dbd9e..0af19eb0d916 100644 --- a/jetty-integrations/jetty-memcached/pom.xml +++ b/jetty-integrations/jetty-memcached/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-integrations - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/jetty-integrations/jetty-nosql/pom.xml b/jetty-integrations/jetty-nosql/pom.xml index 8a79b894cccf..c160d81702f8 100644 --- a/jetty-integrations/jetty-nosql/pom.xml +++ b/jetty-integrations/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-integrations - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 jetty-nosql diff --git a/jetty-integrations/pom.xml b/jetty-integrations/pom.xml index 96996c879ad4..b04f3c472afd 100644 --- a/jetty-integrations/pom.xml +++ b/jetty-integrations/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index d23157c7f6f9..6a47fc226296 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty jetty-project - 12.0.2 + 12.0.3-SNAPSHOT Jetty :: Project The Eclipse Jetty Project pom diff --git a/tests/jetty-home-tester/pom.xml b/tests/jetty-home-tester/pom.xml index b55e1d4df0cb..35bdcf1e272a 100644 --- a/tests/jetty-home-tester/pom.xml +++ b/tests/jetty-home-tester/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index 0e2439e81c6a..f05747b00c70 100644 --- a/tests/jetty-jmh/pom.xml +++ b/tests/jetty-jmh/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/tests/jetty-test-session-common/pom.xml b/tests/jetty-test-session-common/pom.xml index 263d671b9b41..cbfb60586b9c 100644 --- a/tests/jetty-test-session-common/pom.xml +++ b/tests/jetty-test-session-common/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/tests/pom.xml b/tests/pom.xml index e67ffa0715c5..6ba3a4ff033b 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 12.0.2 + 12.0.3-SNAPSHOT org.eclipse.jetty.tests tests diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 6cc3f50b592f..158412b237fb 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/tests/test-distribution/test-distribution-common/pom.xml b/tests/test-distribution/test-distribution-common/pom.xml index c1ac07a861b3..0f126c1e46fc 100644 --- a/tests/test-distribution/test-distribution-common/pom.xml +++ b/tests/test-distribution/test-distribution-common/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests test-distribution - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/tests/test-distribution/test-ee10-distribution/pom.xml b/tests/test-distribution/test-ee10-distribution/pom.xml index 5d12e2e98c06..c680c06e05f2 100644 --- a/tests/test-distribution/test-ee10-distribution/pom.xml +++ b/tests/test-distribution/test-ee10-distribution/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests test-distribution - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/tests/test-distribution/test-ee9-distribution/pom.xml b/tests/test-distribution/test-ee9-distribution/pom.xml index 66fab1dc8ed1..fc8782340246 100644 --- a/tests/test-distribution/test-ee9-distribution/pom.xml +++ b/tests/test-distribution/test-ee9-distribution/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests test-distribution - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 3a9ab360e3d6..43e0c2986296 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests - 12.0.2 + 12.0.3-SNAPSHOT 4.0.0 test-integration From 5cff7930e526ef0ea4fe80db11cd784681a79a36 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 10 Oct 2023 07:37:58 -0500 Subject: [PATCH 26/31] Updating for CVEs --- VERSION.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 2e02f1ed0aad..1aac3c855957 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -6,7 +6,7 @@ jetty-10.0.17 - 09 October 2023 + 10473 Startup Script reports `ok` too fast, and doesn't wait for actual start of Jetty + 10547 Cannot customize Executor on WebSocketClient - + 10679 Review HTTP/2 rate control + + 10679 Review HTTP/2 rate control (CVE-2023-44487) jetty-10.0.16 - 25 August 2023 + 6140 Report total number of keys in SelectorManager @@ -29,6 +29,7 @@ jetty-10.0.16 - 25 August 2023 common location + 9682 RetainableByteBuffer buffer release bug in WebSocket + 9685 Jetty doesn't set the date header on error responses + + 9749 Correct HPACK Integer Overflow (CVE-2023-36478) + 9720 Http2Session.streamIdleTimeout should permit being disabled from AbstractHTTP2ServerConnectionFactory + 9772 Improve Quiche certificates deployment From 102c24cb2eb754865b173dc5736e7a277f8735eb Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 10 Oct 2023 07:39:41 -0500 Subject: [PATCH 27/31] Updating for CVEs --- VERSION.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 05640013cc81..f183cc278398 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -7,7 +7,7 @@ jetty-11.0.17 - 09 October 2023 + 10473 Startup Script reports `ok` too fast, and doesn't wait for actual start of Jetty + 10547 Cannot customize Executor on WebSocketClient - + 10679 Review HTTP/2 rate control + + 10679 Review HTTP/2 rate control (CVE-2023-44487) jetty-11.0.16 - 25 August 2023 + 6140 Report total number of keys in SelectorManager @@ -32,6 +32,7 @@ jetty-11.0.16 - 25 August 2023 + 9685 Jetty doesn't set the date header on error responses + 9720 Http2Session.streamIdleTimeout should permit being disabled from AbstractHTTP2ServerConnectionFactory + + 9749 Correct HPACK Integer Overflow (CVE-2023-36478) + 9772 Improve Quiche certificates deployment + 9777 CrossOriginFilter does not return Vary header on no-cors mode + 9795 http3-server is leaking the Jetty logging service to web applications From 95b29d5f09e0846bc4e0f1d225dfaad68fd5cc61 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 10 Oct 2023 07:40:57 -0500 Subject: [PATCH 28/31] Updating for CVEs --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index cee3cfc844d6..e34b8807709b 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -38,7 +38,7 @@ jetty-12.0.2 - 09 October 2023 + 10558 NPE when forwarding a request to default servlet which should redirect to a subdirectory with trailing slash + 10665 Wrong BREE in Jetty jars - + 10679 Review HTTP/2 rate control + + 10679 Review HTTP/2 rate control (CVE-2023-44487) jetty-12.0.1 - 29 August 2023 + 8926 HttpClient GZIPContentDecoder should remove Content-Length and From 9275d2acca889b22d6b63375a55bfcd432b74644 Mon Sep 17 00:00:00 2001 From: Ludovic Orban Date: Mon, 9 Oct 2023 15:04:03 +0200 Subject: [PATCH 29/31] Made tests relying on TestForbiddenMethodsEventsHandler not flaky Signed-off-by: Ludovic Orban --- .../client/transport/EventsHandlerTest.java | 47 +++++++++---------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/EventsHandlerTest.java b/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/EventsHandlerTest.java index 8be557d400bf..90b0c8b095ba 100644 --- a/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/EventsHandlerTest.java +++ b/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/EventsHandlerTest.java @@ -43,11 +43,15 @@ import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.both; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.lessThan; +import static org.hamcrest.Matchers.lessThanOrEqualTo; +import static org.junit.jupiter.api.Assertions.fail; public class EventsHandlerTest extends AbstractTest { @@ -210,19 +214,24 @@ public void testUsingEventsResponseAsContentSourceFails(Transport transport) thr .send(); assertThat(response.getStatus(), is(200)); - int events = switch (transport) + switch (transport) { - // Two reads, two writes, two writes complete. - case HTTP -> 10; - case HTTPS -> 10; - case FCGI -> 10; - case UNIX_DOMAIN -> 10; - // One read, one write, one write complete. - case H2 -> 7; - case H2C -> 7; - case H3 -> 7; - }; - await().atMost(1, TimeUnit.SECONDS).until(eventsHandler.exceptions::size, is(4 * events)); + // Two reads, maybe one null read, two writes, two writes complete. + case HTTP: + case HTTPS: + case FCGI: + case UNIX_DOMAIN: + await().atMost(5, TimeUnit.SECONDS).until(() -> eventsHandler.exceptions.size() / 4, allOf(greaterThanOrEqualTo(10), lessThanOrEqualTo(11))); + break; + // One read, maybe one null read, one write, one write complete. + case H2: + case H2C: + case H3: + await().atMost(5, TimeUnit.SECONDS).until(() -> eventsHandler.exceptions.size() / 4, allOf(greaterThanOrEqualTo(7), lessThanOrEqualTo(8))); + break; + default: + fail("Missing assertion for transport " + transport); + } } @ParameterizedTest @@ -249,19 +258,7 @@ public void testUsingEventsResponseAsContentSourceFailsWithTrailers(Transport tr assertThat(latch.await(5, TimeUnit.SECONDS), is(true)); assertThat(status.get(), is(200)); - int events = switch (transport) - { - // Reads return data, trailers. - case HTTP -> 10; - case HTTPS -> 10; - case FCGI -> 10; - case UNIX_DOMAIN -> 10; - // Reads return data, null, trailers. - case H2 -> 11; - case H2C -> 11; - case H3 -> 11; - }; - await().atMost(1, TimeUnit.SECONDS).until(eventsHandler.exceptions::size, is(4 * events)); + await().atMost(5, TimeUnit.SECONDS).until(() -> eventsHandler.exceptions.size() / 4, allOf(greaterThanOrEqualTo(10), lessThanOrEqualTo(12))); } @ParameterizedTest From 2585f467588dec83290f291994abf9bd14125936 Mon Sep 17 00:00:00 2001 From: Ludovic Orban Date: Tue, 10 Oct 2023 13:19:34 +0200 Subject: [PATCH 30/31] Updated GPG key Signed-off-by: Ludovic Orban --- KEYS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KEYS.txt b/KEYS.txt index a06df399e97f..80957e942554 100644 --- a/KEYS.txt +++ b/KEYS.txt @@ -6,4 +6,4 @@ Joakim Erdfelt B59B 67FD 7904 9843 67F9 3180 0818 Joakim Erdfelt BFBB 21C2 46D7 7768 3628 7A48 A04E 0C74 ABB3 5FEA Simone Bordet 8B09 6546 B1A8 F026 56B1 5D3B 1677 D141 BCF3 584D Olivier Lamy F254 B356 17DC 255D 9344 BCFA 873A 8E86 B437 2146 -Ludovic Orban E224 88CC 94F6 3E3F C928 536C 4241 C082 70D9 99C3 +Ludovic Orban CD38 A1DA DA34 13BE 96DF 547F 3D14 6A4A 1C58 367E From fcc88274a4e95eca39639ebfae0e1d5213a1a7e3 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 12 Oct 2023 03:51:36 +0200 Subject: [PATCH 31/31] Jetty 12.0.x use automatic formatter for poms to have same style for every poms (#10578) * apply spotless sort pom --------- Signed-off-by: Olivier Lamy --- .mvn/maven-build-cache-config.xml | 6 +- build/build-resources/pom.xml | 53 +- build/pom.xml | 14 +- .../jetty-asciidoctor-extensions/pom.xml | 6 +- documentation/jetty-documentation/pom.xml | 578 ++-- documentation/pom.xml | 6 +- javadoc/pom.xml | 490 ++- .../jetty-alpn/jetty-alpn-client/pom.xml | 33 +- .../jetty-alpn-conscrypt-client/pom.xml | 12 +- .../jetty-alpn-conscrypt-server/pom.xml | 24 +- .../jetty-alpn/jetty-alpn-java-client/pom.xml | 48 +- .../jetty-alpn/jetty-alpn-java-server/pom.xml | 58 +- .../jetty-alpn/jetty-alpn-server/pom.xml | 33 +- jetty-core/jetty-alpn/pom.xml | 7 +- jetty-core/jetty-bom/pom.xml | 63 +- jetty-core/jetty-client/pom.xml | 149 +- .../jetty-demos/jetty-demo-handler/pom.xml | 34 +- jetty-core/jetty-demos/pom.xml | 4 +- jetty-core/jetty-deploy/pom.xml | 51 +- .../jetty-fcgi/jetty-fcgi-client/pom.xml | 12 +- .../jetty-fcgi/jetty-fcgi-proxy/pom.xml | 44 +- .../jetty-fcgi/jetty-fcgi-server/pom.xml | 52 +- jetty-core/jetty-fcgi/pom.xml | 6 +- jetty-core/jetty-http-spi/pom.xml | 43 +- jetty-core/jetty-http-tools/pom.xml | 4 +- jetty-core/jetty-http/pom.xml | 20 +- .../jetty-http2-client-transport/pom.xml | 12 +- .../jetty-http2/jetty-http2-client/pom.xml | 38 +- .../jetty-http2/jetty-http2-common/pom.xml | 16 +- .../jetty-http2/jetty-http2-hpack/pom.xml | 54 +- .../jetty-http2/jetty-http2-server/pom.xml | 12 +- .../jetty-http2/jetty-http2-tests/pom.xml | 116 +- jetty-core/jetty-http2/pom.xml | 6 +- .../jetty-http3-client-transport/pom.xml | 12 +- .../jetty-http3/jetty-http3-client/pom.xml | 20 +- .../jetty-http3/jetty-http3-common/pom.xml | 20 +- .../jetty-http3/jetty-http3-qpack/pom.xml | 54 +- .../jetty-http3/jetty-http3-server/pom.xml | 4 +- .../jetty-http3/jetty-http3-tests/pom.xml | 42 +- jetty-core/jetty-http3/pom.xml | 10 +- jetty-core/jetty-io/pom.xml | 46 +- jetty-core/jetty-jmx/pom.xml | 35 +- jetty-core/jetty-jndi/pom.xml | 45 +- jetty-core/jetty-keystore/pom.xml | 10 +- jetty-core/jetty-openid/pom.xml | 55 +- jetty-core/jetty-osgi/pom.xml | 67 +- jetty-core/jetty-proxy/pom.xml | 52 +- .../jetty-quic/jetty-quic-client/pom.xml | 30 +- .../jetty-quic/jetty-quic-common/pom.xml | 14 +- .../jetty-quic-quiche-common/pom.xml | 12 +- .../pom.xml | 50 +- .../jetty-quic-quiche-jna/pom.xml | 20 +- .../jetty-quic/jetty-quic-quiche/pom.xml | 6 +- .../jetty-quic/jetty-quic-server/pom.xml | 12 +- jetty-core/jetty-quic/pom.xml | 8 +- jetty-core/jetty-rewrite/pom.xml | 11 +- jetty-core/jetty-security/pom.xml | 47 +- jetty-core/jetty-server/pom.xml | 57 +- jetty-core/jetty-session/pom.xml | 75 +- jetty-core/jetty-slf4j-impl/pom.xml | 61 +- jetty-core/jetty-start/pom.xml | 87 +- .../jetty-test-client-transports/pom.xml | 26 +- jetty-core/jetty-tests/pom.xml | 14 +- jetty-core/jetty-unixdomain-server/pom.xml | 4 +- jetty-core/jetty-util-ajax/pom.xml | 3 +- jetty-core/jetty-util/pom.xml | 111 +- .../jetty-websocket-core-client/pom.xml | 12 +- .../jetty-websocket-core-common/pom.xml | 16 +- .../jetty-websocket-core-server/pom.xml | 12 +- .../jetty-websocket-core-tests/pom.xml | 42 +- .../jetty-websocket-jetty-api/pom.xml | 4 +- .../jetty-websocket-jetty-client/pom.xml | 16 +- .../jetty-websocket-jetty-common/pom.xml | 42 +- .../jetty-websocket-jetty-server/pom.xml | 4 +- .../jetty-websocket-jetty-tests/pom.xml | 49 +- jetty-core/jetty-websocket/pom.xml | 4 +- jetty-core/jetty-xml/pom.xml | 48 +- jetty-core/pom.xml | 16 +- jetty-ee10/jetty-ee10-annotations/pom.xml | 86 +- jetty-ee10/jetty-ee10-apache-jsp/pom.xml | 96 +- jetty-ee10/jetty-ee10-bom/pom.xml | 53 +- jetty-ee10/jetty-ee10-cdi/pom.xml | 23 +- .../jetty-ee10-demo-async-rest-jar/pom.xml | 5 +- .../jetty-ee10-demo-async-rest-server/pom.xml | 5 +- .../jetty-ee10-demo-async-rest-webapp/pom.xml | 13 +- .../jetty-ee10-demo-async-rest/pom.xml | 7 +- .../jetty-ee10-demo-embedded/pom.xml | 121 +- .../jetty-ee10-demo-jaas-webapp/pom.xml | 4 +- .../jetty-ee10-demo-jetty-webapp/pom.xml | 288 +- .../jetty-ee10-demo-jndi-webapp/pom.xml | 96 +- .../jetty-ee10-demo-jsp-webapp/pom.xml | 76 +- .../jetty-ee10-demo-mock-resources/pom.xml | 45 +- .../jetty-ee10-demo-proxy-webapp/pom.xml | 70 +- .../jetty-ee10-demo-simple-webapp/pom.xml | 6 +- .../pom.xml | 15 +- .../jetty-ee10-demo-spec-webapp/pom.xml | 296 +- .../jetty-ee10-demo-web-fragment/pom.xml | 5 +- .../jetty-ee10-demo-spec/pom.xml | 4 +- .../jetty-ee10-demo-template/pom.xml | 8 +- jetty-ee10/jetty-ee10-demos/pom.xml | 34 +- jetty-ee10/jetty-ee10-examples/pom.xml | 8 +- jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml | 22 +- jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml | 45 +- jetty-ee10/jetty-ee10-home/pom.xml | 766 +++-- jetty-ee10/jetty-ee10-jaspi/pom.xml | 61 +- jetty-ee10/jetty-ee10-jndi/pom.xml | 43 +- .../jetty-ee10-jspc-maven-plugin/pom.xml | 144 +- jetty-ee10/jetty-ee10-maven-plugin/pom.xml | 471 +-- .../jetty-ee10-osgi-alpn/pom.xml | 11 +- .../jetty-ee10-osgi-boot-jsp/pom.xml | 72 +- .../jetty-ee10-osgi-boot/pom.xml | 75 +- jetty-ee10/jetty-ee10-osgi/pom.xml | 27 +- .../test-jetty-ee10-osgi-fragment/pom.xml | 3 +- .../test-jetty-ee10-osgi-server/pom.xml | 9 +- .../pom.xml | 52 +- .../test-jetty-ee10-osgi/pom.xml | 585 ++-- jetty-ee10/jetty-ee10-plus/pom.xml | 67 +- jetty-ee10/jetty-ee10-proxy/pom.xml | 53 +- jetty-ee10/jetty-ee10-quickstart/pom.xml | 45 +- jetty-ee10/jetty-ee10-runner/pom.xml | 165 +- jetty-ee10/jetty-ee10-servlet/pom.xml | 62 +- jetty-ee10/jetty-ee10-servlets/pom.xml | 64 +- .../pom.xml | 14 +- .../jetty-ee10-test-cdi-common-webapp/pom.xml | 46 +- .../jetty-ee10-test-cdi/pom.xml | 40 +- .../jetty-ee10-test-client-transports/pom.xml | 136 +- .../jetty-ee10-test-felix-webapp/pom.xml | 32 +- .../jetty-ee10-test-http2-webapp/pom.xml | 102 +- .../jetty-ee10-test-integration/pom.xml | 160 +- .../jetty-ee10-jmx-webapp-it/pom.xml | 14 +- .../jetty-ee10-jmx-webapp/pom.xml | 14 +- .../jetty-ee10-test-jmx/pom.xml | 2 +- .../jetty-ee10-test-jndi/pom.xml | 16 +- .../jetty-ee10-test-loginservice/pom.xml | 40 +- .../jetty-ee10-test-openid-webapp/pom.xml | 12 +- .../jetty-ee10-test-owb-cdi-webapp/pom.xml | 42 +- .../jetty-ee10-test-quickstart/pom.xml | 62 +- .../jetty-ee10-test-sessions-common/pom.xml | 48 +- .../jetty-ee10-test-sessions-file/pom.xml | 22 +- .../jetty-ee10-test-sessions-gcloud/pom.xml | 34 +- .../pom.xml | 90 +- .../pom.xml | 104 +- .../jetty-ee10-test-sessions-jdbc/pom.xml | 66 +- .../pom.xml | 28 +- .../jetty-ee10-test-sessions-mongodb/pom.xml | 76 +- .../jetty-ee10-test-sessions/pom.xml | 30 +- .../jetty-ee10-test-webapp-rfc2616/pom.xml | 26 +- .../pom.xml | 12 +- .../pom.xml | 20 +- .../jetty-ee10-test-websocket-webapp/pom.xml | 20 +- .../jetty-ee10-test-weld-cdi-webapp/pom.xml | 32 +- jetty-ee10/jetty-ee10-tests/pom.xml | 34 +- jetty-ee10/jetty-ee10-webapp/pom.xml | 117 +- .../pom.xml | 24 +- .../pom.xml | 34 +- .../pom.xml | 62 +- .../pom.xml | 42 +- .../pom.xml | 38 +- .../pom.xml | 34 +- .../jetty-ee10-websocket-jetty-server/pom.xml | 38 +- .../jetty-ee10-websocket-jetty-tests/pom.xml | 41 +- .../jetty-ee10-websocket-servlet/pom.xml | 12 +- jetty-ee10/jetty-ee10-websocket/pom.xml | 14 +- jetty-ee10/pom.xml | 376 +-- jetty-ee8/jetty-ee8-annotations/pom.xml | 136 +- jetty-ee8/jetty-ee8-apache-jsp/pom.xml | 98 +- jetty-ee8/jetty-ee8-bom/pom.xml | 53 +- .../jetty-ee8-demo-async-rest-jar/pom.xml | 7 +- .../jetty-ee8-demo-async-rest-server/pom.xml | 7 +- .../jetty-ee8-demo-async-rest-webapp/pom.xml | 13 +- .../jetty-ee8-demo-async-rest/pom.xml | 7 +- .../jetty-ee8-demo-jaas-webapp/pom.xml | 4 +- .../jetty-ee8-demo-jetty-webapp/pom.xml | 282 +- .../jetty-ee8-demo-jndi-webapp/pom.xml | 158 +- .../jetty-ee8-demo-jsp-webapp/pom.xml | 78 +- .../jetty-ee8-demo-mock-resources/pom.xml | 47 +- .../jetty-ee8-demo-proxy-webapp/pom.xml | 80 +- .../jetty-ee8-demo-simple-webapp/pom.xml | 10 +- .../pom.xml | 17 +- .../jetty-ee8-demo-spec-webapp/pom.xml | 326 +- .../jetty-ee8-demo-web-fragment/pom.xml | 7 +- .../jetty-ee8-demo-spec/pom.xml | 4 +- jetty-ee8/jetty-ee8-demos/pom.xml | 42 +- jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml | 51 +- jetty-ee8/jetty-ee8-home/pom.xml | 746 +++-- jetty-ee8/jetty-ee8-jaspi/pom.xml | 89 +- jetty-ee8/jetty-ee8-jndi/pom.xml | 45 +- jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml | 140 +- jetty-ee8/jetty-ee8-maven-plugin/pom.xml | 389 +-- jetty-ee8/jetty-ee8-nested/pom.xml | 65 +- jetty-ee8/jetty-ee8-openid/pom.xml | 51 +- jetty-ee8/jetty-ee8-plus/pom.xml | 45 +- jetty-ee8/jetty-ee8-proxy/pom.xml | 57 +- jetty-ee8/jetty-ee8-quickstart/pom.xml | 47 +- jetty-ee8/jetty-ee8-security/pom.xml | 43 +- jetty-ee8/jetty-ee8-servlet/pom.xml | 64 +- jetty-ee8/jetty-ee8-servlets/pom.xml | 76 +- jetty-ee8/jetty-ee8-webapp/pom.xml | 111 +- .../pom.xml | 18 +- .../jetty-ee8-websocket-javax-client/pom.xml | 40 +- .../jetty-ee8-websocket-javax-common/pom.xml | 52 +- .../jetty-ee8-websocket-javax-server/pom.xml | 36 +- .../jetty-ee8-websocket-javax-tests/pom.xml | 40 +- .../jetty-ee8-websocket-jetty-api/pom.xml | 6 +- .../pom.xml | 36 +- .../jetty-ee8-websocket-jetty-client/pom.xml | 58 +- .../jetty-ee8-websocket-jetty-common/pom.xml | 54 +- .../jetty-ee8-websocket-jetty-server/pom.xml | 42 +- .../jetty-ee8-websocket-jetty-tests/pom.xml | 49 +- .../jetty-ee8-websocket-servlet/pom.xml | 14 +- jetty-ee8/jetty-ee8-websocket/pom.xml | 24 +- jetty-ee8/pom.xml | 534 ++-- jetty-ee9/jetty-ee9-annotations/pom.xml | 96 +- jetty-ee9/jetty-ee9-apache-jsp/pom.xml | 96 +- jetty-ee9/jetty-ee9-bom/pom.xml | 53 +- jetty-ee9/jetty-ee9-cdi/pom.xml | 23 +- .../jetty-ee9-demo-async-rest-jar/pom.xml | 5 +- .../jetty-ee9-demo-async-rest-server/pom.xml | 5 +- .../jetty-ee9-demo-async-rest-webapp/pom.xml | 13 +- .../jetty-ee9-demo-async-rest/pom.xml | 7 +- .../jetty-ee9-demo-embedded/pom.xml | 123 +- .../jetty-ee9-demo-jaas-webapp/pom.xml | 2 +- .../jetty-ee9-demo-jetty-webapp/pom.xml | 302 +- .../jetty-ee9-demo-jndi-webapp/pom.xml | 106 +- .../jetty-ee9-demo-jsp-webapp/pom.xml | 76 +- .../jetty-ee9-demo-mock-resources/pom.xml | 45 +- .../jetty-ee9-demo-proxy-webapp/pom.xml | 74 +- .../jetty-ee9-demo-simple-webapp/pom.xml | 6 +- .../pom.xml | 15 +- .../jetty-ee9-demo-spec-webapp/pom.xml | 244 +- .../jetty-ee9-demo-web-fragment/pom.xml | 5 +- .../jetty-ee9-demo-spec/pom.xml | 4 +- .../jetty-ee9-demo-template/pom.xml | 12 +- jetty-ee9/jetty-ee9-demos/pom.xml | 34 +- jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml | 22 +- jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml | 45 +- jetty-ee9/jetty-ee9-home/pom.xml | 785 +++-- jetty-ee9/jetty-ee9-jaspi/pom.xml | 55 +- jetty-ee9/jetty-ee9-jndi/pom.xml | 43 +- jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml | 144 +- jetty-ee9/jetty-ee9-maven-plugin/pom.xml | 453 +-- jetty-ee9/jetty-ee9-nested/pom.xml | 67 +- jetty-ee9/jetty-ee9-openid/pom.xml | 51 +- .../jetty-ee9-osgi-boot-jsp/pom.xml | 72 +- .../jetty-ee9-osgi-boot/pom.xml | 75 +- jetty-ee9/jetty-ee9-osgi/pom.xml | 27 +- .../test-jetty-ee9-osgi-fragment/pom.xml | 3 +- .../test-jetty-ee9-osgi-server/pom.xml | 9 +- .../pom.xml | 50 +- .../test-jetty-ee9-osgi/pom.xml | 589 ++-- jetty-ee9/jetty-ee9-plus/pom.xml | 51 +- jetty-ee9/jetty-ee9-proxy/pom.xml | 57 +- jetty-ee9/jetty-ee9-quickstart/pom.xml | 45 +- jetty-ee9/jetty-ee9-runner/pom.xml | 157 +- jetty-ee9/jetty-ee9-security/pom.xml | 49 +- jetty-ee9/jetty-ee9-servlet/pom.xml | 60 +- jetty-ee9/jetty-ee9-servlets/pom.xml | 76 +- .../pom.xml | 14 +- .../jetty-ee9-test-cdi-common-webapp/pom.xml | 46 +- .../jetty-ee9-test-cdi/pom.xml | 68 +- .../jetty-ee9-test-client-transports/pom.xml | 136 +- .../jetty-ee9-test-felix-webapp/pom.xml | 32 +- .../jetty-ee9-test-http2-webapp/pom.xml | 100 +- .../jetty-ee9-test-integration/pom.xml | 158 +- .../jetty-ee9-jmx-webapp-it/pom.xml | 14 +- .../jetty-ee9-jmx-webapp/pom.xml | 10 +- .../jetty-ee9-test-jmx/pom.xml | 2 +- .../jetty-ee9-test-jndi/pom.xml | 16 +- .../jetty-ee9-test-loginservice/pom.xml | 48 +- .../jetty-ee9-test-openid-webapp/pom.xml | 4 +- .../jetty-ee9-test-owb-cdi-webapp/pom.xml | 46 +- .../jetty-ee9-test-quickstart/pom.xml | 62 +- .../jetty-ee9-test-sessions-common/pom.xml | 46 +- .../jetty-ee9-test-sessions-file/pom.xml | 22 +- .../jetty-ee9-test-sessions-gcloud/pom.xml | 34 +- .../jetty-ee9-test-sessions-hazelcast/pom.xml | 90 +- .../pom.xml | 156 +- .../jetty-ee9-test-sessions-jdbc/pom.xml | 62 +- .../jetty-ee9-test-sessions-memcached/pom.xml | 28 +- .../jetty-ee9-test-sessions-mongodb/pom.xml | 76 +- .../jetty-ee9-test-sessions/pom.xml | 30 +- .../jetty-ee9-test-webapp-rfc2616/pom.xml | 26 +- .../pom.xml | 14 +- .../pom.xml | 12 +- .../jetty-ee9-test-websocket-webapp/pom.xml | 14 +- .../jetty-ee9-test-weld-cdi-webapp/pom.xml | 32 +- jetty-ee9/jetty-ee9-tests/pom.xml | 36 +- jetty-ee9/jetty-ee9-webapp/pom.xml | 115 +- .../pom.xml | 16 +- .../pom.xml | 38 +- .../pom.xml | 50 +- .../pom.xml | 34 +- .../jetty-ee9-websocket-jakarta-tests/pom.xml | 38 +- .../jetty-ee9-websocket-jetty-api/pom.xml | 4 +- .../pom.xml | 34 +- .../jetty-ee9-websocket-jetty-client/pom.xml | 20 +- .../jetty-ee9-websocket-jetty-common/pom.xml | 54 +- .../jetty-ee9-websocket-jetty-server/pom.xml | 40 +- .../jetty-ee9-websocket-jetty-tests/pom.xml | 55 +- .../jetty-ee9-websocket-servlet/pom.xml | 12 +- jetty-ee9/jetty-ee9-websocket/pom.xml | 18 +- jetty-ee9/pom.xml | 387 +-- jetty-home/pom.xml | 712 +++-- .../jetty-gcloud-session-manager/pom.xml | 82 +- jetty-integrations/jetty-gcloud/pom.xml | 12 +- jetty-integrations/jetty-hazelcast/pom.xml | 6 +- .../jetty-infinispan-common/pom.xml | 79 +- .../jetty-infinispan-embedded-query/pom.xml | 117 +- .../jetty-infinispan-embedded/pom.xml | 89 +- .../jetty-infinispan-remote-query/pom.xml | 153 +- .../jetty-infinispan-remote/pom.xml | 101 +- jetty-integrations/jetty-infinispan/pom.xml | 14 +- .../jetty-memcached-sessions/pom.xml | 20 +- jetty-integrations/jetty-memcached/pom.xml | 4 +- jetty-integrations/jetty-nosql/pom.xml | 17 +- jetty-integrations/pom.xml | 6 +- pom.xml | 2689 +++++++++-------- tests/jetty-home-tester/pom.xml | 59 +- tests/jetty-jmh/pom.xml | 127 +- tests/jetty-test-session-common/pom.xml | 103 +- tests/pom.xml | 16 +- tests/test-distribution/pom.xml | 73 +- .../test-distribution-common/pom.xml | 173 +- .../test-ee10-distribution/pom.xml | 61 +- .../test-ee9-distribution/pom.xml | 57 +- tests/test-integration/pom.xml | 6 +- 326 files changed, 12823 insertions(+), 12932 deletions(-) diff --git a/.mvn/maven-build-cache-config.xml b/.mvn/maven-build-cache-config.xml index d4814458646b..34c6f62ed859 100644 --- a/.mvn/maven-build-cache-config.xml +++ b/.mvn/maven-build-cache-config.xml @@ -22,7 +22,11 @@ - *.{java,xml,properties,mod,adoc} + {*.java,*.xml,*.properties,*.mod,*.adoc} + + *Jenkinsfile* + ./idea/* + diff --git a/build/build-resources/pom.xml b/build/build-resources/pom.xml index 5815481b61a2..f2f59e8873b5 100644 --- a/build/build-resources/pom.xml +++ b/build/build-resources/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 3.1.0 3.1.2 - true - true + UTF-8 true @@ -27,15 +28,55 @@ ${project.basedir}/src/main/resources + META-INF ${project.basedir}/../ LICENSE NOTICE.txt - META-INF + + com.diffplug.spotless + spotless-maven-plugin + 2.39.0 + + + + pom.xml + + + 2 + + recommended_2008_06 + + true + + true + + true + + scope,groupId,artifactId + + groupId,artifactId + + groupId,artifactId + + + + true + + + + + + check + + validate + + + org.apache.maven.plugins maven-remote-resources-plugin @@ -43,10 +84,10 @@ create-shared-resources - process-resources bundle + process-resources ${project.build.outputDirectory} diff --git a/build/pom.xml b/build/pom.xml index 2b3f7aba1c0a..e9dfa274408e 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -1,22 +1,22 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.build build - Build pom - - - true - + Build build-resources + + + true + diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml index 99886d7ddc3a..b283d296958d 100644 --- a/documentation/jetty-asciidoctor-extensions/pom.xml +++ b/documentation/jetty-asciidoctor-extensions/pom.xml @@ -1,15 +1,15 @@ + + 4.0.0 org.eclipse.jetty.documentation documentation 12.0.3-SNAPSHOT - - 4.0.0 jetty-asciidoctor-extensions - Documentation :: AsciiDoctor Extensions jar + Documentation :: AsciiDoctor Extensions ${project.groupId}.asciidoctor.extensions diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index 23549b550606..911c3173f8bc 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -1,15 +1,15 @@ + + 4.0.0 org.eclipse.jetty.documentation documentation 12.0.3-SNAPSHOT - - 4.0.0 jetty-documentation - Documentation :: Guides pom + Documentation :: Guides ${project.groupId} @@ -18,76 +18,199 @@ true - - - jdk17-18 - - [17,19) - - - - - maven-compiler-plugin - - - **/ArchitectureDocs.java - - - - - - - - jdk19-20 - - [19,21) - - - - - maven-compiler-plugin - - ${java.specification.version} - ${java.specification.version} - ${java.specification.version} - true - - - - - - - jdk21+ - - [21,) - - - - - maven-compiler-plugin - - ${java.specification.version} - ${java.specification.version} - ${java.specification.version} - - - - - - + + + + org.eclipse.jetty.ee10 + jetty-ee10-bom + ${project.version} + pom + import + + + + + + + org.eclipse.jetty + javadoc + ${project.version} + javadoc + jar + true + + + org.eclipse.jetty + jetty-alpn-server + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-home + ${project.version} + zip + true + + + org.eclipse.jetty + jetty-infinispan-embedded-query + + + org.eclipse.jetty + jetty-jmx + + + org.eclipse.jetty + jetty-nosql + + + org.eclipse.jetty + jetty-rewrite + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-unixdomain-server + + + org.eclipse.jetty + jetty-util-ajax + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + + + org.eclipse.jetty.ee10 + jetty-ee10-servlets + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server + + + org.eclipse.jetty.fcgi + jetty-fcgi-client + + + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager + + + org.eclipse.jetty.http2 + jetty-http2-client-transport + + + org.eclipse.jetty.http2 + jetty-http2-server + + + org.eclipse.jetty.http3 + jetty-http3-client-transport + + + org.eclipse.jetty.http3 + jetty-http3-server + + + org.eclipse.jetty.memcached + jetty-memcached-sessions + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-server + + + org.eclipse.jetty + jetty-slf4j-impl + runtime + + + ${project.build.directory}/html ${project.basedir}/src/main/asciidoc *.css - ${project.build.directory}/html + + org.apache.maven.plugins + maven-assembly-plugin + + + ${asciidoctor.skip} + + src/main/assembly/html.xml + + + + + make-assembly + + single + + package + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-javadoc-jar + + copy-dependencies + + generate-resources + + org.eclipse.jetty + javadoc + javadoc + ${project.build.directory}/other-artifacts/ + + + + unpack-jetty-home + + unpack + + generate-resources + + + + org.eclipse.jetty + jetty-home + ${project.version} + zip + + + ${project.build.directory}/ + + + + org.apache.maven.plugins maven-enforcer-plugin @@ -104,34 +227,6 @@ org.asciidoctor asciidoctor-maven-plugin - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj-diagram.version} - - - org.eclipse.jetty.documentation - jetty-asciidoctor-extensions - ${project.version} - - - jakarta.annotation - jakarta.annotation-api - - - - - org.apache.httpcomponents - httpcore - ${apache.httpcore.version} - - - org.apache.httpcomponents - httpclient - ${apache.httpclient.version} - - html5 @@ -147,37 +242,41 @@ https://eclipse.dev/jetty/javadoc/jetty-12 - - - index - prepare-package - - process-asciidoc - - - src/main/asciidoc - index.adoc - ${project.build.directory}/html - - - - operations-guide - prepare-package - - process-asciidoc - - - src/main/asciidoc/operations-guide - index.adoc - ${project.build.directory}/html/operations-guide - - + + + org.apache.httpcomponents + httpclient + ${apache.httpclient.version} + + + org.apache.httpcomponents + httpcore + ${apache.httpcore.version} + + + org.asciidoctor + asciidoctorj-diagram + ${asciidoctorj-diagram.version} + + + org.eclipse.jetty.documentation + jetty-asciidoctor-extensions + ${project.version} + + + jakarta.annotation + jakarta.annotation-api + + + + + contribution-guide - prepare-package process-asciidoc + prepare-package ${basedir}/src/main/asciidoc/contribution-guide index.adoc @@ -185,99 +284,65 @@ - programming-guide - prepare-package + index process-asciidoc + prepare-package - ${basedir}/src/main/asciidoc/programming-guide + src/main/asciidoc index.adoc - ${project.build.directory}/html/programming-guide + ${project.build.directory}/html old_docs - prepare-package process-asciidoc + prepare-package ${basedir}/src/main/asciidoc/old_docs index.adoc ${project.build.directory}/html/old_docs - - - - org.apache.maven.plugins - maven-dependency-plugin - - unpack-jetty-home - generate-resources + operations-guide - unpack + process-asciidoc + prepare-package - - - org.eclipse.jetty - jetty-home - ${project.version} - zip - - - ${project.build.directory}/ + src/main/asciidoc/operations-guide + index.adoc + ${project.build.directory}/html/operations-guide - copy-javadoc-jar - generate-resources + programming-guide - copy-dependencies + process-asciidoc + prepare-package - org.eclipse.jetty - javadoc - javadoc - ${project.build.directory}/other-artifacts/ + ${basedir}/src/main/asciidoc/programming-guide + index.adoc + ${project.build.directory}/html/programming-guide - - org.apache.maven.plugins - maven-assembly-plugin - - - ${asciidoctor.skip} - - src/main/assembly/html.xml - - - - - make-assembly - package - - single - - - - org.codehaus.mojo build-helper-maven-plugin attach-javadoc - package attach-artifact + package @@ -293,126 +358,61 @@ - - - - org.eclipse.jetty.ee10 - jetty-ee10-bom - ${project.version} - pom - import - - - - - - - org.eclipse.jetty - jetty-alpn-server - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty - jetty-jmx - - - org.eclipse.jetty - jetty-rewrite - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - - - org.eclipse.jetty.ee10 - jetty-ee10-servlets - - - org.eclipse.jetty - jetty-util-ajax - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - - - org.eclipse.jetty.fcgi - jetty-fcgi-client - - - org.eclipse.jetty.http2 - jetty-http2-server - - - org.eclipse.jetty.http2 - jetty-http2-client-transport - - - org.eclipse.jetty.http3 - jetty-http3-server - - - org.eclipse.jetty.http3 - jetty-http3-client-transport - - - org.eclipse.jetty - jetty-unixdomain-server - - - org.eclipse.jetty - jetty-slf4j-impl - runtime - - - org.eclipse.jetty.memcached - jetty-memcached-sessions - - - org.eclipse.jetty - jetty-nosql - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-server - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-server - - - org.eclipse.jetty - jetty-home - ${project.version} - zip - true - - - org.eclipse.jetty - javadoc - ${project.version} - javadoc - jar - true - - - org.eclipse.jetty - jetty-infinispan-embedded-query - - - org.eclipse.jetty.gcloud - jetty-gcloud-session-manager - - + + + jdk17-18 + + [17,19) + + + + + maven-compiler-plugin + + + **/ArchitectureDocs.java + + + + + + + + jdk19-20 + + [19,21) + + + + + maven-compiler-plugin + + ${java.specification.version} + ${java.specification.version} + ${java.specification.version} + true + + + + + + + jdk21+ + + [21,) + + + + + maven-compiler-plugin + + ${java.specification.version} + ${java.specification.version} + ${java.specification.version} + + + + + + diff --git a/documentation/pom.xml b/documentation/pom.xml index e5a4a2d93fcb..c8b9666dddc4 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -1,16 +1,16 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.documentation documentation - Documentation pom + Documentation jetty-asciidoctor-extensions diff --git a/javadoc/pom.xml b/javadoc/pom.xml index 88eb5ae17a2b..5d0cf8b68073 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -1,179 +1,46 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.3-SNAPSHOT - - 4.0.0 javadoc - Javadocs jar + Javadocs - ${project.build.directory}/jetty-sources - true - true - true true true + true + true + ${project.build.directory}/jetty-sources + true - - ${sources-directory} - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-java - - enforce - - - - - - com.google.code.findbugs:jsr305 - com.google.code.gson:gson - com.google.guava:guava - com.google.protobuf:protobuf-java - org.codehaus.plexus:plexus-interpolation - org.codehaus.plexus:plexus-utils - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - create-sources-dir - generate-sources - - run - - - - - - - - - delete-sources-dir - verify - - run - - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-sources - prepare-package - - unpack-dependencies - - - - org.eclipse.jetty, - org.eclipse.jetty.fcgi, - org.eclipse.jetty.gcloud, - org.eclipse.jetty.http2, - org.eclipse.jetty.http3, - org.eclipse.jetty.memcached, - org.eclipse.jetty.osgi, - org.eclipse.jetty.quic, - org.eclipse.jetty.websocket - - - org.eclipse.jetty.toolchain, - org.eclipse.jetty.orbit - - - infinispan-embedded, - infinispan-remote, - jetty-test-helper, - jetty-maven-plugin, - jetty-jspc-maven-plugin, - jetty-quic-foreign-incubator, - jetty-quic-foreign-jna, - alpn-api, - javax.servlet, - javax.websocket, - jakarta.servlet, - jakarta.websocket, - jetty-servlet-api, - jetty-javax-websocket-api, - jetty-jakarta-servlet-api, - jetty-jakarta-websocket-api, - javax.mail, - jakarta.mail-api, - mailapi, - javax.security.auth.message, - plexus-utils, - plexus-interpolation, - jetty-quic-quiche-foreign-incubator - - sources - false - META-INF/**,module-info.java - ${sources-directory} - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - javadoc-build - package - - jar - - - Eclipse Jetty API Doc - v${project.version} - Eclipse Jetty API Doc - v${project.version} - - org.eclipse.jetty.http3.client.transport.internal; org.eclipse.jetty.http3.client.internal; org.eclipse.jetty.http3.internal; org.eclipse.jetty.http3.internal.*; org.eclipse.jetty.http3.qpack.internal; org.eclipse.jetty.http3.qpack.internal.*; org.eclipse.jetty.http3.server.internal; org.eclipse.jetty.quic.common.internal; org.eclipse.jetty.quic.quiche; org.eclipse.jetty.quic.quiche.foreign.*; org.eclipse.jetty.quic.quiche.*; org.eclipse.jetty.quic.server.internal; - - - - - - - - org.eclipse.jetty.ee10 jetty-ee10-bom ${project.version} - import pom + import + + + + jakarta.mail + jakarta.mail-api + 2.1.2 + provided + org.eclipse.jetty @@ -215,21 +82,6 @@ jetty-deploy provided - - org.eclipse.jetty.fcgi - jetty-fcgi-client - provided - - - org.eclipse.jetty.fcgi - jetty-fcgi-proxy - provided - - - org.eclipse.jetty.fcgi - jetty-fcgi-server - provided - org.eclipse.jetty jetty-http @@ -240,36 +92,6 @@ jetty-http-spi provided - - org.eclipse.jetty.http2 - jetty-http2-client - provided - - - org.eclipse.jetty.http2 - jetty-http2-client-transport - provided - - - org.eclipse.jetty.http2 - jetty-http2-server - provided - - - org.eclipse.jetty.http3 - jetty-http3-client - provided - - - org.eclipse.jetty.http3 - jetty-http3-client-transport - provided - - - org.eclipse.jetty.http3 - jetty-http3-server - provided - org.eclipse.jetty jetty-jmx @@ -295,16 +117,6 @@ jetty-proxy provided - - org.eclipse.jetty.quic - jetty-quic-client - provided - - - org.eclipse.jetty.quic - jetty-quic-server - provided - org.eclipse.jetty jetty-rewrite @@ -345,31 +157,6 @@ jetty-util-ajax provided - - org.eclipse.jetty.websocket - jetty-websocket-core-client - provided - - - org.eclipse.jetty.websocket - jetty-websocket-core-server - provided - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-api - provided - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - provided - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-server - provided - org.eclipse.jetty jetty-xml @@ -412,21 +199,6 @@ jetty-ee10-jndi provided - - org.eclipse.jetty.ee10.osgi - jetty-ee10-osgi-alpn - provided - - - org.eclipse.jetty.ee10.osgi - jetty-ee10-osgi-boot - provided - - - org.eclipse.jetty.ee10.osgi - jetty-ee10-osgi-boot-jsp - provided - org.eclipse.jetty.ee10 jetty-ee10-plus @@ -462,6 +234,21 @@ jetty-ee10-webapp provided + + org.eclipse.jetty.ee10.osgi + jetty-ee10-osgi-alpn + provided + + + org.eclipse.jetty.ee10.osgi + jetty-ee10-osgi-boot + provided + + + org.eclipse.jetty.ee10.osgi + jetty-ee10-osgi-boot-jsp + provided + org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-jakarta-client @@ -482,13 +269,218 @@ jetty-ee10-websocket-servlet provided - - - jakarta.mail - jakarta.mail-api - 2.1.2 + org.eclipse.jetty.fcgi + jetty-fcgi-client + provided + + + org.eclipse.jetty.fcgi + jetty-fcgi-proxy + provided + + + org.eclipse.jetty.fcgi + jetty-fcgi-server + provided + + + org.eclipse.jetty.http2 + jetty-http2-client + provided + + + org.eclipse.jetty.http2 + jetty-http2-client-transport + provided + + + org.eclipse.jetty.http2 + jetty-http2-server + provided + + + org.eclipse.jetty.http3 + jetty-http3-client + provided + + + org.eclipse.jetty.http3 + jetty-http3-client-transport + provided + + + org.eclipse.jetty.http3 + jetty-http3-server + provided + + + org.eclipse.jetty.quic + jetty-quic-client + provided + + + org.eclipse.jetty.quic + jetty-quic-server + provided + + + org.eclipse.jetty.websocket + jetty-websocket-core-client + provided + + + org.eclipse.jetty.websocket + jetty-websocket-core-server + provided + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-api + provided + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + provided + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-server provided + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + create-sources-dir + + run + + generate-sources + + + + + + + + delete-sources-dir + + run + + verify + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-sources + + unpack-dependencies + + prepare-package + + org.eclipse.jetty, + org.eclipse.jetty.fcgi, + org.eclipse.jetty.gcloud, + org.eclipse.jetty.http2, + org.eclipse.jetty.http3, + org.eclipse.jetty.memcached, + org.eclipse.jetty.osgi, + org.eclipse.jetty.quic, + org.eclipse.jetty.websocket + org.eclipse.jetty.toolchain, + org.eclipse.jetty.orbit + infinispan-embedded, + infinispan-remote, + jetty-test-helper, + jetty-maven-plugin, + jetty-jspc-maven-plugin, + jetty-quic-foreign-incubator, + jetty-quic-foreign-jna, + alpn-api, + javax.servlet, + javax.websocket, + jakarta.servlet, + jakarta.websocket, + jetty-servlet-api, + jetty-javax-websocket-api, + jetty-jakarta-servlet-api, + jetty-jakarta-websocket-api, + javax.mail, + jakarta.mail-api, + mailapi, + javax.security.auth.message, + plexus-utils, + plexus-interpolation, + jetty-quic-quiche-foreign-incubator + sources + false + META-INF/**,module-info.java + ${sources-directory} + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-java + + enforce + + + + + + com.google.code.findbugs:jsr305 + com.google.code.gson:gson + com.google.guava:guava + com.google.protobuf:protobuf-java + org.codehaus.plexus:plexus-interpolation + org.codehaus.plexus:plexus-utils + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + javadoc-build + + jar + + package + + Eclipse Jetty API Doc - v${project.version} + Eclipse Jetty API Doc - v${project.version} + org.eclipse.jetty.http3.client.transport.internal; org.eclipse.jetty.http3.client.internal; org.eclipse.jetty.http3.internal; org.eclipse.jetty.http3.internal.*; org.eclipse.jetty.http3.qpack.internal; org.eclipse.jetty.http3.qpack.internal.*; org.eclipse.jetty.http3.server.internal; org.eclipse.jetty.quic.common.internal; org.eclipse.jetty.quic.quiche; org.eclipse.jetty.quic.quiche.foreign.*; org.eclipse.jetty.quic.quiche.*; org.eclipse.jetty.quic.server.internal; + + + + + + ${sources-directory} + diff --git a/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml index d2dee0c2f109..1134f3daeacf 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml @@ -1,31 +1,17 @@ + + 4.0.0 org.eclipse.jetty jetty-alpn 12.0.3-SNAPSHOT - 4.0.0 jetty-alpn-client Core :: ALPN :: Client ${project.groupId}.alpn.client org.eclipse.jetty.alpn.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},org.eclipse.jetty.alpn;resolution:=optional,* - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Client)";resolution:=optional;cardinality:=multiple - - - - - org.eclipse.jetty @@ -46,4 +32,19 @@ test + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},org.eclipse.jetty.alpn;resolution:=optional,* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Client)";resolution:=optional;cardinality:=multiple + + + + + diff --git a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index 6b44105c7973..2bc7b1e04481 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -1,13 +1,13 @@ + 4.0.0 + org.eclipse.jetty jetty-alpn 12.0.3-SNAPSHOT - - 4.0.0 jetty-alpn-conscrypt-client Core :: ALPN :: Conscrypt Client @@ -29,13 +29,13 @@ slf4j-api - org.eclipse.jetty.http2 - jetty-http2-client + org.eclipse.jetty + jetty-slf4j-impl test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.http2 + jetty-http2-client test diff --git a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index f7322f090a6e..3661b26a7d80 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-alpn 12.0.3-SNAPSHOT - - 4.0.0 jetty-alpn-conscrypt-server Core :: ALPN :: Conscrypt Server @@ -33,22 +33,17 @@ org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.http2 - jetty-http2-server + jetty-alpn-conscrypt-client test org.eclipse.jetty - jetty-alpn-conscrypt-client + jetty-client test org.eclipse.jetty - jetty-client + jetty-slf4j-impl test @@ -61,6 +56,11 @@ jetty-http2-client-transport test + + org.eclipse.jetty.http2 + jetty-http2-server + test + @@ -82,9 +82,7 @@ maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.alpn.conscrypt.server=org.eclipse.jetty.server - + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.alpn.conscrypt.server=org.eclipse.jetty.server diff --git a/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml index 5066dbbbcf81..73753e020544 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -1,13 +1,13 @@ + 4.0.0 + org.eclipse.jetty jetty-alpn 12.0.3-SNAPSHOT - - 4.0.0 jetty-alpn-java-client Core :: ALPN :: Java Client @@ -15,6 +15,28 @@ ${project.groupId}.alpn.java.client + + + org.eclipse.jetty + jetty-alpn-client + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + + org.eclipse.jetty.http2 + jetty-http2-client + test + + + @@ -34,26 +56,4 @@ - - - org.eclipse.jetty - jetty-alpn-client - - - org.slf4j - slf4j-api - - - - org.eclipse.jetty.http2 - jetty-http2-client - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - diff --git a/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml index a309491de345..321f77bcc1ee 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-alpn 12.0.3-SNAPSHOT - - 4.0.0 jetty-alpn-java-server Core :: ALPN :: Java Server @@ -14,40 +14,14 @@ ${project.groupId}.alpn.java.server - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.alpn.java.server=org.eclipse.jetty.server - - - - - org.apache.felix - maven-bundle-plugin - true - - - JDK9 Server ALPN - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server - <_nouses>true - - - - - - org.eclipse.jetty - jetty-io + jetty-alpn-server org.eclipse.jetty - jetty-alpn-server + jetty-io org.slf4j @@ -70,4 +44,28 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + JDK9 Server ALPN + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server + <_nouses>true + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.alpn.java.server=org.eclipse.jetty.server + + + + + diff --git a/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml index 878129ea2243..2bbc5ef74c0f 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml @@ -1,31 +1,17 @@ + + 4.0.0 org.eclipse.jetty jetty-alpn 12.0.3-SNAPSHOT - 4.0.0 jetty-alpn-server Core :: ALPN :: Server ${project.groupId}.alpn.server org.eclipse.jetty.alpn.* - - - - org.apache.felix - maven-bundle-plugin - - - ${bundle-symbolic-name};singleton:=true - org.eclipse.jetty.alpn.server,* - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server)";resolution:=optional;cardinality:=multiple - - - - - org.eclipse.jetty @@ -46,4 +32,19 @@ test + + + + org.apache.felix + maven-bundle-plugin + + + ${bundle-symbolic-name};singleton:=true + org.eclipse.jetty.alpn.server,* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server)";resolution:=optional;cardinality:=multiple + + + + + diff --git a/jetty-core/jetty-alpn/pom.xml b/jetty-core/jetty-alpn/pom.xml index f725b3fbe187..13b2fe6bdf7f 100644 --- a/jetty-core/jetty-alpn/pom.xml +++ b/jetty-core/jetty-alpn/pom.xml @@ -1,21 +1,22 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - 4.0.0 jetty-alpn pom Core :: ALPN - jetty-alpn-server jetty-alpn-client - jetty-alpn-conscrypt-server jetty-alpn-conscrypt-client + jetty-alpn-conscrypt-server jetty-alpn-java-client jetty-alpn-java-server + jetty-alpn-server diff --git a/jetty-core/jetty-bom/pom.xml b/jetty-core/jetty-bom/pom.xml index b9ca06c31c00..56253ce04251 100644 --- a/jetty-core/jetty-bom/pom.xml +++ b/jetty-core/jetty-bom/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -8,34 +9,9 @@ jetty-bom + pom Core :: BOM Jetty Core BOM artifact - pom - - - - - org.codehaus.mojo - flatten-maven-plugin - - - flatten - - flatten - - process-resources - - - flatten-clean - - clean - - clean - - - - - @@ -136,27 +112,27 @@ org.eclipse.jetty - jetty-server + jetty-security 12.0.3-SNAPSHOT org.eclipse.jetty - jetty-session + jetty-server 12.0.3-SNAPSHOT org.eclipse.jetty - jetty-slf4j-impl + jetty-session 12.0.3-SNAPSHOT org.eclipse.jetty - jetty-start + jetty-slf4j-impl 12.0.3-SNAPSHOT org.eclipse.jetty - jetty-security + jetty-start 12.0.3-SNAPSHOT @@ -316,4 +292,29 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + flatten-clean + + clean + + clean + + + flatten + + flatten + + process-resources + + + + + diff --git a/jetty-core/jetty-client/pom.xml b/jetty-core/jetty-client/pom.xml index be5f5dc20d30..92d6c321af2a 100644 --- a/jetty-core/jetty-client/pom.xml +++ b/jetty-core/jetty-client/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - - 4.0.0 jetty-client Core :: HTTP Client @@ -14,29 +15,78 @@ org.eclipse.jetty.client.* + + + org.eclipse.jetty + jetty-alpn-client + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-jmx + true + + + org.slf4j + slf4j-api + + + + net.minidev + json-smart + test + + + org.apache.kerby + kerb-simplekdc + test + + + org.awaitility + awaitility + test + + + org.eclipse.jetty + jetty-security + test + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-session + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules java.security.jgss - --add-modules org.eclipse.jetty.jmx - --add-reads org.eclipse.jetty.client=org.eclipse.jetty.logging - - - org.apache.maven.plugins maven-dependency-plugin unpack - generate-test-resources unpack + generate-test-resources @@ -58,10 +108,10 @@ maven-shade-plugin - package shade + package false true @@ -91,66 +141,15 @@ + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules java.security.jgss + --add-modules org.eclipse.jetty.jmx + --add-reads org.eclipse.jetty.client=org.eclipse.jetty.logging + + - - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-io - - - org.eclipse.jetty - jetty-alpn-client - - - org.eclipse.jetty - jetty-jmx - true - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-security - test - - - org.eclipse.jetty - jetty-session - test - - - org.awaitility - awaitility - test - - - org.apache.kerby - kerb-simplekdc - test - - - - net.minidev - json-smart - test - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - diff --git a/jetty-core/jetty-demos/jetty-demo-handler/pom.xml b/jetty-core/jetty-demos/jetty-demo-handler/pom.xml index d58de904da3b..a9c7f20c68e0 100644 --- a/jetty-core/jetty-demos/jetty-demo-handler/pom.xml +++ b/jetty-core/jetty-demos/jetty-demo-handler/pom.xml @@ -1,42 +1,30 @@ + 4.0.0 org.eclipse.jetty.demos jetty-demos 12.0.3-SNAPSHOT - 4.0.0 jetty-demo-handler Core :: Demo Handler ${project.groupId}.demos org.eclipse.jetty.demos.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.io=org.eclipse.jetty.logging - - - - - - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-jmx + true org.eclipse.jetty jetty-server - org.eclipse.jetty - jetty-jmx - true + org.slf4j + slf4j-api org.eclipse.jetty @@ -49,4 +37,14 @@ test + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.io=org.eclipse.jetty.logging + + + + diff --git a/jetty-core/jetty-demos/pom.xml b/jetty-core/jetty-demos/pom.xml index b1e1bfe49740..575609415f65 100644 --- a/jetty-core/jetty-demos/pom.xml +++ b/jetty-core/jetty-demos/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.demos jetty-demos pom diff --git a/jetty-core/jetty-deploy/pom.xml b/jetty-core/jetty-deploy/pom.xml index 8fabf1761e84..3d96f5f1fd6e 100644 --- a/jetty-core/jetty-deploy/pom.xml +++ b/jetty-core/jetty-deploy/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - - 4.0.0 jetty-deploy Core :: Deployers Jetty deployers @@ -15,23 +16,12 @@ org.eclipse.jetty.deploy.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules org.eclipse.jetty.jmx - --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http - --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.logging - - - - - - + + org.eclipse.jetty + jetty-jmx + true + org.eclipse.jetty jetty-server @@ -45,9 +35,9 @@ slf4j-api - org.eclipse.jetty - jetty-jmx - true + org.awaitility + awaitility + test org.eclipse.jetty @@ -59,10 +49,19 @@ jetty-test-helper test - - org.awaitility - awaitility - test - + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules org.eclipse.jetty.jmx + --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http + --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.logging + + + + diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml index 5a6c97cde7b5..afed8aea9fa2 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml +++ b/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.fcgi jetty-fcgi 12.0.3-SNAPSHOT - - 4.0.0 jetty-fcgi-client Core :: FastCGI :: Client @@ -17,19 +17,19 @@ org.eclipse.jetty - jetty-util + jetty-client org.eclipse.jetty - jetty-io + jetty-http org.eclipse.jetty - jetty-http + jetty-io org.eclipse.jetty - jetty-client + jetty-util org.slf4j diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml index dd3316a7718f..22c175c42894 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml +++ b/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.fcgi jetty-fcgi 12.0.3-SNAPSHOT - - 4.0.0 jetty-fcgi-proxy Core :: FastCGI :: Proxy @@ -14,22 +14,6 @@ ${project.groupId}.proxy - - - - maven-surefire-plugin - - - @{argLine} - ${jetty.surefire.argLine} - --add-exports org.eclipse.jetty.fcgi.client/org.eclipse.jetty.fcgi.generator=ALL-UNNAMED - --add-exports org.eclipse.jetty.fcgi.client/org.eclipse.jetty.fcgi.parser=ALL-UNNAMED - - - - - - org.eclipse.jetty @@ -43,10 +27,9 @@ org.slf4j slf4j-api - - org.eclipse.jetty.fcgi - jetty-fcgi-server + org.eclipse.jetty + jetty-slf4j-impl test @@ -54,10 +37,25 @@ jetty-unixdomain-server test + - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.fcgi + jetty-fcgi-server test + + + + + maven-surefire-plugin + + @{argLine} + ${jetty.surefire.argLine} + --add-exports org.eclipse.jetty.fcgi.client/org.eclipse.jetty.fcgi.generator=ALL-UNNAMED + --add-exports org.eclipse.jetty.fcgi.client/org.eclipse.jetty.fcgi.parser=ALL-UNNAMED + + + + diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml index d198df5730f6..59351a060489 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml +++ b/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.fcgi jetty-fcgi 12.0.3-SNAPSHOT - - 4.0.0 jetty-fcgi-server Core :: FastCGI :: Server @@ -14,46 +14,32 @@ ${project.groupId}.server - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.fcgi.server=org.eclipse.jetty.logging - - - - - - - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-server org.eclipse.jetty.fcgi jetty-fcgi-client - org.eclipse.jetty - jetty-server + org.slf4j + slf4j-api - org.eclipse.jetty - jetty-slf4j-impl + org.awaitility + awaitility test - org.eclipse.jetty.http2 - jetty-http2-server + org.eclipse.jetty + jetty-alpn-java-server test org.eclipse.jetty - jetty-alpn-java-server + jetty-slf4j-impl test @@ -62,9 +48,21 @@ test - org.awaitility - awaitility + org.eclipse.jetty.http2 + jetty-http2-server test + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.fcgi.server=org.eclipse.jetty.logging + + + + diff --git a/jetty-core/jetty-fcgi/pom.xml b/jetty-core/jetty-fcgi/pom.xml index b3f390c585f3..98b7de74e7a0 100644 --- a/jetty-core/jetty-fcgi/pom.xml +++ b/jetty-core/jetty-fcgi/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.fcgi jetty-fcgi pom @@ -14,8 +14,8 @@ jetty-fcgi-client - jetty-fcgi-server jetty-fcgi-proxy + jetty-fcgi-server diff --git a/jetty-core/jetty-http-spi/pom.xml b/jetty-core/jetty-http-spi/pom.xml index ba9acc4c722f..d0cd6f2c2cc0 100644 --- a/jetty-core/jetty-http-spi/pom.xml +++ b/jetty-core/jetty-http-spi/pom.xml @@ -1,28 +1,19 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - 4.0.0 jetty-http-spi Core :: HTTP SPI ${project.groupId}.http.spi - org.eclipse.jetty.http.spi.* true + org.eclipse.jetty.http.spi.* - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-client - test - org.eclipse.jetty jetty-server @@ -34,8 +25,8 @@ provided - org.slf4j - jul-to-slf4j + org.eclipse.jetty + jetty-client test @@ -43,16 +34,19 @@ jetty-slf4j-impl test + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.slf4j + jul-to-slf4j + test + - - org.apache.maven.plugins - maven-surefire-plugin - - false - - org.apache.felix maven-bundle-plugin @@ -66,6 +60,13 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + false + + diff --git a/jetty-core/jetty-http-tools/pom.xml b/jetty-core/jetty-http-tools/pom.xml index 9103673036d1..5460a06ce5e7 100644 --- a/jetty-core/jetty-http-tools/pom.xml +++ b/jetty-core/jetty-http-tools/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - - 4.0.0 jetty-http-tools Core :: HTTP Tools diff --git a/jetty-core/jetty-http/pom.xml b/jetty-core/jetty-http/pom.xml index 413f5230248b..48e73443f6ee 100644 --- a/jetty-core/jetty-http/pom.xml +++ b/jetty-core/jetty-http/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - - 4.0.0 jetty-http Core :: HTTP @@ -18,11 +18,11 @@ org.eclipse.jetty - jetty-util + jetty-io org.eclipse.jetty - jetty-io + jetty-util org.slf4j @@ -49,10 +49,8 @@ true - osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder - + osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder @@ -61,10 +59,10 @@ maven-shade-plugin - package shade + package ${jmhjar.name} true @@ -102,9 +100,7 @@ org.apache.maven.plugins maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.http=org.eclipse.jetty.logging - + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.http=org.eclipse.jetty.logging diff --git a/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml b/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml index f784d87f9827..dbc26f3814f8 100644 --- a/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http2 jetty-http2 12.0.3-SNAPSHOT - - 4.0.0 jetty-http2-client-transport Core :: HTTP2 :: Client Transport @@ -15,6 +15,10 @@ + + org.eclipse.jetty + jetty-alpn-java-client + org.eclipse.jetty jetty-client @@ -23,10 +27,6 @@ org.eclipse.jetty.http2 jetty-http2-client - - org.eclipse.jetty - jetty-alpn-java-client - org.slf4j slf4j-api diff --git a/jetty-core/jetty-http2/jetty-http2-client/pom.xml b/jetty-core/jetty-http2/jetty-http2-client/pom.xml index d9928bd96b14..5d90f1f3ba94 100644 --- a/jetty-core/jetty-http2/jetty-http2-client/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http2 jetty-http2 12.0.3-SNAPSHOT - - 4.0.0 jetty-http2-client Core :: HTTP2 :: Client @@ -14,33 +14,31 @@ ${project.groupId}.client - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.http2.client=org.eclipse.jetty.http2.hpack - - - - - - - - org.eclipse.jetty.http2 - jetty-http2-common - org.eclipse.jetty jetty-alpn-client + + org.eclipse.jetty.http2 + jetty-http2-common + org.slf4j slf4j-api + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.http2.client=org.eclipse.jetty.http2.hpack + + + + + diff --git a/jetty-core/jetty-http2/jetty-http2-common/pom.xml b/jetty-core/jetty-http2/jetty-http2-common/pom.xml index f7ced365911d..357626beef97 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http2 jetty-http2 12.0.3-SNAPSHOT - - 4.0.0 jetty-http2-common Core :: HTTP2 :: Common @@ -15,6 +15,12 @@ + + + org.eclipse.jetty + jetty-jmx + true + org.eclipse.jetty.http2 jetty-http2-hpack @@ -23,12 +29,6 @@ org.slf4j slf4j-api - - - org.eclipse.jetty - jetty-jmx - true - org.eclipse.jetty jetty-slf4j-impl diff --git a/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml b/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml index 2becbf25f2a4..3f08a849caa6 100644 --- a/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http2 jetty-http2 12.0.3-SNAPSHOT - - 4.0.0 jetty-http2-hpack Core :: HTTP2 :: HPACK @@ -14,36 +14,18 @@ ${project.groupId}.hpack - - - - org.apache.felix - maven-bundle-plugin - true - - - Http2 Hpack - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder - <_nouses>true - - - - - - org.eclipse.jetty - jetty-util + jetty-http org.eclipse.jetty - jetty-http + jetty-io org.eclipse.jetty - jetty-io + jetty-util org.slf4j @@ -61,15 +43,33 @@ test - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty + jetty-util-ajax test - org.eclipse.jetty - jetty-util-ajax + org.eclipse.jetty.toolchain + jetty-test-helper test + + + + org.apache.felix + maven-bundle-plugin + true + + + Http2 Hpack + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder + <_nouses>true + + + + + + diff --git a/jetty-core/jetty-http2/jetty-http2-server/pom.xml b/jetty-core/jetty-http2/jetty-http2-server/pom.xml index 35c5a2c94309..22b5c501e5c0 100644 --- a/jetty-core/jetty-http2/jetty-http2-server/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http2 jetty-http2 12.0.3-SNAPSHOT - - 4.0.0 jetty-http2-server Core :: HTTP2 :: Server @@ -16,14 +16,14 @@ - - org.eclipse.jetty.http2 - jetty-http2-common - org.eclipse.jetty jetty-server + + org.eclipse.jetty.http2 + jetty-http2-common + org.slf4j slf4j-api diff --git a/jetty-core/jetty-http2/jetty-http2-tests/pom.xml b/jetty-core/jetty-http2/jetty-http2-tests/pom.xml index b10576f55bb0..b4706a92e275 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-tests/pom.xml @@ -1,29 +1,75 @@ + + 4.0.0 org.eclipse.jetty.http2 jetty-http2 12.0.3-SNAPSHOT - - 4.0.0 jetty-http2-tests Core :: HTTP2 :: Tests - true ${skipTests} + true + + + org.awaitility + awaitility + test + + + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-proxy + test + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.http2 + jetty-http2-client + test + + + org.eclipse.jetty.http2 + jetty-http2-client-transport + test + + + org.eclipse.jetty.http2 + jetty-http2-server + test + + + maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.http2.server=org.eclipse.jetty.logging - + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.http2.server=org.eclipse.jetty.logging @@ -43,10 +89,10 @@ h2spec - test h2spec + test @@ -64,6 +110,9 @@ spec-server-run + + java + test org.eclipse.jetty.http2.tests.H2SpecServer @@ -72,9 +121,6 @@ ${manual.test.port} - - java - @@ -83,52 +129,4 @@ - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty - jetty-proxy - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty.http2 - jetty-http2-client - test - - - org.eclipse.jetty.http2 - jetty-http2-client-transport - test - - - org.eclipse.jetty.http2 - jetty-http2-server - test - - - org.awaitility - awaitility - test - - - diff --git a/jetty-core/jetty-http2/pom.xml b/jetty-core/jetty-http2/pom.xml index abd2c4605d4f..76f36edee9ae 100644 --- a/jetty-core/jetty-http2/pom.xml +++ b/jetty-core/jetty-http2/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.http2 jetty-http2 pom @@ -14,9 +14,9 @@ jetty-http2-client + jetty-http2-client-transport jetty-http2-common jetty-http2-hpack - jetty-http2-client-transport jetty-http2-server jetty-http2-tests diff --git a/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml b/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml index 25923c37b822..82cef33cb3ed 100644 --- a/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http3 jetty-http3 12.0.3-SNAPSHOT - - 4.0.0 jetty-http3-client-transport Core :: HTTP3 :: HTTP Client Transport @@ -15,14 +15,14 @@ - - org.eclipse.jetty.http3 - jetty-http3-client - org.eclipse.jetty jetty-client + + org.eclipse.jetty.http3 + jetty-http3-client + org.eclipse.jetty.http3 diff --git a/jetty-core/jetty-http3/jetty-http3-client/pom.xml b/jetty-core/jetty-http3/jetty-http3-client/pom.xml index 778d1ff16339..91b3288b851d 100644 --- a/jetty-core/jetty-http3/jetty-http3-client/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http3 jetty-http3 12.0.3-SNAPSHOT - - 4.0.0 jetty-http3-client Core :: HTTP3 :: Client @@ -15,14 +15,6 @@ - - org.eclipse.jetty.http3 - jetty-http3-common - - - org.eclipse.jetty.quic - jetty-quic-client - org.eclipse.jetty jetty-io @@ -31,6 +23,14 @@ org.eclipse.jetty jetty-util + + org.eclipse.jetty.http3 + jetty-http3-common + + + org.eclipse.jetty.quic + jetty-quic-client + diff --git a/jetty-core/jetty-http3/jetty-http3-common/pom.xml b/jetty-core/jetty-http3/jetty-http3-common/pom.xml index 55f0c99eb47b..76ab7bfd0dfe 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http3 jetty-http3 12.0.3-SNAPSHOT - - 4.0.0 jetty-http3-common Core :: HTTP3 :: Common @@ -16,8 +16,12 @@ - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-util org.eclipse.jetty.http3 @@ -28,12 +32,8 @@ jetty-quic-common - org.eclipse.jetty - jetty-io - - - org.eclipse.jetty - jetty-util + org.slf4j + slf4j-api org.eclipse.jetty diff --git a/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml b/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml index 51d5e1f9f56b..2a7e57cf7242 100644 --- a/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http3 jetty-http3 12.0.3-SNAPSHOT - - 4.0.0 jetty-http3-qpack Core :: HTTP3 :: QPACK @@ -14,36 +14,18 @@ ${project.groupId}.qpack - - - - org.apache.felix - maven-bundle-plugin - true - - - Http3 Qpack - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder - <_nouses>true - - - - - - org.eclipse.jetty - jetty-util + jetty-http org.eclipse.jetty - jetty-http + jetty-io org.eclipse.jetty - jetty-io + jetty-util org.slf4j @@ -61,15 +43,33 @@ test - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty + jetty-util-ajax test - org.eclipse.jetty - jetty-util-ajax + org.eclipse.jetty.toolchain + jetty-test-helper test + + + + org.apache.felix + maven-bundle-plugin + true + + + Http3 Qpack + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder + <_nouses>true + + + + + + diff --git a/jetty-core/jetty-http3/jetty-http3-server/pom.xml b/jetty-core/jetty-http3/jetty-http3-server/pom.xml index cb3fd0a957ac..4e1f18edb2ab 100644 --- a/jetty-core/jetty-http3/jetty-http3-server/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http3 jetty-http3 12.0.3-SNAPSHOT - - 4.0.0 jetty-http3-server Core :: HTTP3 :: Server diff --git a/jetty-core/jetty-http3/jetty-http3-tests/pom.xml b/jetty-core/jetty-http3/jetty-http3-tests/pom.xml index 435563a682fc..bcf50906bda7 100644 --- a/jetty-core/jetty-http3/jetty-http3-tests/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-tests/pom.xml @@ -1,67 +1,67 @@ + + 4.0.0 org.eclipse.jetty.http3 jetty-http3 12.0.3-SNAPSHOT - - 4.0.0 jetty-http3-tests Core :: HTTP3 :: Tests + 2 false - 2 true true - org.eclipse.jetty.http3 - jetty-http3-client + org.awaitility + awaitility test - org.eclipse.jetty.http3 - jetty-http3-client-transport + org.eclipse.jetty + jetty-alpn-java-server test - org.eclipse.jetty.http3 - jetty-http3-server + org.eclipse.jetty + jetty-jmx test - org.eclipse.jetty.quic - jetty-quic-server + org.eclipse.jetty + jetty-slf4j-impl test - org.eclipse.jetty - jetty-alpn-java-server + org.eclipse.jetty.http2 + jetty-http2-server test - org.eclipse.jetty - jetty-jmx + org.eclipse.jetty.http3 + jetty-http3-client test - org.eclipse.jetty.http2 - jetty-http2-server + org.eclipse.jetty.http3 + jetty-http3-client-transport test - org.awaitility - awaitility + org.eclipse.jetty.http3 + jetty-http3-server test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.quic + jetty-quic-server test diff --git a/jetty-core/jetty-http3/pom.xml b/jetty-core/jetty-http3/pom.xml index 46725fd358ad..578d5deea5b1 100644 --- a/jetty-core/jetty-http3/pom.xml +++ b/jetty-core/jetty-http3/pom.xml @@ -1,23 +1,23 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.http3 jetty-http3 pom Core :: HTTP3 - jetty-http3-qpack - jetty-http3-common - jetty-http3-server jetty-http3-client jetty-http3-client-transport + jetty-http3-common + jetty-http3-qpack + jetty-http3-server jetty-http3-tests diff --git a/jetty-core/jetty-io/pom.xml b/jetty-core/jetty-io/pom.xml index f5e0437168cb..ba8ad1f825d5 100644 --- a/jetty-core/jetty-io/pom.xml +++ b/jetty-core/jetty-io/pom.xml @@ -1,43 +1,35 @@ + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - 4.0.0 jetty-io Core :: IO ${project.groupId}.io org.eclipse.jetty.io.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.io=org.eclipse.jetty.logging - - - - - - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-jmx + true org.eclipse.jetty jetty-util - org.eclipse.jetty - jetty-jmx - true + org.slf4j + slf4j-api + + + org.awaitility + awaitility + test org.eclipse.jetty @@ -49,10 +41,16 @@ jetty-test-helper test - - org.awaitility - awaitility - test - + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.io=org.eclipse.jetty.logging + + + + diff --git a/jetty-core/jetty-jmx/pom.xml b/jetty-core/jetty-jmx/pom.xml index 2075162946c8..f3880f88e2aa 100644 --- a/jetty-core/jetty-jmx/pom.xml +++ b/jetty-core/jetty-jmx/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - 4.0.0 jetty-jmx Core :: JMX JMX management artifact for jetty. @@ -12,18 +13,6 @@ ${project.groupId}.jmx org.eclipse.jetty.jmx.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.jmx/org.eclipse.jetty.jmx=ALL-UNNAMED --add-opens org.eclipse.jetty.jmx/org.eclipse.jetty.logging.jmx=ALL-UNNAMED - - - - - org.eclipse.jetty @@ -33,6 +22,11 @@ org.slf4j slf4j-api + + com.openpojo + openpojo + test + org.eclipse.jetty jetty-slf4j-impl @@ -43,11 +37,16 @@ jetty-test-helper test - - com.openpojo - openpojo - test - + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.jmx/org.eclipse.jetty.jmx=ALL-UNNAMED --add-opens org.eclipse.jetty.jmx/org.eclipse.jetty.logging.jmx=ALL-UNNAMED + + + + diff --git a/jetty-core/jetty-jndi/pom.xml b/jetty-core/jetty-jndi/pom.xml index 5a1e6eb4696a..a62202028ab3 100644 --- a/jetty-core/jetty-jndi/pom.xml +++ b/jetty-core/jetty-jndi/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - - 4.0.0 jetty-jndi Core :: JNDI JNDI spi impl for java namespace. @@ -15,21 +16,6 @@ org.eclipse.jetty.jndi.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* - - - - - - org.eclipse.jetty @@ -39,6 +25,11 @@ org.slf4j slf4j-api + + org.eclipse.jetty + jetty-server + provided + org.eclipse.jetty jetty-slf4j-impl @@ -49,11 +40,6 @@ jetty-test-helper test - - org.eclipse.jetty - jetty-server - provided - + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* + + + + + diff --git a/jetty-core/jetty-keystore/pom.xml b/jetty-core/jetty-keystore/pom.xml index 3488b52c9d29..66ff969af740 100644 --- a/jetty-core/jetty-keystore/pom.xml +++ b/jetty-core/jetty-keystore/pom.xml @@ -1,19 +1,19 @@ + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - 4.0.0 jetty-keystore jar Core :: Test Keystore Test keystore with self-signed SSL Certificate. - ${project.groupId}.keystore 1.76 + ${project.groupId}.keystore @@ -36,10 +36,9 @@ org.eclipse.jetty jetty-util - org.eclipse.jetty - jetty-slf4j-impl + jetty-client test @@ -47,9 +46,10 @@ jetty-server test + org.eclipse.jetty - jetty-client + jetty-slf4j-impl test diff --git a/jetty-core/jetty-openid/pom.xml b/jetty-core/jetty-openid/pom.xml index d5aa9de26021..f3944f70b6bb 100644 --- a/jetty-core/jetty-openid/pom.xml +++ b/jetty-core/jetty-openid/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - - 4.0.0 jetty-openid EE10 :: OpenID Jetty OpenID Connect Infrastructure @@ -15,33 +16,10 @@ org.eclipse.jetty.security.openid.* - - - - org.apache.felix - maven-bundle-plugin - true - - - - manifest - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory - - - - - - - - org.eclipse.jetty - jetty-server + jetty-client org.eclipse.jetty @@ -49,7 +27,7 @@ org.eclipse.jetty - jetty-client + jetty-server org.eclipse.jetty @@ -75,4 +53,27 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + + manifest + + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory + + + + + + + diff --git a/jetty-core/jetty-osgi/pom.xml b/jetty-core/jetty-osgi/pom.xml index e5ac3bf1d75d..1f1fde962222 100644 --- a/jetty-core/jetty-osgi/pom.xml +++ b/jetty-core/jetty-osgi/pom.xml @@ -1,54 +1,30 @@ + + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - - 4.0.0 jetty-osgi Core :: OSGi Support for OSGi integration ${project.groupId}.osgi - org.eclipse.jetty.osgi.* true + org.eclipse.jetty.osgi.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.server=org.eclipse.jetty.logging --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.eclipse.jetty.osgi.JettyBootstrapActivator - org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))" - <_nouses>true - - - - - - org.eclipse.jetty - jetty-server + jetty-deploy org.eclipse.jetty - jetty-deploy + jetty-server org.eclipse.platform @@ -75,14 +51,37 @@ slf4j-api - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty + jetty-slf4j-impl test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.toolchain + jetty-test-helper test + + + + + org.apache.felix + maven-bundle-plugin + true + + + org.eclipse.jetty.osgi.JettyBootstrapActivator + org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))" + <_nouses>true + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.server=org.eclipse.jetty.logging --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED + + + + diff --git a/jetty-core/jetty-proxy/pom.xml b/jetty-core/jetty-proxy/pom.xml index be0db49cf2ef..af68ac961870 100644 --- a/jetty-core/jetty-proxy/pom.xml +++ b/jetty-core/jetty-proxy/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - - 4.0.0 jetty-proxy jar Core :: Proxy @@ -16,33 +16,23 @@ ${project.groupId}.proxy - - - - maven-surefire-plugin - - - @{argLine} - ${jetty.surefire.argLine} - --add-exports org.eclipse.jetty.client/org.eclipse.jetty.client.internal=ALL-UNNAMED - - - - - - - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-client org.eclipse.jetty jetty-server + + org.slf4j + slf4j-api + org.eclipse.jetty - jetty-client + jetty-alpn-java-server + test @@ -52,19 +42,27 @@ org.eclipse.jetty.http2 - jetty-http2-server - test - - - org.eclipse.jetty - jetty-alpn-java-server + jetty-http2-client-transport test org.eclipse.jetty.http2 - jetty-http2-client-transport + jetty-http2-server test + + + + maven-surefire-plugin + + @{argLine} + ${jetty.surefire.argLine} + --add-exports org.eclipse.jetty.client/org.eclipse.jetty.client.internal=ALL-UNNAMED + + + + + diff --git a/jetty-core/jetty-quic/jetty-quic-client/pom.xml b/jetty-core/jetty-quic/jetty-quic-client/pom.xml index 3dea38b4ac7d..17f968247518 100644 --- a/jetty-core/jetty-quic/jetty-quic-client/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.quic jetty-quic 12.0.3-SNAPSHOT - - 4.0.0 jetty-quic-client Core :: QUIC :: Client @@ -15,10 +15,6 @@ - - org.slf4j - slf4j-api - org.eclipse.jetty.quic jetty-quic-common @@ -28,23 +24,27 @@ jetty-quic-quiche-jna - org.eclipse.jetty.quic - jetty-quic-server + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl test org.eclipse.jetty.http2 - jetty-http2-server + jetty-http2-client-transport test org.eclipse.jetty.http2 - jetty-http2-client-transport + jetty-http2-server test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.quic + jetty-quic-server test @@ -71,13 +71,11 @@ maven-surefire-plugin - - @{argLine} + @{argLine} ${jetty.surefire.argLine} --add-modules=jdk.incubator.foreign --add-opens jdk.incubator.foreign/jdk.incubator.foreign=ALL-UNNAMED - --enable-native-access ALL-UNNAMED - + --enable-native-access ALL-UNNAMED diff --git a/jetty-core/jetty-quic/jetty-quic-common/pom.xml b/jetty-core/jetty-quic/jetty-quic-common/pom.xml index 1cab0d45f102..7ec29bdcbc01 100644 --- a/jetty-core/jetty-quic/jetty-quic-common/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.quic jetty-quic 12.0.3-SNAPSHOT - - 4.0.0 jetty-quic-common Core :: QUIC :: Common @@ -15,18 +15,18 @@ + - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-io org.eclipse.jetty.quic jetty-quic-quiche-common - - org.eclipse.jetty - jetty-io + org.slf4j + slf4j-api diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml index 863499bd3420..4e00271c21bb 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.quic jetty-quic-quiche 12.0.3-SNAPSHOT - - 4.0.0 jetty-quic-quiche-common Core :: QUIC :: Quiche :: Common @@ -16,10 +16,6 @@ - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-util @@ -28,6 +24,10 @@ org.mortbay.jetty.quiche jetty-quiche-native + + org.slf4j + slf4j-api + org.eclipse.jetty jetty-slf4j-impl diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml index 6c6677971bba..e71e6506f6c6 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.quic jetty-quic-quiche 12.0.3-SNAPSHOT - - 4.0.0 jetty-quic-quiche-foreign-incubator Core :: QUIC :: Quiche :: Foreign (Java 17) @@ -15,6 +15,26 @@ true + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty.quic + jetty-quic-quiche-common + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + @@ -37,37 +57,15 @@ maven-surefire-plugin - - @{argLine} + @{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.quic.quiche.foreign.incubator/org.eclipse.jetty.quic.quiche.foreign.incubator=ALL-UNNAMED - --enable-native-access org.eclipse.jetty.quic.quiche.foreign.incubator - + --enable-native-access org.eclipse.jetty.quic.quiche.foreign.incubator - - - org.slf4j - slf4j-api - - - org.eclipse.jetty.quic - jetty-quic-quiche-common - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - false - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.logging=java.management - - - - - org.apache.felix - maven-bundle-plugin - true - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - osgi.serviceloader;osgi.serviceloader=org.slf4j.spi.SLF4JServiceProvider - - + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.logging=java.management - - - - org.slf4j - slf4j-api - - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - diff --git a/jetty-core/jetty-start/pom.xml b/jetty-core/jetty-start/pom.xml index c1616015ae00..35821214fb83 100644 --- a/jetty-core/jetty-start/pom.xml +++ b/jetty-core/jetty-start/pom.xml @@ -1,39 +1,65 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - 4.0.0 jetty-start Core :: Start The start utility - false ${project.groupId}.start + false org.eclipse.jetty.start.* + + + org.eclipse.jetty + jetty-util + + + org.slf4j + slf4j-api + + + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + - src/main/resources true + src/main/resources - org.codehaus.mojo - buildnumber-maven-plugin + org.apache.maven.plugins + maven-dependency-plugin - create-buildnumber + unpack - create + unpack + process-test-resources - false - false - ${nonCanonicalRevision} + + + org.eclipse.jetty + jetty-util + jar + false + + + ${project.build.directory}/jetty-util + true @@ -53,10 +79,10 @@ maven-shade-plugin - package shade + package false true @@ -84,47 +110,22 @@ - org.apache.maven.plugins - maven-dependency-plugin + org.codehaus.mojo + buildnumber-maven-plugin - unpack - process-test-resources + create-buildnumber - unpack + create - - - org.eclipse.jetty - jetty-util - jar - false - - - ${project.build.directory}/jetty-util - true + false + false + ${nonCanonicalRevision} - - - org.eclipse.jetty - jetty-util - - - org.slf4j - slf4j-api - - - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - diff --git a/jetty-core/jetty-tests/jetty-test-client-transports/pom.xml b/jetty-core/jetty-tests/jetty-test-client-transports/pom.xml index 7f27ee952451..fd8bc1fe9519 100644 --- a/jetty-core/jetty-tests/jetty-test-client-transports/pom.xml +++ b/jetty-core/jetty-tests/jetty-test-client-transports/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-test-client-transports Core :: Tests :: Client Transports @@ -22,6 +22,11 @@ awaitility test + + org.eclipse.jetty + jetty-alpn-java-server + test + org.eclipse.jetty jetty-proxy @@ -29,12 +34,12 @@ org.eclipse.jetty - jetty-unixdomain-server + jetty-slf4j-impl test org.eclipse.jetty - jetty-alpn-java-server + jetty-unixdomain-server test @@ -52,19 +57,14 @@ jetty-http2-server test - - org.eclipse.jetty.http3 - jetty-http3-server - test - org.eclipse.jetty.http3 jetty-http3-client-transport test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.http3 + jetty-http3-server test @@ -80,9 +80,7 @@ maven-surefire-plugin - - @{argLine} --enable-preview - + @{argLine} --enable-preview diff --git a/jetty-core/jetty-tests/pom.xml b/jetty-core/jetty-tests/pom.xml index 54b480c21672..1f8551738cf5 100644 --- a/jetty-core/jetty-tests/pom.xml +++ b/jetty-core/jetty-tests/pom.xml @@ -1,22 +1,22 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - - 4.0.0 jetty-tests - Core :: Tests pom - - - true - + Core :: Tests jetty-test-client-transports + + true + + diff --git a/jetty-core/jetty-unixdomain-server/pom.xml b/jetty-core/jetty-unixdomain-server/pom.xml index 4e8f3ddf5f1d..d30de4eb2e7c 100644 --- a/jetty-core/jetty-unixdomain-server/pom.xml +++ b/jetty-core/jetty-unixdomain-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - - 4.0.0 jetty-unixdomain-server Core :: Unix-Domain Sockets :: Server Jetty Unix-Domain Sockets Server diff --git a/jetty-core/jetty-util-ajax/pom.xml b/jetty-core/jetty-util-ajax/pom.xml index bff31fda19ef..4cfe430c33e0 100644 --- a/jetty-core/jetty-util-ajax/pom.xml +++ b/jetty-core/jetty-util-ajax/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - 4.0.0 jetty-util-ajax Core :: Utilities :: JSON JSON/Ajax Utility classes for Jetty diff --git a/jetty-core/jetty-util/pom.xml b/jetty-core/jetty-util/pom.xml index 762a2b847cbc..3a6f617808e9 100644 --- a/jetty-core/jetty-util/pom.xml +++ b/jetty-core/jetty-util/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - 4.0.0 jetty-util Core :: Utilities Utility classes for Jetty @@ -12,14 +13,66 @@ ${project.groupId}.util org.eclipse.jetty.util.* + + + org.slf4j + slf4j-api + + + com.google.jimfs + jimfs + 1.3.0 + test + + + org.awaitility + awaitility + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-perf-helper + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + - src/main/resources true + src/main/resources + + org.apache.felix + maven-bundle-plugin + true + + + osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.util.security.CredentialProvider)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${session.repositorySession.localRepository.basedir.absolutePath} + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.util=org.eclipse.jetty.logging + + org.codehaus.mojo buildnumber-maven-plugin @@ -41,60 +94,6 @@ - - org.apache.felix - maven-bundle-plugin - true - - - osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.util.security.CredentialProvider)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${session.repositorySession.localRepository.basedir.absolutePath} - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.util=org.eclipse.jetty.logging - - - - - - org.slf4j - slf4j-api - - - com.google.jimfs - jimfs - 1.3.0 - test - - - org.awaitility - awaitility - test - - - org.eclipse.jetty.toolchain - jetty-perf-helper - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml index f519d973e17b..fbc0db453385 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-websocket-core-client Core :: Websocket :: Client @@ -15,10 +15,6 @@ - - org.eclipse.jetty.websocket - jetty-websocket-core-common - org.eclipse.jetty jetty-client @@ -28,6 +24,10 @@ jetty-xml true + + org.eclipse.jetty.websocket + jetty-websocket-core-common + diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml index 16ba14292479..9a3b4467dc79 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-websocket-core-common Core :: Websocket :: Common @@ -17,11 +17,11 @@ org.eclipse.jetty - jetty-io + jetty-http org.eclipse.jetty - jetty-http + jetty-io org.slf4j @@ -39,12 +39,8 @@ Jetty Websocket Core Common * - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"; resolution:=optional - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.core.Extension - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"; resolution:=optional + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.core.Extension diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml index a87e774b1a0e..5a7c733d7239 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-websocket-core-server Core :: Websocket :: Server @@ -15,14 +15,14 @@ - - org.eclipse.jetty.websocket - jetty-websocket-core-common - org.eclipse.jetty jetty-server + + org.eclipse.jetty.websocket + jetty-websocket-core-common + diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml index 9385bdd779f2..3ebfca0611ae 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml @@ -1,20 +1,20 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-websocket-core-tests Core :: Websocket :: Tests - false ${project.groupId}.core.tests - true + false true + true @@ -22,27 +22,17 @@ org.eclipse.jetty.websocket jetty-websocket-core-client - - org.eclipse.jetty.websocket - jetty-websocket-core-server - org.eclipse.jetty.websocket jetty-websocket-core-common - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.testcontainers - testcontainers - test + org.eclipse.jetty.websocket + jetty-websocket-core-server - org.testcontainers - junit-jupiter + com.googlecode.json-simple + json-simple test @@ -62,8 +52,18 @@ - com.googlecode.json-simple - json-simple + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + testcontainers test @@ -77,7 +77,7 @@ - + Jetty Websocket Test Support Classes diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml index 084b323c5a13..7cd6257c76fa 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-websocket-jetty-api Core :: Websocket :: Jetty API diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml index 9126268bcb42..2d438c3d2859 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-websocket-jetty-client Core :: Websocket :: Jetty Client @@ -16,20 +16,20 @@ - org.eclipse.jetty.websocket - jetty-websocket-jetty-api + org.eclipse.jetty + jetty-client org.eclipse.jetty.websocket - jetty-websocket-jetty-common + jetty-websocket-core-client org.eclipse.jetty.websocket - jetty-websocket-core-client + jetty-websocket-jetty-api - org.eclipse.jetty - jetty-client + org.eclipse.jetty.websocket + jetty-websocket-jetty-common org.slf4j diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml index edc2569a593f..969c6e9d94e4 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml @@ -1,18 +1,33 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-websocket-jetty-common Core :: Websocket :: Jetty Common ${project.groupId}.common + + + org.eclipse.jetty.websocket + jetty-websocket-core-common + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + @@ -22,30 +37,11 @@ true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.api.ExtensionConfig$Parser - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.api.ExtensionConfig$Parser - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-api - - - org.eclipse.jetty.websocket - jetty-websocket-core-common - - - org.eclipse.jetty - jetty-slf4j-impl - test - - diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml index 2b636eba9521..a60f9c522282 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-websocket-jetty-server Core :: Websocket :: Jetty Server diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml index 54de7fb41119..02e86aa9f368 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-websocket-jetty-tests Core :: Websocket :: Jetty Tests @@ -18,58 +18,58 @@ - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-alpn-java-server test - org.eclipse.jetty.websocket - jetty-websocket-jetty-api + org.eclipse.jetty + jetty-alpn-server test - org.eclipse.jetty.websocket - jetty-websocket-jetty-client + org.eclipse.jetty + jetty-http-tools test - org.eclipse.jetty.websocket - jetty-websocket-jetty-server + org.eclipse.jetty + jetty-jmx test org.eclipse.jetty - jetty-http-tools + jetty-slf4j-impl test org.eclipse.jetty.http2 - jetty-http2-server + jetty-http2-client-transport test - org.eclipse.jetty - jetty-alpn-server + org.eclipse.jetty.http2 + jetty-http2-server test - org.eclipse.jetty - jetty-alpn-java-server + org.eclipse.jetty.websocket + jetty-websocket-jetty-api test - org.eclipse.jetty.http2 - jetty-http2-client-transport + org.eclipse.jetty.websocket + jetty-websocket-jetty-client test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.websocket + jetty-websocket-jetty-server test - org.eclipse.jetty - jetty-jmx + org.slf4j + slf4j-api test @@ -88,9 +88,7 @@ jetty.websocket Integration Tests - - org.eclipse.jetty.websocket.jetty.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.jetty.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" @@ -99,4 +97,3 @@ - diff --git a/jetty-core/jetty-websocket/pom.xml b/jetty-core/jetty-websocket/pom.xml index d8ce92f3486a..20d3efc98d82 100644 --- a/jetty-core/jetty-websocket/pom.xml +++ b/jetty-core/jetty-websocket/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.websocket jetty-websocket pom diff --git a/jetty-core/jetty-xml/pom.xml b/jetty-core/jetty-xml/pom.xml index 280226b59eed..609c4202b785 100644 --- a/jetty-core/jetty-xml/pom.xml +++ b/jetty-core/jetty-xml/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-SNAPSHOT - 4.0.0 jetty-xml Core :: XML The jetty xml utilities. @@ -12,30 +13,6 @@ ${project.groupId}.xml org.eclipse.jetty.xml.* - - - - org.apache.felix - maven-bundle-plugin - true - - - osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.xml.ConfigurationProcessorFactory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.xml=org.eclipse.jetty.logging - - - - - org.eclipse.jetty @@ -56,4 +33,25 @@ test + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.xml.ConfigurationProcessorFactory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + + + + + org.apache.maven.plugins + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.xml=org.eclipse.jetty.logging + + + + diff --git a/jetty-core/pom.xml b/jetty-core/pom.xml index f9ce0b8b4440..60c5efcd06e9 100644 --- a/jetty-core/pom.xml +++ b/jetty-core/pom.xml @@ -1,28 +1,28 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.3-SNAPSHOT - - 4.0.0 jetty-core - Core pom + Core jetty-alpn jetty-bom jetty-client - jetty-deploy jetty-demos + jetty-deploy jetty-fcgi jetty-http - jetty-http2 - jetty-http3 jetty-http-spi jetty-http-tools + jetty-http2 + jetty-http3 jetty-io jetty-jmx jetty-jndi @@ -32,9 +32,9 @@ jetty-proxy jetty-quic jetty-rewrite + jetty-security jetty-server jetty-session - jetty-security jetty-slf4j-impl jetty-start jetty-tests @@ -71,10 +71,10 @@ core-report - validate dependency-updates-aggregate-report + validate html diff --git a/jetty-ee10/jetty-ee10-annotations/pom.xml b/jetty-ee10/jetty-ee10-annotations/pom.xml index d97bc63c2384..b9abce0d24ed 100644 --- a/jetty-ee10/jetty-ee10-annotations/pom.xml +++ b/jetty-ee10/jetty-ee10-annotations/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-annotations EE10 :: Servlet Annotations Annotation support for deploying servlets in jetty. @@ -14,37 +15,15 @@ org.eclipse.jetty.ee10.annotations.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.ee10.annotations=org.eclipse.jetty.logging - --add-opens org.eclipse.jetty.ee10.annotations/org.eclipse.jetty.ee10.annotations.resources=org.eclipse.jetty.ee10.plus - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},org.objectweb.asm;version="[$(version;==;${asm.version}),$(version;+;${asm.version}))",* - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)", osgi.serviceloader; filter:="(osgi.serviceloader=jakarta.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration - - - - - - - + + jakarta.annotation + jakarta.annotation-api + + + jakarta.servlet + jakarta.servlet-api + org.eclipse.jetty.ee10 jetty-ee10-plus @@ -53,10 +32,6 @@ org.eclipse.jetty.ee10 jetty-ee10-webapp - - jakarta.annotation - jakarta.annotation-api - org.ow2.asm asm @@ -69,20 +44,11 @@ org.slf4j slf4j-api - - jakarta.servlet - jakarta.servlet-api - jakarta.transaction jakarta.transaction-api test - - org.eclipse.jetty.toolchain - jetty-test-helper - test - org.eclipse.jetty jetty-jndi @@ -93,5 +59,35 @@ jetty-slf4j-impl test + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},org.objectweb.asm;version="[$(version;==;${asm.version}),$(version;+;${asm.version}))",* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)", osgi.serviceloader; filter:="(osgi.serviceloader=jakarta.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.ee10.annotations=org.eclipse.jetty.logging + --add-opens org.eclipse.jetty.ee10.annotations/org.eclipse.jetty.ee10.annotations.resources=org.eclipse.jetty.ee10.plus + + + + diff --git a/jetty-ee10/jetty-ee10-apache-jsp/pom.xml b/jetty-ee10/jetty-ee10-apache-jsp/pom.xml index 02a6886b78e1..8ff93c3de1f4 100644 --- a/jetty-ee10/jetty-ee10-apache-jsp/pom.xml +++ b/jetty-ee10/jetty-ee10-apache-jsp/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-apache-jsp EE10 :: Apache JSP @@ -14,6 +15,46 @@ true + + + jakarta.servlet + jakarta.servlet-api + + + org.eclipse.jetty + jetty-util + + + org.mortbay.jasper + apache-jsp + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + @@ -23,14 +64,9 @@ Jetty-specific ServletContainerInitializer for Jasper - - org.eclipse.jetty.ee10.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", org.eclipse.jetty.ee10.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=org.apache.juli.logging.Log - + org.eclipse.jetty.ee10.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", org.eclipse.jetty.ee10.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=org.apache.juli.logging.Log <_nouses>true @@ -56,44 +92,4 @@ - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-util - - - org.mortbay.jasper - apache-jsp - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - test - - - jakarta.servlet - jakarta.servlet-api - - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - - diff --git a/jetty-ee10/jetty-ee10-bom/pom.xml b/jetty-ee10/jetty-ee10-bom/pom.xml index 976cfeefa25b..aacc5868c2be 100644 --- a/jetty-ee10/jetty-ee10-bom/pom.xml +++ b/jetty-ee10/jetty-ee10-bom/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -8,34 +9,9 @@ jetty-ee10-bom + pom EE10 :: BOM Jetty EE10 APIs BOM artifact - pom - - - - - org.codehaus.mojo - flatten-maven-plugin - - - flatten - - flatten - - process-resources - - - flatten-clean - - clean - - clean - - - - - @@ -172,4 +148,29 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + flatten-clean + + clean + + clean + + + flatten + + flatten + + process-resources + + + + + diff --git a/jetty-ee10/jetty-ee10-cdi/pom.xml b/jetty-ee10/jetty-ee10-cdi/pom.xml index 259319c661ba..6cc916dec169 100644 --- a/jetty-ee10/jetty-ee10-cdi/pom.xml +++ b/jetty-ee10/jetty-ee10-cdi/pom.xml @@ -1,13 +1,14 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - 4.0.0 jetty-ee10-cdi - EE10 :: CDI jar + EE10 :: CDI ${project.groupId}.cdi @@ -19,12 +20,12 @@ org.eclipse.jetty.ee10 - jetty-ee10-webapp + jetty-ee10-annotations compile org.eclipse.jetty.ee10 - jetty-ee10-annotations + jetty-ee10-webapp compile @@ -34,19 +35,15 @@ - + org.apache.felix maven-bundle-plugin true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration, - osgi.serviceloader; osgi.serviceloader=jakarta.servlet.ServletContainerInitializer - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration, + osgi.serviceloader; osgi.serviceloader=jakarta.servlet.ServletContainerInitializer @@ -56,7 +53,7 @@ ${maven.surefire.plugin.version} --add-opens java.base/java.lang=ALL-UNNAMED - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml index e2a6c6724a74..59934b061f87 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-demo-async-rest-jar jar EE10 :: Demo :: Async Rest :: Jar diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml index 68735b180d88..f342068e4147 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-demo-async-rest-server jar EE10 :: Demo :: Async Rest :: Server diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml index c2dd417e8616..17a0379f4574 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml @@ -1,20 +1,17 @@ + + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-demo-async-rest-webapp war EE10 :: Demo :: Async Rest :: WebApp - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-slf4j-impl @@ -24,6 +21,10 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest-jar + + org.slf4j + slf4j-api + jakarta.servlet jakarta.servlet-api diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml index 06d83da355c9..87c2f6391c9d 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml @@ -1,19 +1,20 @@ + + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demos 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-demo-async-rest pom EE10 :: Demo :: Async Rest jetty-ee10-demo-async-rest-jar - jetty-ee10-demo-async-rest-webapp jetty-ee10-demo-async-rest-server + jetty-ee10-demo-async-rest-webapp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml index 9bf84ab9e7f4..866bfba1c5bd 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demos 12.0.3-SNAPSHOT - 4.0.0 jetty-ee10-demo-embedded EE10 :: Demo :: Embedded Jetty Embedded Jetty Demos @@ -13,82 +14,54 @@ - org.slf4j - slf4j-api + jakarta.transaction + jakarta.transaction-api + compile org.eclipse.jetty - jetty-slf4j-impl - runtime + jetty-alpn-conscrypt-server org.eclipse.jetty - jetty-util-ajax - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - - - org.eclipse.jetty.ee10 - jetty-ee10-servlets + jetty-alpn-java-server org.eclipse.jetty - jetty-deploy + jetty-alpn-server + ${project.version} org.eclipse.jetty - jetty-rewrite + jetty-deploy org.eclipse.jetty jetty-jmx - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-server - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-servlet - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server - - - org.eclipse.jetty.http2 - jetty-http2-server - org.eclipse.jetty - jetty-alpn-server - ${project.version} + jetty-rewrite org.eclipse.jetty - jetty-alpn-java-server + jetty-security org.eclipse.jetty - jetty-alpn-conscrypt-server + jetty-util-ajax org.eclipse.jetty.ee10 jetty-ee10-annotations - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources - org.eclipse.jetty.ee10 - jetty-ee10-proxy + jetty-ee10-apache-jsp - org.eclipse.jetty - jetty-security + org.eclipse.jetty.ee10 + jetty-ee10-glassfish-jstl org.eclipse.jetty.ee10 @@ -96,26 +69,21 @@ org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp + jetty-ee10-proxy org.eclipse.jetty.ee10 - jetty-ee10-glassfish-jstl - - - jakarta.transaction - jakarta.transaction-api - compile + jetty-ee10-servlets - org.eclipse.jetty.toolchain - jetty-test-helper - test + org.eclipse.jetty.ee10 + jetty-ee10-webapp - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - test + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-async-rest-webapp + ${project.version} + war org.eclipse.jetty.ee10.demos @@ -129,6 +97,10 @@ ${project.version} war + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + org.eclipse.jetty.ee10.demos jetty-ee10-demo-simple-webapp @@ -142,10 +114,39 @@ war - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-async-rest-webapp - ${project.version} - war + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-servlet + + + org.eclipse.jetty.http2 + jetty-http2-server + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + runtime + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + test diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml index 415be50809b1..811936bda49d 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml @@ -7,13 +7,13 @@ 12.0.3-SNAPSHOT jetty-ee10-demo-jaas-webapp - EE10 :: Demo :: JAAS WebApp war + EE10 :: Demo :: JAAS WebApp ${project.groupId}.jaas - - /ee10-demo-jetty - - .,WEB-INF/classes - ee10 - - - - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - - - org.eclipse.jetty - jetty-maven-plugin - ${project.version} - - - org.eclipse.jetty - jetty-client - ${project.version} - - - org.eclipse.jetty.ee10 - jetty-servlets - ${project.version} - - - - 8087 - foo - 1 - - 222 - - - /test - ${project.build.directory}/work - - - - Test Realm - src/test/resources/test-realm.properties - - - - - - - - org.eclipse.jetty.ee10 - jetty-ee10-servlets + jakarta.annotation + jakarta.annotation-api provided @@ -136,26 +23,6 @@ jakarta.servlet-api provided - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - test - - - org.eclipse.jetty - jetty-jmx - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-server - provided - jakarta.servlet.jsp jakarta.servlet.jsp-api @@ -166,11 +33,6 @@ jakarta.servlet.jsp.jstl-api provided - - jakarta.annotation - jakarta.annotation-api - provided - jakarta.websocket jakarta.websocket-api @@ -182,8 +44,13 @@ provided - org.eclipse.jetty.websocket - jetty-websocket-jetty-api + org.eclipse.jetty + jetty-server + provided + + + org.eclipse.jetty.ee10 + jetty-ee10-servlets provided @@ -191,10 +58,143 @@ jetty-ee10-websocket-jetty-server provided + + org.eclipse.jetty.websocket + jetty-websocket-jetty-api + provided + + + org.eclipse.jetty + jetty-jmx + test + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + test + org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-jakarta-server test + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${project.version} + + 8087 + foo + 1 + + 222 + + + /test + ${project.build.directory}/work + + + + Test Realm + src/test/resources/test-realm.properties + + + + + + org.eclipse.jetty + jetty-client + ${project.version} + + + org.eclipse.jetty.ee10 + jetty-servlets + ${project.version} + + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + war + + + jakarta.servlet.jsp.*;version="[3,4)",org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",* + !org.example* + + /ee10-demo-jetty + + .,WEB-INF/classes + ee10 + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + web-bundle-assembly + + single + + package + + + src/main/assembly/web-bundle.xml + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/WebAppTest.java + **/Test*.java + + + + + test + test + + + + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml index dbee8fcaece9..e967b1fc54de 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml @@ -7,32 +7,73 @@ 12.0.3-SNAPSHOT jetty-ee10-demo-jndi-webapp - EE10 :: Demo :: JNDI WebApp war + EE10 :: Demo :: JNDI WebApp ${project.groupId}.jndi + + + jakarta.servlet + jakarta.servlet-api + provided + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + provided + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${project.version} + + ${project.build.directory}/plugin-context.xml + + src/main/webapp + src/main/webapp/WEB-INF/web.xml + /test-jndi + + + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + ${project.version} + + + + + maven-antrun-plugin generate-xml-files + + run + process-resources - + - + - - run - @@ -41,10 +82,10 @@ maven-dependency-plugin - package copy-dependencies + package jakarta.transaction-api,ee10-demo-mock-resources ${project.build.directory}/lib/jndi @@ -53,46 +94,5 @@ - - - - org.eclipse.jetty - jetty-maven-plugin - ${project.version} - - ${project.build.directory}/plugin-context.xml - - src/main/webapp - src/main/webapp/WEB-INF/web.xml - /test-jndi - - - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources - ${project.version} - - - - - - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources - provided - - - jakarta.transaction - jakarta.transaction-api - provided - - - jakarta.servlet - jakarta.servlet-api - provided - - diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml index 6dc9e8cb706a..08d54891c6be 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml @@ -1,20 +1,38 @@ + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demos 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-demo-jsp-webapp - EE10 :: Demo :: JSP WebApp war + EE10 :: Demo :: JSP WebApp ${project.groupId}.jsp + + + jakarta.servlet + jakarta.servlet-api + provided + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + provided + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided + + + @@ -34,24 +52,15 @@ - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - maven-assembly-plugin web-bundle-assembly - package single + package src/main/assembly/web-bundle.xml @@ -63,32 +72,30 @@ + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + - - - jakarta.servlet - jakarta.servlet-api - provided - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided - - - precompile-jsp + + org.apache.maven.plugins + maven-war-plugin + + ${basedir}/target/web.xml + + org.eclipse.jetty jetty-jspc-maven-plugin @@ -110,13 +117,6 @@ - - org.apache.maven.plugins - maven-war-plugin - - ${basedir}/target/web.xml - - diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml index 95b95c541e3b..430d327de575 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -5,12 +6,29 @@ jetty-ee10-demos 12.0.3-SNAPSHOT - EE10 :: Demo :: Mock Resources jetty-ee10-demo-mock-resources jar + EE10 :: Demo :: Mock Resources ${project.groupId}.mocks + + + jakarta.mail + jakarta.mail-api + provided + + + jakarta.servlet + jakarta.servlet-api + provided + + + jakarta.transaction + jakarta.transaction-api + provided + + @@ -20,33 +38,12 @@ org.eclipse.jetty.ee10.demos.demo-mock-resources Mock resources used for testing - - org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - javax.sql, jakarta.transaction;version="2.0.0" - + org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + javax.sql, jakarta.transaction;version="2.0.0" <_nouses>true - - - jakarta.transaction - jakarta.transaction-api - provided - - - jakarta.servlet - jakarta.servlet-api - provided - - - jakarta.mail - jakarta.mail-api - provided - - diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml index d9df25db1ca2..7b1bac86f9a8 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml @@ -1,33 +1,21 @@ + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demos 12.0.3-SNAPSHOT - 4.0.0 jetty-ee10-demo-proxy-webapp - EE10 :: Demo :: Proxy WebApp war + EE10 :: Demo :: Proxy WebApp ${project.groupId}.proxy - - - - maven-war-plugin - - - src/main/webapp/META-INF/MANIFEST.MF - - - - - - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-client org.eclipse.jetty @@ -38,24 +26,24 @@ org.eclipse.jetty.ee10 jetty-ee10-proxy + + org.slf4j + slf4j-api + jakarta.servlet jakarta.servlet-api provided - org.eclipse.jetty.ee10 - jetty-ee10-webapp - test - - - org.eclipse.jetty - jetty-client + jakarta.servlet.jsp + jakarta.servlet.jsp-api + provided - org.eclipse.jetty - jetty-jmx - test + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided org.eclipse.jetty @@ -63,13 +51,13 @@ provided - org.eclipse.jetty.http2 - jetty-http2-server + org.eclipse.jetty + jetty-alpn-java-server test org.eclipse.jetty - jetty-alpn-java-server + jetty-jmx test @@ -78,14 +66,26 @@ test - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided + org.eclipse.jetty.ee10 + jetty-ee10-webapp + test - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided + org.eclipse.jetty.http2 + jetty-http2-server + test + + + + maven-war-plugin + + + src/main/webapp/META-INF/MANIFEST.MF + + + + + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-simple-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-simple-webapp/pom.xml index abfbe40009f3..0aadc90c51b5 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-simple-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-simple-webapp/pom.xml @@ -1,15 +1,15 @@ + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demos 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-demo-simple-webapp - EE10 :: Demo :: Simple WebApp war + EE10 :: Demo :: Simple WebApp ${project.groupId}.simple diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml index 3de439ac436e..2c851f372292 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -12,6 +13,13 @@ ${project.groupId}.sci + + + jakarta.servlet + jakarta.servlet-api + provided + + @@ -31,11 +39,4 @@ - - - jakarta.servlet - jakarta.servlet-api - provided - - diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml index aedcc125b3cc..d1ddbf62348d 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml @@ -7,53 +7,99 @@ 12.0.3-SNAPSHOT ../../pom.xml - EE10 :: Demo :: Servlet Spec :: WebApp jetty-ee10-demo-spec-webapp war + EE10 :: Demo :: Servlet Spec :: WebApp ${project.groupId}.spec.webapp + + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-container-initializer + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-web-fragment + + + jakarta.annotation + jakarta.annotation-api + provided + + + jakarta.servlet + jakarta.servlet-api + provided + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee10 + jetty-ee10-annotations + test + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + test + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + test + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${project.version} + + 10 + ${project.build.directory}/plugin-context.xml + + src/main/webapp + src/main/webapp/WEB-INF/web.xml + /test-spec + .*/jakarta.servlet-api-[^/]*\.jar$ + true + ${basedir}/src/main/webapp/WEB-INF/jetty-env.xml + + + + Test Realm + src/etc/realm.properties + + + + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + ${project.version} + + + + + - - org.apache.maven.plugins - maven-assembly-plugin - - - web-bundle-assembly - package - - single - - - - src/main/assembly/web-bundle.xml - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - target - - plugin-context.xml - - META-INF - - - - org.apache.felix @@ -65,10 +111,8 @@ Test Webapp for Servlet 6.0 Features - - jakarta.transaction*;version="2.0.0", jakarta.servlet*;version="[6,7)", org.eclipse.jetty*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.eclipse.jetty.webapp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", org.eclipse.jetty.plus.jndi;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", * - - <_nouses /> + jakarta.transaction*;version="2.0.0", jakarta.servlet*;version="[6,7)", org.eclipse.jetty*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.eclipse.jetty.webapp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", org.eclipse.jetty.plus.jndi;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", * + <_nouses> org.example.test;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}";-noimport:=true /ee10-demo-spec .,WEB-INF/classes,WEB-INF/lib @@ -83,20 +127,41 @@ generate-xml-files + + run + process-resources - + - + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + web-bundle-assembly - run + single + package + + + src/main/assembly/web-bundle.xml + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + @@ -105,62 +170,62 @@ maven-dependency-plugin - package + unpack-jetty-ee10-demo-container-initializer copy + process-test-resources org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources - ${project.version} + jetty-ee10-demo-container-initializer jar - ** - true - ${project.build.directory}/lib/jndi + false + ${project.build.directory}/ + jetty-ee10-demo-container-initializer.jar + true - unpack-jetty-ee10-demo-container-initializer - process-test-resources + unpack-jetty-ee10-demo-web-fragment copy + process-test-resources org.eclipse.jetty.ee10.demos - jetty-ee10-demo-container-initializer + jetty-ee10-demo-web-fragment jar false ${project.build.directory}/ - jetty-ee10-demo-container-initializer.jar + jetty-ee10-demo-web-fragment.jar true - unpack-jetty-ee10-demo-web-fragment - process-test-resources copy + package org.eclipse.jetty.ee10.demos - jetty-ee10-demo-web-fragment + jetty-ee10-demo-mock-resources + ${project.version} jar - false - ${project.build.directory}/ - jetty-ee10-demo-web-fragment.jar + ** + true + ${project.build.directory}/lib/jndi - true @@ -186,91 +251,24 @@ + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + target + + plugin-context.xml + + META-INF + + + + - - - - org.eclipse.jetty - jetty-maven-plugin - ${project.version} - - 10 - ${project.build.directory}/plugin-context.xml - - src/main/webapp - src/main/webapp/WEB-INF/web.xml - /test-spec - .*/jakarta.servlet-api-[^/]*\.jar$ - true - ${basedir}/src/main/webapp/WEB-INF/jetty-env.xml - - - - Test Realm - src/etc/realm.properties - - - - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources - ${project.version} - - - - - - - - - jakarta.transaction - jakarta.transaction-api - provided - - - jakarta.servlet - jakarta.servlet-api - provided - - - jakarta.annotation - jakarta.annotation-api - provided - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-web-fragment - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-container-initializer - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - test - - - org.eclipse.jetty.ee10 - jetty-ee10-annotations - test - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources - test - - - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml index 39fc3bc47ea3..9e50ae48fafc 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -6,11 +7,11 @@ 12.0.3-SNAPSHOT ../../pom.xml - - EE10 :: Demo :: Servlet Spec :: Fragment Jar jetty-ee10-demo-web-fragment jar + EE10 :: Demo :: Servlet Spec :: Fragment Jar + ${project.groupId}.spec.fragment diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/pom.xml index c57b6f8d5318..a1439757adff 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/pom.xml @@ -6,13 +6,13 @@ jetty-ee10-demos 12.0.3-SNAPSHOT - EE10 :: Demo :: Servlet Spec jetty-ee10-demo-spec pom + EE10 :: Demo :: Servlet Spec - jetty-ee10-demo-spec-webapp jetty-ee10-demo-container-initializer + jetty-ee10-demo-spec-webapp jetty-ee10-demo-web-fragment diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/pom.xml index d2a62638796e..181935df6fee 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/pom.xml @@ -1,19 +1,19 @@ + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demos 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-demo-template - EE10 :: Demo :: Template jar + EE10 :: Demo :: Template - + org.apache.maven.plugins maven-jar-plugin diff --git a/jetty-ee10/jetty-ee10-demos/pom.xml b/jetty-ee10/jetty-ee10-demos/pom.xml index d28208ae0373..dbbeaf49e538 100644 --- a/jetty-ee10/jetty-ee10-demos/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/pom.xml @@ -1,16 +1,30 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demos - EE10 :: Demos pom + EE10 :: Demos + + + jetty-ee10-demo-async-rest + jetty-ee10-demo-embedded + jetty-ee10-demo-jaas-webapp + jetty-ee10-demo-jetty-webapp + jetty-ee10-demo-jndi-webapp + jetty-ee10-demo-jsp-webapp + jetty-ee10-demo-mock-resources + jetty-ee10-demo-proxy-webapp + jetty-ee10-demo-simple-webapp + jetty-ee10-demo-spec + jetty-ee10-demo-template + true @@ -28,18 +42,4 @@ - - - jetty-ee10-demo-async-rest - jetty-ee10-demo-jaas-webapp - jetty-ee10-demo-jndi-webapp - jetty-ee10-demo-jetty-webapp - jetty-ee10-demo-proxy-webapp - jetty-ee10-demo-simple-webapp - jetty-ee10-demo-jsp-webapp - jetty-ee10-demo-mock-resources - jetty-ee10-demo-spec - jetty-ee10-demo-template - jetty-ee10-demo-embedded - diff --git a/jetty-ee10/jetty-ee10-examples/pom.xml b/jetty-ee10/jetty-ee10-examples/pom.xml index df7eaba3f6f4..002970d2d301 100644 --- a/jetty-ee10/jetty-ee10-examples/pom.xml +++ b/jetty-ee10/jetty-ee10-examples/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-examples EE10 :: Examples @@ -17,11 +17,11 @@ org.eclipse.jetty - jetty-server + jetty-http org.eclipse.jetty - jetty-http + jetty-server org.eclipse.jetty.ee10 diff --git a/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml b/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml index a10a72aa0e27..221bee3f807f 100644 --- a/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml +++ b/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-fcgi-proxy EE10 :: FCGI Proxy @@ -15,11 +15,6 @@ - - jakarta.servlet - jakarta.servlet-api - provided - org.eclipse.jetty jetty-server @@ -32,17 +27,22 @@ org.eclipse.jetty.fcgi jetty-fcgi-client - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - test + jakarta.servlet + jakarta.servlet-api + provided org.eclipse.jetty jetty-slf4j-impl test + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + test + diff --git a/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml b/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml index 99f7fb878dce..42a0641f075c 100644 --- a/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml +++ b/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml @@ -1,31 +1,20 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - 4.0.0 jetty-ee10-glassfish-jstl + jar EE10 :: Glassfish JSTL https://projects.eclipse.org/projects/ee4j.glassfish - jar ${project.groupId}.glassfish.jstl true - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - - - - @@ -33,20 +22,14 @@ jakarta.servlet.jsp.jstl-api - - org.glassfish.web - jakarta.servlet.jsp.jstl - - org.eclipse.jetty.ee10 jetty-ee10-apache-jsp - org.eclipse.jetty.toolchain - jetty-test-helper - test + org.glassfish.web + jakarta.servlet.jsp.jstl @@ -61,6 +44,12 @@ test + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + org.slf4j slf4j-simple @@ -69,4 +58,16 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + + + + + diff --git a/jetty-ee10/jetty-ee10-home/pom.xml b/jetty-ee10/jetty-ee10-home/pom.xml index 315a51fd1969..c487eda5e828 100644 --- a/jetty-ee10/jetty-ee10-home/pom.xml +++ b/jetty-ee10/jetty-ee10-home/pom.xml @@ -1,15 +1,15 @@ + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT ../pom.xml - 4.0.0 jetty-ee10-home - EE10 :: Home Assembly pom + EE10 :: Home Assembly ${basedir}/target/jetty-ee10-home @@ -17,369 +17,555 @@ true + + + org.eclipse.jetty + jetty-openid + true + + + org.eclipse.jetty + jetty-security + true + + + org.eclipse.jetty.ee10 + jetty-ee10-annotations + + + org.eclipse.jetty.ee10 + jetty-ee10-apache-jsp + + + org.eclipse.jetty.ee10 + jetty-ee10-cdi + true + + + org.eclipse.jetty.ee10 + jetty-ee10-fcgi-proxy + true + + + org.eclipse.jetty.ee10 + jetty-ee10-glassfish-jstl + + + jakarta.el + jakarta.el-api + + + javax.el + el-api + + + + + org.eclipse.jetty.ee10 + jetty-ee10-jaspi + true + + + org.eclipse.jetty.ee10 + jetty-ee10-jndi + true + + + org.eclipse.jetty.ee10 + jetty-ee10-plus + + + org.eclipse.jetty.ee10 + jetty-ee10-proxy + + + + + org.eclipse.jetty.ee10 + jetty-ee10-quickstart + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + + + org.eclipse.jetty.ee10 + jetty-ee10-servlets + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-async-rest-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-jaas-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-jetty-webapp + ${project.version} + config + jar + true + + + javax.el + el-api + + + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-jndi-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-jsp-webapp + ${project.version} + config + jar + true + + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-proxy-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-simple-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-spec-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-client-webapp + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-servlet + + + org.ow2.asm + asm + + + org.ow2.asm + asm-analysis + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-tree + + + org.apache.maven.plugins - maven-dependency-plugin + maven-assembly-plugin + + posix + false + - unpack-config-deps - generate-resources + binary - unpack-dependencies + single + package - - org.eclipse.jetty.ee10, org.eclipse.jetty.ee10.demos - - - config - false - META-INF/**,webapps/**,start.d/**,start.ini - ${assembly-directory} + + src/main/assembly/jetty-assembly.xml + - copy-lib-core-websocket-deps - generate-resources + sources - copy-dependencies + single + package - org.eclipse.jetty.websocket - jar - ${assembly-directory}/lib + + src/main/assembly/jetty-source-assembly.xml + + true + + + + org.apache.maven.plugins + maven-dependency-plugin + - copy-lib-ee10-websocket-deps - generate-resources + copy-ee10-annotations-deps copy-dependencies + generate-resources - org.eclipse.jetty.ee10.websocket + jakarta.annotation,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis jar - ${assembly-directory}/lib/ee10-websocket + ${assembly-directory}/lib/ee10-annotations - copy-lib-core-websocket-src-deps - generate-resources + copy-ee10-annotations-src-deps copy-dependencies + generate-resources - org.eclipse.jetty.websocket + jakarta.annotation,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis jar sources - ${source-assembly-directory}/lib + ${source-assembly-directory}/lib/ee10-annotations + - copy-lib-ee10-websocket-src-deps - generate-resources + copy-ee10-deps copy-dependencies + generate-resources - org.eclipse.jetty.ee10.websocket - jar - sources - ${source-assembly-directory}/lib/ee10-websocket + org.eclipse.jetty.ee10 + jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server,jetty-websocket-jetty-api,jetty-websocket-jetty-client,jetty-websocket-jetty-common,jetty-websocket-jetty-server + org.eclipse.jetty.ee10.demos,org.eclipse.jetty.ee10.websocket + jar + ${assembly-directory}/lib - copy-ee10-lib-jakarta-websocket-deps - generate-resources + copy-ee10-jaspi-deps copy-dependencies + generate-resources - jakarta.websocket + jakarta.authentication + jakarta.authentication-api jar - ${assembly-directory}/lib/ee10-websocket + ${assembly-directory}/lib/ee10-jaspi - copy-ee10-lib-jakarta-websocket-src-deps - generate-resources + copy-ee10-jaspi-src-deps copy-dependencies + generate-resources - jakarta.websocket + jakarta.authentication + jakarta.authentication-api jar sources - ${source-assembly-directory}/lib/ee10-websocket + ${source-assembly-directory}/lib/ee10-jaspi - copy-lib-servlet-api-deps - generate-resources + copy-ee10-jsp-deps - copy + copy-dependencies + generate-resources - - - jakarta.servlet - jakarta.servlet-api - ${jakarta.servlet.api.version} - - - ${assembly-directory}/lib + true + jakarta.servlet.jsp,jakarta.el,org.mortbay.jasper,org.eclipse.jdt + jakarta.servlet.jsp-api,jakarta.el-api,apache-el,apache-jsp,ecj + jar + ${assembly-directory}/lib/ee10-apache-jsp - copy-lib-servlet-api-src-deps - generate-resources + copy-ee10-jsp-src-deps - copy + copy-dependencies + generate-resources - - - jakarta.servlet - jakarta.servlet-api - ${jakarta.servlet.api.version} - sources - - - ${source-assembly-directory}/lib + true + jakarta.servlet.jsp,jakart.el,org.mortbay.jasper,org.eclipse.jdt + jakart.servlet.jsp-api,jakarta.el-api,apache-el,apache-jsp,ecj + jar + sources + ${source-assembly-directory}/lib/ee10-apache-jsp - copy-lib-transaction-api-deps - generate-resources + copy-ee10-jstl-deps - copy + copy-dependencies + generate-resources - - - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} - - - jakarta.interceptor - jakarta.interceptor-api - ${jakarta.interceptor.api.version} - - - jakarta.enterprise - jakarta.enterprise.cdi-api - ${jakarta.enterprise.cdi.api.version} - - - jakarta.inject - jakarta.inject-api - ${jakarta.inject.api.version} - - - jakarta.enterprise - jakarta.enterprise.lang-model - ${jakarta.enterprise.lang.model.version} - - - ${assembly-directory}/lib + true + jakarta.servlet.jsp.jstl,org.glassfish.web + jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl + jar + ${assembly-directory}/lib/ee10-glassfish-jstl - - copy-lib-transaction-api-src-deps - generate-resources + copy-ee10-jstl-src-deps - copy + copy-dependencies + generate-resources - - - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} - sources - - - ${source-assembly-directory}/lib + true + jakarta.servlet.jsp.jstl,org.glassfish.web + jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl + jar + sources + ${source-assembly-directory}/lib/ee10-glassfish-jstl - copy-ee10-annotations-deps - generate-resources + copy-ee10-lib-jakarta-websocket-deps copy-dependencies + generate-resources - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + jakarta.websocket jar - ${assembly-directory}/lib/ee10-annotations + ${assembly-directory}/lib/ee10-websocket - copy-ee10-annotations-src-deps - generate-resources + copy-ee10-lib-jakarta-websocket-src-deps copy-dependencies + generate-resources - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + jakarta.websocket jar sources - ${source-assembly-directory}/lib/ee10-annotations + ${source-assembly-directory}/lib/ee10-websocket - copy-ee10-jsp-src-deps - generate-resources + copy-ee10-src-deps copy-dependencies + generate-resources - true - jakarta.servlet.jsp,jakart.el,org.mortbay.jasper,org.eclipse.jdt - jakart.servlet.jsp-api,jakarta.el-api,apache-el,apache-jsp,ecj + org.eclipse.jetty.ee10 jar + org.eclipse.jetty.ee10.demos,org.eclipse.jetty.ee10.websocket sources - ${source-assembly-directory}/lib/ee10-apache-jsp + ${source-assembly-directory}/lib - copy-ee10-jsp-deps - generate-resources + copy-lib-core-websocket-deps copy-dependencies + generate-resources - true - jakarta.servlet.jsp,jakarta.el,org.mortbay.jasper,org.eclipse.jdt - jakarta.servlet.jsp-api,jakarta.el-api,apache-el,apache-jsp,ecj + org.eclipse.jetty.websocket jar - ${assembly-directory}/lib/ee10-apache-jsp + ${assembly-directory}/lib - copy-ee10-jstl-src-deps - generate-resources + copy-lib-core-websocket-src-deps copy-dependencies + generate-resources - true - jakarta.servlet.jsp.jstl,org.glassfish.web - jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl + org.eclipse.jetty.websocket jar sources - ${source-assembly-directory}/lib/ee10-glassfish-jstl + ${source-assembly-directory}/lib - copy-ee10-jstl-deps - generate-resources + copy-lib-ee10-websocket-deps copy-dependencies + generate-resources - true - jakarta.servlet.jsp.jstl,org.glassfish.web - jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl + org.eclipse.jetty.ee10.websocket jar - ${assembly-directory}/lib/ee10-glassfish-jstl + ${assembly-directory}/lib/ee10-websocket - copy-ee10-jaspi-deps - generate-resources + copy-lib-ee10-websocket-src-deps copy-dependencies + generate-resources - jakarta.authentication - jakarta.authentication-api + org.eclipse.jetty.ee10.websocket jar - ${assembly-directory}/lib/ee10-jaspi + sources + ${source-assembly-directory}/lib/ee10-websocket - copy-ee10-jaspi-src-deps - generate-resources + copy-lib-servlet-api-deps - copy-dependencies + copy + generate-resources - jakarta.authentication - jakarta.authentication-api - jar - sources - ${source-assembly-directory}/lib/ee10-jaspi + + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.api.version} + + + ${assembly-directory}/lib - - copy-ee10-deps - generate-resources + copy-lib-servlet-api-src-deps - copy-dependencies + copy + generate-resources - org.eclipse.jetty.ee10 - jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server,jetty-websocket-jetty-api,jetty-websocket-jetty-client,jetty-websocket-jetty-common,jetty-websocket-jetty-server - org.eclipse.jetty.ee10.demos,org.eclipse.jetty.ee10.websocket - jar - ${assembly-directory}/lib + + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.api.version} + sources + + + ${source-assembly-directory}/lib - copy-ee10-src-deps - generate-resources + copy-lib-transaction-api-deps - copy-dependencies + copy + generate-resources - org.eclipse.jetty.ee10 - jar - org.eclipse.jetty.ee10.demos,org.eclipse.jetty.ee10.websocket - sources - ${source-assembly-directory}/lib + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + + + jakarta.interceptor + jakarta.interceptor-api + ${jakarta.interceptor.api.version} + + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${jakarta.enterprise.cdi.api.version} + + + jakarta.inject + jakarta.inject-api + ${jakarta.inject.api.version} + + + jakarta.enterprise + jakarta.enterprise.lang-model + ${jakarta.enterprise.lang.model.version} + + + ${assembly-directory}/lib - - - - org.apache.maven.plugins - maven-assembly-plugin - - posix - false - - + - binary - package + copy-lib-transaction-api-src-deps - single + copy + generate-resources - - src/main/assembly/jetty-assembly.xml - + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + sources + + + ${source-assembly-directory}/lib - sources - package + unpack-config-deps - single + unpack-dependencies + generate-resources - - src/main/assembly/jetty-source-assembly.xml - - true + org.eclipse.jetty.ee10, org.eclipse.jetty.ee10.demos + + config + false + META-INF/**,webapps/**,start.d/**,start.ini + ${assembly-directory} @@ -387,192 +573,4 @@ - - - org.ow2.asm - asm - - - org.ow2.asm - asm-commons - - - org.ow2.asm - asm-tree - - - org.ow2.asm - asm-analysis - - - - - org.eclipse.jetty.ee10 - jetty-ee10-quickstart - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - - - org.eclipse.jetty.ee10 - jetty-ee10-servlets - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-servlet - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-client-webapp - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-server - - - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp - - - org.eclipse.jetty.ee10 - jetty-ee10-glassfish-jstl - - - javax.el - el-api - - - jakarta.el - jakarta.el-api - - - - - org.eclipse.jetty.ee10 - jetty-ee10-plus - - - org.eclipse.jetty.ee10 - jetty-ee10-proxy - - - org.eclipse.jetty.ee10 - jetty-ee10-cdi - true - - - org.eclipse.jetty - jetty-security - true - - - org.eclipse.jetty.ee10 - jetty-ee10-annotations - - - org.eclipse.jetty - jetty-openid - true - - - org.eclipse.jetty.ee10 - jetty-ee10-jaspi - true - - - org.eclipse.jetty.ee10 - jetty-ee10-jndi - true - - - org.eclipse.jetty.ee10 - jetty-ee10-fcgi-proxy - true - - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jetty-webapp - ${project.version} - config - jar - true - - - javax.el - el-api - - - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jaas-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jndi-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-spec-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-async-rest-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-proxy-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-simple-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jsp-webapp - ${project.version} - config - jar - true - - - diff --git a/jetty-ee10/jetty-ee10-jaspi/pom.xml b/jetty-ee10/jetty-ee10-jaspi/pom.xml index 03563af3b667..995faeef92bc 100644 --- a/jetty-ee10/jetty-ee10-jaspi/pom.xml +++ b/jetty-ee10/jetty-ee10-jaspi/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-jaspi EE10 :: JASPI Jetty security infrastructure @@ -15,29 +16,6 @@ org.eclipse.jetty.ee10.security.jaspi.* - - - - org.apache.felix - maven-bundle-plugin - true - - - - manifest - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee10.servlet.security.Authenticator$Factory - - - - - - - - jakarta.authentication @@ -55,6 +33,11 @@ org.slf4j slf4j-api + + jakarta.activation + jakarta.activation-api + test + org.eclipse.jetty jetty-slf4j-impl @@ -65,10 +48,28 @@ jetty-test-helper test - - jakarta.activation - jakarta.activation-api - test - + + + + + org.apache.felix + maven-bundle-plugin + true + + + + manifest + + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee10.servlet.security.Authenticator$Factory + + + + + + + diff --git a/jetty-ee10/jetty-ee10-jndi/pom.xml b/jetty-ee10/jetty-ee10-jndi/pom.xml index 23464c15a9bb..087ce74f4bde 100644 --- a/jetty-ee10/jetty-ee10-jndi/pom.xml +++ b/jetty-ee10/jetty-ee10-jndi/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-jndi EE10 :: JNDI EE10 JNDI factories @@ -15,26 +16,7 @@ org.eclipse.jetty.ee10.jndi.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* - - - - - - - - org.eclipse.jetty - jetty-jndi - jakarta.activation jakarta.activation-api @@ -45,6 +27,10 @@ jakarta.mail-api true + + org.eclipse.jetty + jetty-jndi + org.slf4j slf4j-api @@ -60,4 +46,19 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* + + + + + diff --git a/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml b/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml index b10048bad51b..4e4c6f617717 100644 --- a/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml +++ b/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - 4.0.0 jetty-ee10-jspc-maven-plugin maven-plugin EE10 :: Jetty JSPC Maven Plugin @@ -13,76 +13,34 @@ ${project.groupId}.jspc.plugin true - - - - org.apache.maven.plugins - maven-plugin-plugin - - - exec-plugin-doc - process-classes - - descriptor - helpmojo - - - - - - org.apache.maven.plugins - maven-invoker-plugin - - - integration-test - - install - integration-test - verify - - - - - - ${maven.surefire.plugin.version} - - - clean - - - - - - org.eclipse.jetty - jetty-util + org.apache.ant + ant - org.apache.maven - maven-plugin-api - provided + org.apache.maven.plugin-tools + maven-plugin-tools-api - javax.annotation - javax.annotation-api + junit + junit - org.apache.maven.plugin-tools - maven-plugin-annotations - provided + org.eclipse.jetty + jetty-util - org.apache.maven - maven-core - provided + org.eclipse.jetty.ee10 + jetty-ee10-apache-jsp + ${project.version} - org.apache.maven - maven-model - provided + org.eclipse.jetty.ee10 + jetty-ee10-glassfish-jstl + ${project.version} org.apache.maven @@ -90,28 +48,76 @@ provided - org.apache.maven.plugin-tools - maven-plugin-tools-api + org.apache.maven + maven-core + provided - junit - junit + javax.annotation + javax.annotation-api - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp - ${project.version} + org.apache.maven + maven-model + provided - org.eclipse.jetty.ee10 - jetty-ee10-glassfish-jstl - ${project.version} + org.apache.maven + maven-plugin-api + provided + + + javax.annotation + javax.annotation-api + + - org.apache.ant - ant + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + + org.apache.maven.plugins + maven-invoker-plugin + + + ${maven.surefire.plugin.version} + + + clean + + + + + integration-test + + install + integration-test + verify + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + + exec-plugin-doc + + descriptor + helpmojo + + process-classes + + + + + diff --git a/jetty-ee10/jetty-ee10-maven-plugin/pom.xml b/jetty-ee10/jetty-ee10-maven-plugin/pom.xml index 956ba6a836ff..f74448bc13dd 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/pom.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/pom.xml @@ -1,171 +1,39 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT ../pom.xml - 4.0.0 jetty-ee10-maven-plugin maven-plugin EE10 :: Jetty Maven Plugin Jetty EE10 maven plugins - false ${project.groupId}.maven.plugin - FREEBEER - true + + FREEBEER + false - - - - org.codehaus.mojo - build-helper-maven-plugin - - - test-reserve-ports - process-test-classes - - reserve-network-port - - - - test.stopPort - test.jettyPort - - - - - reserve-ports - pre-integration-test - - reserve-network-port - - - - jetty.stopPort - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Dstop.port=@{test.stopPort} -Djetty.port=@{test.jettyPort} - - **/IntegrationTest*.java - - - - - org.apache.maven.plugins - maven-plugin-plugin - - jetty - - - - exec-plugin-doc - generate-sources - - helpmojo - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - package - - copy - - - - - - - org.eclipse.jetty - jetty-home - zip - false - ${project.build.directory} - ${jettyHomeZipFileName} - - - false - true - - - - org.apache.maven.plugins - maven-invoker-plugin - - - integration-test - integration-test - - install - integration-test - verify - - - - - - org.eclipse.jetty:jetty-slf4j-impl:${project.version} - org.eclipse.jetty.ee10:jetty-ee10-apache-jsp:${project.version} - org.eclipse.jetty.ee10:jetty-ee10-glassfish-jstl:${project.version} - org.eclipse.jetty.ee10:jetty-ee10-webapp:${project.version} - org.eclipse.jetty:jetty-server:${project.version} - org.eclipse.jetty:jetty-deploy:${project.version} - org.eclipse.jetty:jetty-home:${project.version}:zip - - org.eclipse.jetty.maven.its.ee10 - - it-parent-pom/pom.xml - - - - javax-annotation-api/pom.xml - - jetty-start-gwt-it/pom.xml - - jetty-start-war-mojo-it/pom.xml - - - ${jetty.stopKey} - ${jetty.stopPort} - ${maven.surefire.plugin.version} - ${localRepoPath} - ${jettyHomeZip} - - - clean - - - - - - + + jakarta.transaction + jakarta.transaction-api + true + + + org.apache.maven.plugin-tools + maven-plugin-tools-api + + + org.apache.maven.shared + maven-artifact-transfer + ${maven-artifact-transfer.version} + + org.codehaus.plexus plexus-xml @@ -175,11 +43,11 @@ org.apache.maven - maven-xml-impl + maven-api-xml org.apache.maven - maven-api-xml + maven-xml-impl org.apache.maven @@ -187,46 +55,6 @@ - - org.apache.maven.shared - maven-artifact-transfer - ${maven-artifact-transfer.version} - - - org.apache.maven - maven-plugin-api - provided - - - javax.annotation - javax.annotation-api - - - - - org.apache.maven - maven-artifact - provided - - - org.apache.maven - maven-core - provided - - - org.apache.maven - maven-model - provided - - - org.apache.maven.plugin-tools - maven-plugin-tools-api - - - org.apache.maven.plugin-tools - maven-plugin-annotations - provided - org.eclipse.jetty jetty-home @@ -240,69 +68,79 @@ org.eclipse.jetty - jetty-util + jetty-http + true - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty + jetty-io true - - - jakarta.servlet - servlet-api - - - org.eclipse.jetty.ee10 - jetty-ee10-quickstart + org.eclipse.jetty + jetty-jmx true org.eclipse.jetty - jetty-security + jetty-jndi true - org.eclipse.jetty.ee10 - jetty-ee10-plus + org.eclipse.jetty + jetty-security true org.eclipse.jetty - jetty-jndi + jetty-server true org.eclipse.jetty - jetty-server + jetty-util + + + org.eclipse.jetty.ee10 + jetty-ee10-annotations true org.eclipse.jetty.ee10 - jetty-ee10-servlet + jetty-ee10-apache-jsp true - org.eclipse.jetty - jetty-http + org.eclipse.jetty.ee10 + jetty-ee10-glassfish-jstl true - org.eclipse.jetty - jetty-io + org.eclipse.jetty.ee10 + jetty-ee10-plus true - org.eclipse.jetty - jetty-jmx + org.eclipse.jetty.ee10 + jetty-ee10-quickstart true org.eclipse.jetty.ee10 - jetty-ee10-annotations + jetty-ee10-servlet true + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + true + + + jakarta.servlet + servlet-api + + + org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-jakarta-server @@ -314,29 +152,46 @@ true - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp + org.slf4j + slf4j-api true - org.eclipse.jetty.ee10 - jetty-ee10-glassfish-jstl - true + org.apache.maven + maven-artifact + provided - org.slf4j - slf4j-api - true + org.apache.maven + maven-core + provided + + + javax.annotation + javax.annotation-api + + - jakarta.transaction - jakarta.transaction-api - true + org.apache.maven + maven-model + provided - org.eclipse.jetty - jetty-slf4j-impl - test + org.apache.maven + maven-plugin-api + provided + + + javax.annotation + javax.annotation-api + + + + + org.apache.maven.plugin-tools + maven-plugin-annotations + provided org.awaitility @@ -348,5 +203,157 @@ jetty-client test + + org.eclipse.jetty + jetty-slf4j-impl + test + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + org.eclipse.jetty + jetty-home + zip + false + ${project.build.directory} + ${jettyHomeZipFileName} + + + false + true + + + + copy + + copy + + package + + + + + org.apache.maven.plugins + maven-invoker-plugin + + + org.eclipse.jetty:jetty-slf4j-impl:${project.version} + org.eclipse.jetty.ee10:jetty-ee10-apache-jsp:${project.version} + org.eclipse.jetty.ee10:jetty-ee10-glassfish-jstl:${project.version} + org.eclipse.jetty.ee10:jetty-ee10-webapp:${project.version} + org.eclipse.jetty:jetty-server:${project.version} + org.eclipse.jetty:jetty-deploy:${project.version} + org.eclipse.jetty:jetty-home:${project.version}:zip + + org.eclipse.jetty.maven.its.ee10 + + it-parent-pom/pom.xml + + + + javax-annotation-api/pom.xml + + jetty-start-gwt-it/pom.xml + + jetty-start-war-mojo-it/pom.xml + + + ${jetty.stopKey} + ${jetty.stopPort} + ${maven.surefire.plugin.version} + ${localRepoPath} + ${jettyHomeZip} + + + clean + + + + + integration-test + + install + integration-test + verify + + integration-test + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + jetty + + + + exec-plugin-doc + + helpmojo + + generate-sources + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Dstop.port=@{test.stopPort} -Djetty.port=@{test.jettyPort} + + **/IntegrationTest*.java + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + test-reserve-ports + + reserve-network-port + + process-test-classes + + + test.stopPort + test.jettyPort + + + + + reserve-ports + + reserve-network-port + + pre-integration-test + + + jetty.stopPort + + + + + + + diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-alpn/pom.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-alpn/pom.xml index a7874ee4f822..c7b7a41c5717 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-alpn/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-alpn/pom.xml @@ -1,16 +1,17 @@ + + + + + 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi 12.0.3-SNAPSHOT - - - - 4.0.0 jetty-ee10-osgi-alpn - EE10 :: OSGi :: ALPN Fragment jar + EE10 :: OSGi :: ALPN Fragment ${project.groupId}.alpn.fragment diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml index a302589b4fdf..b46ed721310f 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi 12.0.3-SNAPSHOT - 4.0.0 jetty-ee10-osgi-boot-jsp EE10 :: OSGi :: Boot JSP Jetty OSGi Boot JSP bundle @@ -13,14 +14,19 @@ org.eclipse.jetty.ee10.osgi.boot.jsp.* + + + jakarta.servlet + jakarta.servlet-api + org.eclipse.jetty jetty-deploy + - org.eclipse.jetty.ee10.osgi - jetty-ee10-osgi-boot - provided + org.eclipse.jetty.ee10 + jetty-ee10-apache-jsp org.eclipse.platform @@ -30,38 +36,15 @@ org.eclipse.platform org.eclipse.osgi.services - - - jakarta.servlet - jakarta.servlet-api - - - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp + org.eclipse.jetty.ee10.osgi + jetty-ee10-osgi-boot + provided - - - org.codehaus.mojo - build-helper-maven-plugin - - - set-jsp-api-version - validate - - parse-version - - - ${jsp.impl.version} - jspImpl - - - - org.apache.felix @@ -70,10 +53,9 @@ Jetty-OSGi-Jasper Integration - + org.eclipse.jetty.ee10.osgi.boot - - ${osgi.slf4j.import.packages}, + ${osgi.slf4j.import.packages}, org.eclipse.jdt.*;resolution:=optional, org.eclipse.jdt.core.compiler.*;resolution:=optional, com.sun.el;resolution:=optional, @@ -137,15 +119,31 @@ javax.xml.*;resolution:=optional, org.w3c.dom;resolution:=optional, org.w3c.dom.ls;resolution:=optional, - javax.xml.parser;resolution:=optional - + javax.xml.parser;resolution:=optional org.eclipse.jetty.ee10.jsp.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.apache.jasper.*;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))", - org.apache.el.*;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))" - + org.apache.el.*;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))" + + + org.codehaus.mojo + build-helper-maven-plugin + + + set-jsp-api-version + + parse-version + + validate + + ${jsp.impl.version} + jspImpl + + + + diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml index a3f742e1cac0..a0d0ec59f634 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi 12.0.3-SNAPSHOT - 4.0.0 jetty-ee10-osgi-boot EE10 :: OSGi :: Boot Jetty OSGi Boot bundle @@ -14,20 +15,20 @@ - org.eclipse.jetty.ee10 - jetty-ee10-annotations - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty + jetty-jmx org.eclipse.jetty jetty-osgi - org.eclipse.jetty - jetty-jmx + org.eclipse.jetty.ee10 + jetty-ee10-annotations + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp org.eclipse.platform @@ -58,27 +59,6 @@ - - maven-antrun-plugin - - - process-resources - - - - - - - - - - - - run - - - - org.apache.felix maven-bundle-plugin @@ -88,8 +68,7 @@ org.eclipse.jetty.ee10.osgi.boot;singleton:=true org.eclipse.jetty.ee10.osgi.boot.EE10Activator org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.eclipse.jetty.ee10.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))" - - ${osgi.slf4j.import.packages}, + ${osgi.slf4j.import.packages}, jakarta.mail;version="2.0";resolution:=optional, jakarta.mail.event;version="2.0";resolution:=optional, jakarta.mail.internet;version="2.0";resolution:=optional, @@ -111,18 +90,34 @@ org.xml.sax, org.xml.sax.helpers, org.eclipse.jetty.ee10.annotations;resolution:=optional, - * - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration - + * + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration <_nouses>true + + maven-antrun-plugin + + + + run + + process-resources + + + + + + + + + + + + + diff --git a/jetty-ee10/jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/pom.xml index 5efd7e819e46..22c32a2dc560 100644 --- a/jetty-ee10/jetty-ee10-osgi/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/pom.xml @@ -1,30 +1,31 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi - EE10 :: OSGi pom - - - true - + EE10 :: OSGi jetty-ee10-osgi-alpn jetty-ee10-osgi-boot jetty-ee10-osgi-boot-jsp - test-jetty-ee10-osgi-webapp-resources + test-jetty-ee10-osgi test-jetty-ee10-osgi-fragment test-jetty-ee10-osgi-server - test-jetty-ee10-osgi + test-jetty-ee10-osgi-webapp-resources + + true + + @@ -43,8 +44,11 @@ - META-INF/.. true + META-INF/.. + + META-INF/**/* + **/.* **/*.jar @@ -56,9 +60,6 @@ target/**/* build.properties - - META-INF/**/* - src/main/java diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml index c308821bbd7b..40f1da4316a4 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi 12.0.3-SNAPSHOT - 4.0.0 test-jetty-ee10-osgi-fragment EE10 :: OSGi :: WebApp Fragment Test Jetty OSGi Webapp Fragment bundle diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml index 3701d94c3b50..5034fc1f983f 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi 12.0.3-SNAPSHOT - 4.0.0 test-jetty-ee10-osgi-server EE10 :: OSGi :: Server Test Jetty OSGi bundle with a Server @@ -46,8 +47,7 @@ of the packages it uses; no need to reflect some tight dependency determined at compilation time. --> <_nouses>true - - org.osgi.framework, + org.osgi.framework, org.osgi.service.cm;version="1.2.0", org.osgi.service.packageadmin, org.osgi.service.startlevel;version="1.0.0", @@ -55,8 +55,7 @@ org.osgi.util.tracker;version="1.3.0", org.xml.sax, org.xml.sax.helpers, - * - + * org.eclipse.jetty.*;version="[$(version;==;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))", org.eclipse.jetty.ee10.*;version="[$(version;==;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))" diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml index 49d23a952833..4af1944ccb30 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml @@ -1,57 +1,64 @@ + 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi 12.0.3-SNAPSHOT - 4.0.0 test-jetty-ee10-osgi-webapp-resources - EE10 :: OSGi :: WebApp With Resources war + EE10 :: OSGi :: WebApp With Resources ${project.groupId}.webapp.resources true true + + + jakarta.servlet + jakarta.servlet-api + provided + + + + org.apache.felix + maven-bundle-plugin + true + + + war + + + !com.acme* + /test-webapp-resources + ee10 + + + org.apache.maven.plugins maven-resources-plugin copy-resources - validate copy-resources + validate ${basedir}/target/classes - src/main/resources + src/main/resources - - org.apache.felix - maven-bundle-plugin - true - - - war - - - !com.acme* - /test-webapp-resources - ee10 - - - maven-war-plugin @@ -63,11 +70,4 @@ - - - jakarta.servlet - jakarta.servlet-api - provided - - diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml index 5612a85248cc..98e59263057e 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml @@ -1,99 +1,21 @@ + + 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi 12.0.3-SNAPSHOT - 4.0.0 test-jetty-ee10-osgi EE10 :: OSGi :: Test Jetty OSGi Integration test - ${project.groupId}.boot.test.osgi target/distribution - true + ${project.groupId}.boot.test.osgi true + true - - - org.ops4j.pax.exam - pax-exam - test - - - org.ops4j.pax.exam - pax-exam-inject - test - - - - org.ops4j.pax.exam - pax-exam-container-forked - test - - - biz.aQute.bnd - bndlib - - - org.ops4j.pax.tinybundles - tinybundles - - - - - org.ops4j.pax.tinybundles - tinybundles - - - org.ops4j.pax.swissbox - pax-swissbox-framework - test - - - org.ops4j.base - ops4j-base-monitors - - - - - org.ops4j.pax.swissbox - pax-swissbox-tracker - test - - - org.ops4j.pax.exam - pax-exam-junit4 - test - - - org.ops4j.pax.exam - pax-exam-link-mvn - test - - - org.ops4j.pax.url - pax-url-aether - test - - - javax.annotation - javax.annotation-api - - - - - org.ops4j.pax.url - pax-url-wrap - test - - - biz.aQute.bnd - bndlib - - - biz.aQute.bnd biz.aQute.bndlib @@ -105,164 +27,81 @@ - org.eclipse.platform - org.eclipse.osgi - test - - - org.eclipse.platform - org.eclipse.osgi.services - test - - - org.eclipse.platform - org.eclipse.osgi.util - test - - - org.apache.geronimo.specs - geronimo-atinject_1.0_spec - test - - - org.osgi - org.osgi.util.promise - test - - - org.osgi - org.osgi.util.measurement - test - - - org.osgi - org.osgi.util.position - test + jakarta.servlet + jakarta.servlet-api - org.osgi - org.osgi.util.xml - test - - - - org.slf4j - slf4j-api - test - - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.ee10.osgi - jetty-ee10-osgi-boot - test + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api - org.eclipse.platform - org.eclipse.osgi - - - org.eclipse.platform - org.eclipse.osgi.services + jakarta.el + jakarta.el-api - org.eclipse.jetty.ee10.osgi - jetty-ee10-osgi-boot-jsp - test - - - org.eclipse.platform - org.eclipse.osgi - - - org.eclipse.platform - org.eclipse.osgi.services - - + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + ${project.version} - jakarta.servlet - jakarta.servlet-api + org.eclipse.jetty.http2 + jetty-http2-hpack - jakarta.inject - jakarta.inject-api - test + org.eclipse.jetty.http2 + jetty-http2-server - jakarta.transaction - jakarta.transaction-api - test + org.glassfish.web + jakarta.servlet.jsp.jstl - jakarta.interceptor - jakarta.interceptor-api - test + org.mortbay.jasper + apache-el - jakarta.enterprise - jakarta.enterprise.cdi-api - test + org.mortbay.jasper + apache-jsp - jakarta.el - jakarta.el-api - test + org.ops4j.pax.tinybundles + tinybundles - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - test - - - org.apache.felix - org.apache.felix.framework - - + jakarta.websocket + jakarta.websocket-api + runtime - jakarta.activation - jakarta.activation-api - test + org.eclipse.jetty + jetty-client + runtime - org.mortbay.jasper - apache-jsp + org.eclipse.jetty + jetty-deploy + runtime - org.mortbay.jasper - apache-el + org.eclipse.jetty + jetty-jmx + runtime - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - - - jakarta.el - jakarta.el-api - - + org.eclipse.jetty + jetty-server + runtime - org.glassfish.web - jakarta.servlet.jsp.jstl - - + org.eclipse.jetty + jetty-util + runtime + - org.eclipse.jetty.ee10 - jetty-ee10-jndi + org.eclipse.jetty + jetty-xml runtime @@ -270,49 +109,50 @@ jetty-ee10-annotations runtime + org.eclipse.jetty.ee10 - jetty-ee10-webapp + jetty-ee10-jndi runtime - org.eclipse.jetty - jetty-deploy + org.eclipse.jetty.ee10 + jetty-ee10-plus runtime - org.eclipse.jetty - jetty-server + org.eclipse.jetty.ee10 + jetty-ee10-servlet runtime org.eclipse.jetty.ee10 - jetty-ee10-servlet + jetty-ee10-servlets runtime org.eclipse.jetty.ee10 - jetty-ee10-servlets + jetty-ee10-webapp runtime - org.eclipse.jetty - jetty-xml + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-client runtime - org.eclipse.jetty - jetty-jmx + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server runtime - org.eclipse.jetty - jetty-util + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server runtime - org.eclipse.jetty - jetty-client + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-servlet runtime @@ -322,12 +162,12 @@ org.eclipse.jetty.websocket - jetty-websocket-jetty-common + jetty-websocket-jetty-client runtime org.eclipse.jetty.websocket - jetty-websocket-jetty-client + jetty-websocket-jetty-common runtime @@ -336,61 +176,97 @@ runtime - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-client - runtime + jakarta.activation + jakarta.activation-api + test + + + jakarta.el + jakarta.el-api + test + + + jakarta.enterprise + jakarta.enterprise.cdi-api + test + + + jakarta.inject + jakarta.inject-api + test + + + jakarta.interceptor + jakarta.interceptor-api + test + + + jakarta.transaction + jakarta.transaction-api + test + + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + test + + + org.apache.felix + org.apache.felix.framework + + - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-servlet - runtime + org.apache.geronimo.specs + geronimo-atinject_1.0_spec + test - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server - runtime + org.conscrypt + conscrypt-openjdk-uber + test - jakarta.websocket - jakarta.websocket-api - runtime + org.eclipse.jetty + jetty-alpn-conscrypt-client + test - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-server - runtime + org.eclipse.jetty + jetty-alpn-conscrypt-server + test - org.eclipse.jetty.http2 - jetty-http2-server + org.eclipse.jetty + jetty-alpn-java-client + test - org.eclipse.jetty.http2 - jetty-http2-hpack + org.eclipse.jetty + jetty-alpn-java-server + test org.eclipse.jetty jetty-alpn-server test + - org.eclipse.jetty.ee10.osgi - jetty-ee10-osgi-alpn - ${project.version} + org.eclipse.jetty + jetty-slf4j-impl test - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jsp-webapp + jetty-ee10-demo-container-initializer ${project.version} - webbundle test @@ -407,26 +283,58 @@ webbundle test + + org.eclipse.jetty.ee10.demos - jetty-ee10-demo-spec-webapp + jetty-ee10-demo-jsp-webapp ${project.version} - war + webbundle test org.eclipse.jetty.ee10.demos - jetty-ee10-demo-container-initializer + jetty-ee10-demo-spec-webapp ${project.version} + war test org.eclipse.jetty.ee10.osgi - test-jetty-ee10-osgi-webapp-resources + jetty-ee10-osgi-alpn ${project.version} - war test + + org.eclipse.jetty.ee10.osgi + jetty-ee10-osgi-boot + test + + + org.eclipse.platform + org.eclipse.osgi + + + org.eclipse.platform + org.eclipse.osgi.services + + + + + org.eclipse.jetty.ee10.osgi + jetty-ee10-osgi-boot-jsp + test + + + org.eclipse.platform + org.eclipse.osgi + + + org.eclipse.platform + org.eclipse.osgi.services + + + org.eclipse.jetty.ee10.osgi test-jetty-ee10-osgi-fragment @@ -440,9 +348,21 @@ test - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources + org.eclipse.jetty.ee10.osgi + test-jetty-ee10-osgi-webapp-resources ${project.version} + war + test + + + org.eclipse.jetty.http2 + jetty-http2-client + test + + + org.eclipse.jetty.http2 + jetty-http2-client-transport + test org.eclipse.jetty.toolchain @@ -450,63 +370,144 @@ test - org.ow2.asm - asm + org.eclipse.platform + org.eclipse.osgi test - org.ow2.asm - asm-commons + org.eclipse.platform + org.eclipse.osgi.services test - org.ow2.asm - asm-tree + org.eclipse.platform + org.eclipse.osgi.util test + - org.ow2.asm - asm-analysis + org.ops4j.pax.exam + pax-exam test + - org.ow2.asm - asm-util + org.ops4j.pax.exam + pax-exam-container-forked test + + + biz.aQute.bnd + bndlib + + + org.ops4j.pax.tinybundles + tinybundles + + - org.eclipse.jetty.http2 - jetty-http2-client + org.ops4j.pax.exam + pax-exam-inject test - org.eclipse.jetty.http2 - jetty-http2-client-transport + org.ops4j.pax.exam + pax-exam-junit4 test - org.eclipse.jetty - jetty-alpn-conscrypt-server + org.ops4j.pax.exam + pax-exam-link-mvn test - org.eclipse.jetty - jetty-alpn-conscrypt-client + org.ops4j.pax.swissbox + pax-swissbox-framework test + + + org.ops4j.base + ops4j-base-monitors + + - org.conscrypt - conscrypt-openjdk-uber + org.ops4j.pax.swissbox + pax-swissbox-tracker test - org.eclipse.jetty - jetty-alpn-java-server + org.ops4j.pax.url + pax-url-aether test + + + javax.annotation + javax.annotation-api + + - org.eclipse.jetty - jetty-alpn-java-client + org.ops4j.pax.url + pax-url-wrap + test + + + biz.aQute.bnd + bndlib + + + + + org.osgi + org.osgi.util.measurement + test + + + org.osgi + org.osgi.util.position + test + + + org.osgi + org.osgi.util.promise + test + + + org.osgi + org.osgi.util.xml + test + + + org.ow2.asm + asm + test + + + org.ow2.asm + asm-analysis + test + + + org.ow2.asm + asm-commons + test + + + org.ow2.asm + asm-tree + test + + + org.ow2.asm + asm-util + test + + + + org.slf4j + slf4j-api test @@ -568,7 +569,7 @@ - + @@ -580,20 +581,20 @@ maven-dependency-plugin + + test-jetty-ee10-osgi-webapp-resources + target + true + copy - process-test-resources copy-dependencies + process-test-resources - - test-jetty-ee10-osgi-webapp-resources - target - true - org.apache.servicemix.tooling diff --git a/jetty-ee10/jetty-ee10-plus/pom.xml b/jetty-ee10/jetty-ee10-plus/pom.xml index 6033b45be506..e083b3ffff27 100644 --- a/jetty-ee10/jetty-ee10-plus/pom.xml +++ b/jetty-ee10/jetty-ee10-plus/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-plus EE10 :: Plus Jetty JavaEE style services @@ -15,32 +16,23 @@ org.eclipse.jetty.ee10.plus.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},jakarta.transaction.*;version="2.0.0",* - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration - - - - - - - jakarta.transaction jakarta.transaction-api + + org.eclipse.jetty + jetty-jndi + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + + + org.slf4j + slf4j-api + jakarta.enterprise jakarta.enterprise.cdi-api @@ -56,18 +48,6 @@ jakarta.interceptor-api provided - - org.eclipse.jetty - jetty-jndi - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-slf4j-impl @@ -80,4 +60,21 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},jakarta.transaction.*;version="2.0.0",* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration + + + + + + diff --git a/jetty-ee10/jetty-ee10-proxy/pom.xml b/jetty-ee10/jetty-ee10-proxy/pom.xml index 95373dffe49b..a83b35fbf7f5 100644 --- a/jetty-ee10/jetty-ee10-proxy/pom.xml +++ b/jetty-ee10/jetty-ee10-proxy/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-proxy EE10 :: Proxy Jetty Proxy @@ -15,21 +16,15 @@ org.eclipse.jetty.ee10.proxy.* - - - - org.apache.maven.plugins - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee10.proxy=org.eclipse.jetty.logging - - - - - - + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-util + org.slf4j slf4j-api @@ -46,20 +41,12 @@ org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty - jetty-util-ajax + jetty-http-tools test org.eclipse.jetty - jetty-http-tools + jetty-rewrite test @@ -69,7 +56,7 @@ org.eclipse.jetty - jetty-rewrite + jetty-util-ajax test @@ -78,4 +65,16 @@ test + + + + + org.apache.maven.plugins + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee10.proxy=org.eclipse.jetty.logging + + + + diff --git a/jetty-ee10/jetty-ee10-quickstart/pom.xml b/jetty-ee10/jetty-ee10-quickstart/pom.xml index 4c9c322b8f75..c08c8d44ebd2 100644 --- a/jetty-ee10/jetty-ee10-quickstart/pom.xml +++ b/jetty-ee10/jetty-ee10-quickstart/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-quickstart EE10 :: Quick Start Jetty Quick Start @@ -14,30 +15,10 @@ ${project.groupId}.quickstart - - - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration - - - - - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp + jetty-ee10-annotations org.eclipse.jetty.ee10 @@ -45,7 +26,7 @@ org.eclipse.jetty.ee10 - jetty-ee10-annotations + jetty-ee10-webapp org.slf4j @@ -63,4 +44,20 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration + + + + + + diff --git a/jetty-ee10/jetty-ee10-runner/pom.xml b/jetty-ee10/jetty-ee10-runner/pom.xml index 82ecc3112909..207062df2a5b 100644 --- a/jetty-ee10/jetty-ee10-runner/pom.xml +++ b/jetty-ee10/jetty-ee10-runner/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - 4.0.0 jetty-ee10-runner EE10 :: Runner @@ -15,7 +16,84 @@ true + + + org.eclipse.jetty + jetty-jndi + + + org.eclipse.jetty + jetty-security + + + org.eclipse.jetty.ee10 + jetty-ee10-annotations + + + org.eclipse.jetty.ee10 + jetty-ee10-apache-jsp + + + org.eclipse.jetty.ee10 + jetty-ee10-glassfish-jstl + + + org.eclipse.jetty.ee10 + jetty-ee10-plus + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + runtime + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-simple-webapp + war + test + + + + + + + org.apache.felix + maven-bundle-plugin + + + true + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.eclipse.jetty.ee10.runner.Runner + + + Jetty Runner + + + + + + org.apache.maven.plugins @@ -23,14 +101,13 @@ unpack-dependencies - prepare-package unpack-dependencies + prepare-package ** - - **/MANIFEST.MF, + **/MANIFEST.MF, META-INF/LICENSE, META-INF/*.RSA, META-INF/*.DSA, @@ -39,8 +116,7 @@ readme.txt, MANIFEST.MF, about.html, - ecj.1 - + ecj.1 ${project.build.directory}/classes false true @@ -89,82 +165,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - true - - - - org.apache.maven.plugins - maven-jar-plugin - - - - org.eclipse.jetty.ee10.runner.Runner - - - Jetty Runner - - - - - - - - - - org.eclipse.jetty.ee10 - jetty-ee10-plus - - - org.eclipse.jetty.ee10 - jetty-ee10-annotations - - - org.eclipse.jetty - jetty-security - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server - - - org.eclipse.jetty - jetty-jndi - - - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp - - - org.eclipse.jetty.ee10 - jetty-ee10-glassfish-jstl - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - runtime - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-simple-webapp - war - test - - - org.eclipse.jetty - jetty-client - test - - diff --git a/jetty-ee10/jetty-ee10-servlet/pom.xml b/jetty-ee10/jetty-ee10-servlet/pom.xml index fde865234e4f..d9b0f9457bae 100644 --- a/jetty-ee10/jetty-ee10-servlet/pom.xml +++ b/jetty-ee10/jetty-ee10-servlet/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-servlet EE10 :: Servlet Jetty Servlet Container @@ -16,21 +16,6 @@ org.eclipse.jetty.ee10.servlet.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules org.eclipse.jetty.util.ajax - --add-reads org.eclipse.jetty.ee10.servlet=org.eclipse.jetty.logging - - - - - - jakarta.servlet @@ -38,19 +23,20 @@ org.eclipse.jetty - jetty-server + jetty-jmx + true org.eclipse.jetty - jetty-session + jetty-security org.eclipse.jetty - jetty-security + jetty-server - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-session org.eclipse.jetty @@ -58,31 +44,43 @@ true - org.eclipse.jetty - jetty-jmx - true + org.slf4j + slf4j-api - org.eclipse.jetty - jetty-slf4j-impl + jetty-client test - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty + jetty-http-tools test + org.eclipse.jetty - jetty-http-tools + jetty-slf4j-impl test - org.eclipse.jetty - jetty-client + org.eclipse.jetty.toolchain + jetty-test-helper test + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules org.eclipse.jetty.util.ajax + --add-reads org.eclipse.jetty.ee10.servlet=org.eclipse.jetty.logging + + + + + diff --git a/jetty-ee10/jetty-ee10-servlets/pom.xml b/jetty-ee10/jetty-ee10-servlets/pom.xml index 6cd3b81805ec..1f5e1e424c02 100644 --- a/jetty-ee10/jetty-ee10-servlets/pom.xml +++ b/jetty-ee10/jetty-ee10-servlets/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-servlets EE10 :: Utility Servlets and Filters Utility Servlets from Jetty @@ -16,56 +16,36 @@ org.eclipse.jetty.ee10.servlets.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules jakarta.servlet - --add-modules org.eclipse.jetty.util - --add-modules org.eclipse.jetty.io - --add-modules org.eclipse.jetty.http - --add-modules org.eclipse.jetty.server - --add-modules org.eclipse.jetty.jmx - - - - - - org.eclipse.jetty jetty-http - org.eclipse.jetty.ee10 - jetty-ee10-webapp - provided + org.eclipse.jetty + jetty-io org.eclipse.jetty jetty-util + + org.slf4j + slf4j-api + jakarta.servlet jakarta.servlet-api provided - org.eclipse.jetty - jetty-io - - - org.slf4j - slf4j-api + org.eclipse.jetty.ee10 + jetty-ee10-webapp + provided - org.eclipse.jetty - jetty-slf4j-impl + jetty-http-tools test @@ -73,9 +53,10 @@ jetty-jmx test + org.eclipse.jetty - jetty-http-tools + jetty-slf4j-impl test @@ -85,4 +66,21 @@ + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules jakarta.servlet + --add-modules org.eclipse.jetty.util + --add-modules org.eclipse.jetty.io + --add-modules org.eclipse.jetty.http + --add-modules org.eclipse.jetty.server + --add-modules org.eclipse.jetty.jmx + + + + + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-bad-websocket-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-bad-websocket-webapp/pom.xml index 39a5e261f30d..e8a1c7a3a796 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-bad-websocket-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-bad-websocket-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-bad-websocket-webapp war @@ -14,6 +14,11 @@ Contains wrong websocket which should fail at deployment + + jakarta.servlet + jakarta.servlet-api + provided + jakarta.websocket jakarta.websocket-api @@ -24,11 +29,6 @@ jetty-ee10-websocket-jakarta-common provided - - jakarta.servlet - jakarta.servlet-api - provided - diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi-common-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi-common-webapp/pom.xml index cffd2add4414..5a58f5d16ee2 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi-common-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi-common-webapp/pom.xml @@ -1,39 +1,25 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-cdi-common-webapp - EE10 :: Tests :: CDI Common Demo WebApp war + EE10 :: Tests :: CDI Common Demo WebApp ${project.groupId}.cdi.common - - - - - org.apache.maven.plugins - maven-war-plugin - - false - - - - - - - + - jakarta.servlet - jakarta.servlet-api + jakarta.enterprise + jakarta.enterprise.cdi-api provided @@ -42,13 +28,27 @@ jakarta.inject-api provided - + - jakarta.enterprise - jakarta.enterprise.cdi-api + jakarta.servlet + jakarta.servlet-api provided + + + + + org.apache.maven.plugins + maven-war-plugin + + false + + + + + + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/pom.xml index 68245e7077c6..8c8360432695 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-cdi jar EE10 :: Tests :: CDI @@ -26,25 +26,17 @@ compile - org.slf4j - slf4j-api - compile + org.eclipse.jetty.toolchain + jetty-test-helper org.slf4j - jul-to-slf4j - test - - - org.jboss.weld.servlet - weld-servlet-core - ${weld.version} - test + slf4j-api + compile - org.jboss.logging - jboss-logging - ${jboss.logging.version} + jakarta.servlet + jakarta.servlet-api test @@ -68,12 +60,20 @@ test - org.eclipse.jetty.toolchain - jetty-test-helper + org.jboss.logging + jboss-logging + ${jboss.logging.version} + test - jakarta.servlet - jakarta.servlet-api + org.jboss.weld.servlet + weld-servlet-core + ${weld.version} + test + + + org.slf4j + jul-to-slf4j test diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/pom.xml index eb286e40f4af..001bfeb81533 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-client-transports jar EE10 :: Tests :: HTTP Client Transports @@ -17,54 +17,10 @@ true - - - enable-incubator-foreign - - [17,19) - - - - - maven-surefire-plugin - - - @{argLine} - ${jetty.surefire.argLine} - --add-modules jdk.incubator.foreign - --enable-native-access ALL-UNNAMED - - - - - - - - enable-preview - - [19,21) - - - - - maven-surefire-plugin - - - @{argLine} - --enable-preview - - - - - - - - - org.slf4j - slf4j-api - test + org.eclipse.jetty.toolchain + jetty-test-helper org.awaitility @@ -83,63 +39,103 @@ org.eclipse.jetty - jetty-jmx + jetty-client test - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty + jetty-jmx test - org.eclipse.jetty.ee10 - jetty-ee10-servlets + org.eclipse.jetty + jetty-slf4j-impl test org.eclipse.jetty - jetty-client + jetty-unixdomain-server test - org.eclipse.jetty.http2 - jetty-http2-server + org.eclipse.jetty.ee10 + jetty-ee10-servlet test - org.eclipse.jetty.http2 - jetty-http2-client-transport + org.eclipse.jetty.ee10 + jetty-ee10-servlets test - org.eclipse.jetty.http3 - jetty-http3-server + org.eclipse.jetty.fcgi + jetty-fcgi-server test - org.eclipse.jetty.http3 - jetty-http3-client-transport + org.eclipse.jetty.http2 + jetty-http2-client-transport test - org.eclipse.jetty - jetty-unixdomain-server + org.eclipse.jetty.http2 + jetty-http2-server test - org.eclipse.jetty.fcgi - jetty-fcgi-server + org.eclipse.jetty.http3 + jetty-http3-client-transport test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.http3 + jetty-http3-server test - org.eclipse.jetty.toolchain - jetty-test-helper + org.slf4j + slf4j-api + test + + + enable-incubator-foreign + + [17,19) + + + + + maven-surefire-plugin + + @{argLine} + ${jetty.surefire.argLine} + --add-modules jdk.incubator.foreign + --enable-native-access ALL-UNNAMED + + + + + + + enable-preview + + [19,21) + + + + + maven-surefire-plugin + + @{argLine} + --enable-preview + + + + + + + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-felix-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-felix-webapp/pom.xml index 15d881099f59..dd023f3c070c 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-felix-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-felix-webapp/pom.xml @@ -1,20 +1,33 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-felix-webapp - EE10 :: Tests :: Felix WebApp war + EE10 :: Tests :: Felix WebApp ${project.groupId}.felix + + + org.apache.felix + org.apache.felix.framework + 7.0.5 + + + jakarta.servlet + jakarta.servlet-api + provided + + + @@ -34,17 +47,4 @@ - - - - jakarta.servlet - jakarta.servlet-api - provided - - - org.apache.felix - org.apache.felix.framework - 7.0.5 - - diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml index b2d72018c657..535bdbf6e5ba 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml @@ -1,20 +1,67 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-http2-webapp - EE10 :: Tests :: HTTP2 WebApp war + EE10 :: Tests :: HTTP2 WebApp ${project.groupId}.http2 + + + org.eclipse.jetty + jetty-alpn-java-client + + + org.eclipse.jetty.http2 + jetty-http2-client + + + jakarta.servlet + jakarta.servlet-api + provided + + + + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + test + + + org.eclipse.jetty.http2 + jetty-http2-server + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + @@ -22,10 +69,10 @@ unpack-webapp - pre-integration-test unpack + pre-integration-test @@ -61,51 +108,4 @@ - - - - org.eclipse.jetty.http2 - jetty-http2-client - - - jakarta.servlet - jakarta.servlet-api - provided - - - org.eclipse.jetty - jetty-alpn-java-client - - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - test - - - org.eclipse.jetty.http2 - jetty-http2-server - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml index 2a8f6a595acb..9eeeba72307f 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml @@ -1,70 +1,24 @@ + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - 4.0.0 jetty-ee10-test-integration jar EE10 :: Tests :: Integrations - ${project.build.directory}/test-wars - ${project.build.directory}/test-libs - ${project.build.directory}/test-dist ${project.groupId}.integrations + ${project.build.directory}/test-dist + ${project.build.directory}/test-libs + ${project.build.directory}/test-wars - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-wars-for-testing - process-test-resources - - copy - - - - - org.eclipse.jetty.ee10 - jetty-ee10-test-webapp-rfc2616 - ${project.version} - war - ee10-test-rfc2616.war - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jetty-webapp - war - ee10-demo-jetty.war - - - true - ${project.build.directory}/webapps - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - true - false - - - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty + jetty-client org.eclipse.jetty @@ -75,13 +29,26 @@ jetty-rewrite - org.eclipse.jetty - jetty-client + org.eclipse.jetty.ee10 + jetty-ee10-apache-jsp + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + + + org.eclipse.jetty.http2 + jetty-http2-server org.slf4j slf4j-api + + org.eclipse.jetty + jetty-alpn-server + test + + + true + false + + + + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp-it/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp-it/pom.xml index 795204e0a971..d478a950fbe8 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp-it/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp-it/pom.xml @@ -1,29 +1,29 @@ + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-test-jmx 12.0.3-SNAPSHOT - 4.0.0 jetty-ee10-jmx-webapp-it jar EE10 :: Tests :: JMX :: WebApp Integration Tests + ${project.groupId}.jmx.webapp.it UTF-8 UTF-8 - ${project.groupId}.jmx.webapp.it ${project.build.directory}/test-base - - org.eclipse.jetty.ee10 - jetty-ee10-annotations - org.eclipse.jetty jetty-jmx + + org.eclipse.jetty.ee10 + jetty-ee10-annotations + org.eclipse.jetty.ee10 jetty-ee10-jmx-webapp @@ -45,10 +45,10 @@ copy-apps-for-testing - process-test-resources copy-dependencies + process-test-resources jetty-ee10-jmx-webapp runtime diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp/pom.xml index 89a6fbd223e8..0bb8ea098aeb 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp/pom.xml @@ -15,22 +15,22 @@ - jakarta.servlet - jakarta.servlet-api - provided + org.eclipse.jetty + jetty-jmx org.eclipse.jetty - jetty-jmx + jetty-slf4j-impl + compile org.slf4j slf4j-api - org.eclipse.jetty - jetty-slf4j-impl - compile + jakarta.servlet + jakarta.servlet-api + provided diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/pom.xml index 3c4e4b6a8ac9..5ae87b2056aa 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - 4.0.0 jetty-ee10-test-jmx pom EE10 :: Tests :: JMX diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jndi/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jndi/pom.xml index 6f4e847e8390..f03796d3d377 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jndi/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jndi/pom.xml @@ -1,13 +1,13 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT ../pom.xml - - 4.0.0 jetty-ee10-test-jndi jar EE10 :: Tests :: JNDI @@ -17,12 +17,6 @@ - - org.eclipse.jetty.ee10 - jetty-ee10-jndi - ${project.version} - test - org.eclipse.jetty.toolchain jetty-test-helper @@ -32,6 +26,12 @@ jakarta.mail test + + org.eclipse.jetty.ee10 + jetty-ee10-jndi + ${project.version} + test + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-loginservice/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-loginservice/pom.xml index fe38a4a319a8..8d7aaadc76e5 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-loginservice/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-loginservice/pom.xml @@ -9,59 +9,59 @@ jetty-ee10-test-loginservice EE10 :: Tests :: Login Service - false ${project.groupId}.loginservice + false org.eclipse.jetty - jetty-server + jetty-client - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty + jetty-jndi org.eclipse.jetty - jetty-client + jetty-server org.eclipse.jetty.ee10 jetty-ee10-plus - org.eclipse.jetty - jetty-jndi + org.eclipse.jetty.ee10 + jetty-ee10-webapp - org.testcontainers - testcontainers + org.eclipse.jetty.toolchain + jetty-test-helper test - org.testcontainers - mariadb + org.mariadb.jdbc + mariadb-java-client + ${mariadb.version} test - org.testcontainers - junit-jupiter + org.slf4j + slf4j-simple test - org.slf4j - slf4j-simple + org.testcontainers + junit-jupiter test - org.mariadb.jdbc - mariadb-java-client - ${mariadb.version} + org.testcontainers + mariadb test - org.eclipse.jetty.toolchain - jetty-test-helper + org.testcontainers + testcontainers test diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-openid-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-openid-webapp/pom.xml index f8505eec02d3..7abf8cf1e9a1 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-openid-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-openid-webapp/pom.xml @@ -1,27 +1,27 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-openid-webapp war EE10 :: Tests :: OpenID WebApp - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-slf4j-impl compile + + org.slf4j + slf4j-api + jakarta.servlet jakarta.servlet-api diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-owb-cdi-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-owb-cdi-webapp/pom.xml index 173960ff8e19..40da19095402 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-owb-cdi-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-owb-cdi-webapp/pom.xml @@ -1,41 +1,23 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-owb-cdi-webapp - EE10 :: Tests :: CDI OWB Demo WebApp war + EE10 :: Tests :: CDI OWB Demo WebApp ${project.groupId}.cdi.owb 2.0.27 - - jetty-ee10-test-owb-cdi-demo - - - - jakarta.servlet - jakarta.servlet-api - provided - - - - org.eclipse.jetty.ee10 - jetty-ee10-test-cdi-common-webapp - ${project.version} - war - runtime - - + + + jetty-ee10-test-owb-cdi-demo + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-quickstart/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-quickstart/pom.xml index d947ca5b2894..434fba92239c 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-quickstart/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-quickstart/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - 4.0.0 jetty-ee10-test-quickstart EE10 :: Tests :: Quick Start Jetty Quick Start Test @@ -14,38 +14,43 @@ - org.eclipse.jetty.ee10 - jetty-ee10-quickstart + jakarta.transaction + jakarta.transaction-api test - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty + jetty-jmx test org.eclipse.jetty - jetty-jmx + jetty-slf4j-impl test org.eclipse.jetty.ee10 - jetty-ee10-plus + jetty-ee10-annotations test org.eclipse.jetty.ee10 - jetty-ee10-annotations + jetty-ee10-apache-jsp test - jakarta.transaction - jakarta.transaction-api + org.eclipse.jetty.ee10 + jetty-ee10-glassfish-jstl test - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources + org.eclipse.jetty.ee10 + jetty-ee10-plus + test + + + org.eclipse.jetty.ee10 + jetty-ee10-quickstart test @@ -54,41 +59,41 @@ test - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jndi-webapp - war + org.eclipse.jetty.ee10 + jetty-ee10-webapp test org.eclipse.jetty.ee10.demos - jetty-ee10-demo-spec-webapp + jetty-ee10-demo-jetty-webapp war test org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jetty-webapp + jetty-ee10-demo-jndi-webapp war test - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-server + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources test - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-spec-webapp + war test - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server test - org.eclipse.jetty.ee10 - jetty-ee10-glassfish-jstl + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server test @@ -101,11 +106,6 @@ slf4j-api test - - org.eclipse.jetty - jetty-slf4j-impl - test - @@ -114,10 +114,10 @@ copy - process-test-classes copy + process-test-classes diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml index be9a9eac873f..e569345d8586 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml @@ -15,39 +15,38 @@ jakarta.servlet jakarta.servlet-api - - - org.eclipse.jetty - jetty-session - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp org.eclipse.jetty jetty-client - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-session - org.eclipse.jetty - jetty-slf4j-impl - test + org.eclipse.jetty.ee10 + jetty-ee10-webapp - org.eclipse.jetty - jetty-session - test-jar - test + org.eclipse.jetty.tests + jetty-test-session-common + + + org.hamcrest + hamcrest-core + + org.eclipse.jetty.toolchain jetty-test-helper compile + + org.hamcrest + hamcrest + org.junit.jupiter junit-jupiter @@ -58,14 +57,25 @@ junit-jupiter-api compile + + org.slf4j + slf4j-api + org.awaitility awaitility test - org.eclipse.jetty.tests - jetty-test-session-common + org.eclipse.jetty + jetty-session + test-jar + test + + + org.eclipse.jetty + jetty-slf4j-impl + test diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-file/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-file/pom.xml index cca6e9b18b25..ad9e209bb2ec 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-file/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-file/pom.xml @@ -14,23 +14,23 @@ org.eclipse.jetty - jetty-session + jetty-client test org.eclipse.jetty jetty-session - test-jar test - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty + jetty-session + test-jar test org.eclipse.jetty - jetty-client + jetty-slf4j-impl test @@ -39,18 +39,18 @@ test - org.slf4j - slf4j-api + org.eclipse.jetty.ee10 + jetty-ee10-webapp test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.toolchain + jetty-test-helper test - org.eclipse.jetty.toolchain - jetty-test-helper + org.slf4j + slf4j-api test diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-gcloud/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-gcloud/pom.xml index 3a9ea8e912f1..b7eebf323323 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-gcloud/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-gcloud/pom.xml @@ -14,28 +14,28 @@ org.eclipse.jetty - jetty-session + jetty-client test org.eclipse.jetty jetty-session test - test-jar - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty + jetty-session + test-jar test - org.eclipse.jetty - jetty-client + org.eclipse.jetty.ee10 + jetty-ee10-test-sessions-common test org.eclipse.jetty.ee10 - jetty-ee10-test-sessions-common + jetty-ee10-webapp test @@ -44,18 +44,18 @@ test - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty.tests + jetty-test-session-common test - org.testcontainers - testcontainers + org.eclipse.jetty.toolchain + jetty-test-helper test - org.testcontainers - junit-jupiter + org.slf4j + slf4j-simple test @@ -64,13 +64,13 @@ test - org.slf4j - slf4j-simple + org.testcontainers + junit-jupiter test - org.eclipse.jetty.tests - jetty-test-session-common + org.testcontainers + testcontainers test diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-hazelcast/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-hazelcast/pom.xml index 777bc56791fe..a4d27d22fb9a 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-hazelcast/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-hazelcast/pom.xml @@ -11,47 +11,16 @@ ${project.groupId}.sessions.hazelcast - - - - org.apache.maven.plugins - maven-surefire-plugin - - --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED - true - 45 - 240 - - - - - org.eclipse.jetty - jetty-session - test - - - org.eclipse.jetty - jetty-session - test-jar - test - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - test + com.hazelcast + hazelcast org.eclipse.jetty jetty-client test - - org.eclipse.jetty.ee10 - jetty-ee10-test-sessions-common - test - org.eclipse.jetty jetty-hazelcast @@ -63,34 +32,36 @@ - - com.hazelcast - hazelcast - org.eclipse.jetty jetty-jmx + test true + + + org.eclipse.jetty + jetty-session test - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty + jetty-session + test-jar test - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-slf4j-impl test - org.slf4j - jul-to-slf4j + org.eclipse.jetty.ee10 + jetty-ee10-test-sessions-common test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.ee10 + jetty-ee10-webapp test @@ -98,6 +69,35 @@ jetty-test-session-common test + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.slf4j + jul-to-slf4j + test + + + org.slf4j + slf4j-api + test + + + + + org.apache.maven.plugins + maven-surefire-plugin + + --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED + true + 45 + 240 + + + + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml index 2698484dfcaa..353b999a12fd 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml @@ -13,65 +13,58 @@ infinispan/server - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*.java - - --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED - - ${infinispan.docker.image.version} - ${infinispan.docker.image.name} - - - - - - org.eclipse.jetty - jetty-session + com.google.code.gson + gson + ${gson.version} test org.eclipse.jetty - jetty-session - test-jar + jetty-client test - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty + jetty-infinispan-embedded-query test org.eclipse.jetty - jetty-client + jetty-infinispan-remote-query test - org.eclipse.jetty.ee10 - jetty-ee10-test-sessions-common + org.eclipse.jetty + jetty-jmx test + true org.eclipse.jetty - jetty-infinispan-remote-query + jetty-session test org.eclipse.jetty - jetty-infinispan-embedded-query + jetty-session + test-jar test - org.eclipse.jetty - jetty-jmx - true + org.eclipse.jetty.ee10 + jetty-ee10-test-sessions-common + test + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + test + + + org.eclipse.jetty.tests + jetty-test-session-common test @@ -79,6 +72,11 @@ jetty-test-helper test + + org.infinispan + infinispan-client-hotrod + test + org.infinispan infinispan-core @@ -95,11 +93,6 @@ infinispan-query test - - org.infinispan - infinispan-client-hotrod - test - org.infinispan infinispan-remote-query-client @@ -110,20 +103,14 @@ protostream test - - com.google.code.gson - gson - ${gson.version} - test - org.slf4j - slf4j-api + jul-to-slf4j test org.slf4j - jul-to-slf4j + slf4j-api test @@ -131,22 +118,35 @@ slf4j-simple test - - org.testcontainers - testcontainers - test - org.testcontainers junit-jupiter test - org.eclipse.jetty.tests - jetty-test-session-common + org.testcontainers + testcontainers test + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*.java + + --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED + + ${infinispan.docker.image.version} + ${infinispan.docker.image.name} + + + + + jdk16 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-jdbc/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-jdbc/pom.xml index da3a0ea48ed5..280e1a28fbb1 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-jdbc/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-jdbc/pom.xml @@ -11,44 +11,31 @@ ${project.groupId}.sessions.jdbc - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${mariadb.docker.version} - - - - - org.eclipse.jetty - jetty-server + jetty-client test org.eclipse.jetty - jetty-session + jetty-server test org.eclipse.jetty jetty-session - test-jar test - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty + jetty-session + test-jar test org.eclipse.jetty - jetty-client + jetty-slf4j-impl test @@ -57,28 +44,28 @@ test - org.slf4j - slf4j-api + org.eclipse.jetty.ee10 + jetty-ee10-webapp test - org.testcontainers - testcontainers + org.eclipse.jetty.tests + jetty-test-session-common test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.toolchain + jetty-test-helper test - org.eclipse.jetty.toolchain - jetty-test-helper + org.mariadb.jdbc + mariadb-java-client test - org.testcontainers - mariadb + org.slf4j + slf4j-api test @@ -87,14 +74,27 @@ test - org.mariadb.jdbc - mariadb-java-client + org.testcontainers + mariadb test - org.eclipse.jetty.tests - jetty-test-session-common + org.testcontainers + testcontainers test + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${mariadb.docker.version} + + + + + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-memcached/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-memcached/pom.xml index eb40a31ed12f..538e00c53d19 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-memcached/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-memcached/pom.xml @@ -14,17 +14,17 @@ org.eclipse.jetty - jetty-session + jetty-client test - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty + jetty-session test org.eclipse.jetty - jetty-client + jetty-slf4j-impl test @@ -33,23 +33,23 @@ test - org.eclipse.jetty.memcached - jetty-memcached-sessions + org.eclipse.jetty.ee10 + jetty-ee10-webapp test - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty.memcached + jetty-memcached-sessions test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.tests + jetty-test-session-common test - org.testcontainers - testcontainers + org.eclipse.jetty.toolchain + jetty-test-helper test @@ -58,8 +58,8 @@ test - org.eclipse.jetty.tests - jetty-test-session-common + org.testcontainers + testcontainers test diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-mongodb/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-mongodb/pom.xml index 7af35af25d46..673e249033e5 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-mongodb/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-mongodb/pom.xml @@ -11,65 +11,52 @@ ${project.groupId}.sessions.mongo - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${mongo.docker.version} - - - - - org.eclipse.jetty - jetty-session + jetty-client test org.eclipse.jetty - jetty-session - test-jar + jetty-jmx test + true - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty + jetty-nosql test org.eclipse.jetty - jetty-client + jetty-session test - org.eclipse.jetty.ee10 - jetty-ee10-test-sessions-common + org.eclipse.jetty + jetty-session + test-jar test org.eclipse.jetty - jetty-nosql + jetty-slf4j-impl test - org.eclipse.jetty - jetty-jmx - true + org.eclipse.jetty.ee10 + jetty-ee10-test-sessions-common test - org.slf4j - slf4j-api + org.eclipse.jetty.ee10 + jetty-ee10-webapp test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.tests + jetty-test-session-common test @@ -78,29 +65,42 @@ test - org.testcontainers - testcontainers + org.slf4j + slf4j-api test - org.testcontainers - junit-jupiter + org.slf4j + slf4j-simple test org.testcontainers - mongodb + junit-jupiter test - org.slf4j - slf4j-simple + org.testcontainers + mongodb test - org.eclipse.jetty.tests - jetty-test-session-common + org.testcontainers + testcontainers test + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${mongo.docker.version} + + + + + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/pom.xml index 0ee4263dedf7..603c51752d8c 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/pom.xml @@ -7,36 +7,36 @@ 12.0.3-SNAPSHOT jetty-ee10-test-sessions - EE10 :: Tests :: Sessions pom - - true - true - true - + EE10 :: Tests :: Sessions jetty-ee10-test-sessions-common jetty-ee10-test-sessions-file - jetty-ee10-test-sessions-jdbc - jetty-ee10-test-sessions-mongodb - jetty-ee10-test-sessions-infinispan jetty-ee10-test-sessions-gcloud - jetty-ee10-test-sessions-memcached jetty-ee10-test-sessions-hazelcast + jetty-ee10-test-sessions-infinispan + jetty-ee10-test-sessions-jdbc + jetty-ee10-test-sessions-memcached + jetty-ee10-test-sessions-mongodb + + true + true + true + - - org.eclipse.jetty.ee10 - jetty-ee10-test-sessions-common - ${project.version} - org.eclipse.jetty jetty-session ${project.version} test-jar + + org.eclipse.jetty.ee10 + jetty-ee10-test-sessions-common + ${project.version} + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-webapp-rfc2616/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-webapp-rfc2616/pom.xml index 33dce3bc4e3d..250c3d9f9cd6 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-webapp-rfc2616/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-webapp-rfc2616/pom.xml @@ -7,13 +7,24 @@ 12.0.3-SNAPSHOT jetty-ee10-test-webapp-rfc2616 - EE10 :: Tests :: RFC2616 WebApp war + EE10 :: Tests :: RFC2616 WebApp ${project.groupId}.rfc2616 true true + + + org.eclipse.jetty.ee10 + jetty-ee10-servlets + + + jakarta.servlet + jakarta.servlet-api + provided + + @@ -25,21 +36,10 @@ foo 1 - 222 + 222 - - - org.eclipse.jetty.ee10 - jetty-ee10-servlets - - - jakarta.servlet - jakarta.servlet-api - provided - - diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/pom.xml index e47ec525e567..d8f2a40fbeed 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/pom.xml @@ -1,27 +1,27 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-websocket-client-provided-webapp war EE10 :: Tests :: Websocket Simple WebApp with WebSocketClient Provided - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-slf4j-impl compile + + org.slf4j + slf4j-api + jakarta.servlet jakarta.servlet-api diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-webapp/pom.xml index c91dc9da70bb..c89afc996001 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-webapp/pom.xml @@ -1,27 +1,31 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-websocket-client-webapp war EE10 :: Tests :: Websocket Simple WebApp with WebSocketClient - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-slf4j-impl compile + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + + + org.slf4j + slf4j-api + jakarta.servlet jakarta.servlet-api @@ -37,9 +41,5 @@ jakarta.websocket-client-api provided - - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-webapp/pom.xml index 66d53cf44843..09c22a4998b3 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-webapp/pom.xml @@ -1,26 +1,31 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-websocket-webapp war EE10 :: Tests :: Websocket Simple WebApp + + org.eclipse.jetty + jetty-slf4j-impl + compile + org.slf4j slf4j-api - org.eclipse.jetty - jetty-slf4j-impl - compile + jakarta.servlet + jakarta.servlet-api + provided jakarta.websocket @@ -32,11 +37,6 @@ jetty-ee10-websocket-jakarta-common provided - - jakarta.servlet - jakarta.servlet-api - provided - diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-weld-cdi-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-weld-cdi-webapp/pom.xml index de2d5f6074d5..46c30ab80381 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-weld-cdi-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-weld-cdi-webapp/pom.xml @@ -1,32 +1,25 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-weld-cdi-webapp - EE10 :: Tests :: CDI Weld Demo WebApp war + EE10 :: Tests :: CDI Weld Demo WebApp ${project.groupId}.cdi.weld - - jetty-ee10-test-weld-cdi-demo - - - - org.eclipse.jetty.ee10 - jetty-ee10-test-cdi-common-webapp - ${project.version} - war - runtime + org.jboss.logging + jboss-logging + ${jboss.logging.version} @@ -35,10 +28,17 @@ weld-servlet-core ${weld.version} + - org.jboss.logging - jboss-logging - ${jboss.logging.version} + org.eclipse.jetty.ee10 + jetty-ee10-test-cdi-common-webapp + ${project.version} + war + runtime + + + jetty-ee10-test-weld-cdi-demo + diff --git a/jetty-ee10/jetty-ee10-tests/pom.xml b/jetty-ee10/jetty-ee10-tests/pom.xml index e271148bd01f..812b83bab4b5 100644 --- a/jetty-ee10/jetty-ee10-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/pom.xml @@ -1,43 +1,43 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT ../pom.xml - - 4.0.0 jetty-ee10-tests - EE10 :: Tests pom - - - true - true - + EE10 :: Tests jetty-ee10-test-bad-websocket-webapp + jetty-ee10-test-badinit-webapp jetty-ee10-test-cdi - jetty-ee10-test-http2-webapp + jetty-ee10-test-cdi-common-webapp jetty-ee10-test-client-transports + jetty-ee10-test-felix-webapp + jetty-ee10-test-http2-webapp jetty-ee10-test-integration jetty-ee10-test-jmx jetty-ee10-test-jndi jetty-ee10-test-loginservice - jetty-ee10-test-quickstart - jetty-ee10-test-websocket-client-provided-webapp - jetty-ee10-test-websocket-client-webapp - jetty-ee10-test-websocket-webapp - jetty-ee10-test-cdi-common-webapp - jetty-ee10-test-felix-webapp jetty-ee10-test-openid-webapp jetty-ee10-test-owb-cdi-webapp + jetty-ee10-test-quickstart + jetty-ee10-test-sessions jetty-ee10-test-simple-session-webapp jetty-ee10-test-webapp-rfc2616 + jetty-ee10-test-websocket-client-provided-webapp + jetty-ee10-test-websocket-client-webapp + jetty-ee10-test-websocket-webapp jetty-ee10-test-weld-cdi-webapp - jetty-ee10-test-badinit-webapp - jetty-ee10-test-sessions + + + true + true + diff --git a/jetty-ee10/jetty-ee10-webapp/pom.xml b/jetty-ee10/jetty-ee10-webapp/pom.xml index fd16eb641269..e9107f45fa68 100644 --- a/jetty-ee10/jetty-ee10-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-webapp/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-webapp EE10 :: WebApp Jetty web application support @@ -15,15 +16,54 @@ org.eclipse.jetty.ee10.webapp.* + + + org.eclipse.jetty + jetty-session + + + org.eclipse.jetty + jetty-xml + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + src/main/resources - src/main/config/etc org/eclipse/jetty/ee10/webapp false + src/main/config/etc webdefault-ee10.xml @@ -31,14 +71,23 @@ + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration + + + org.apache.maven.plugins maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} - --add-exports org.eclipse.jetty.ee10.webapp/org.acme.webapp=org.eclipse.jetty.ee10.servlet - + @{argLine} ${jetty.surefire.argLine} + --add-exports org.eclipse.jetty.ee10.webapp/org.acme.webapp=org.eclipse.jetty.ee10.servlet false ${basedir}/src/test/resources/mods/foo-bar-janb.jar @@ -48,60 +97,6 @@ - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration - - - - - - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - - - org.eclipse.jetty - jetty-session - - - org.eclipse.jetty - jetty-xml - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-client - test - - diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml index 13cbba5c15f7..ab81c5600939 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jakarta-client-webapp EE10 :: Websocket :: Jakarta Client WebApp @@ -15,14 +15,14 @@ - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-client - jakarta.servlet jakarta.servlet-api + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-client + @@ -39,15 +39,9 @@ jakarta.websocket.client WebApp Implementation - - org.eclipse.jetty.ee10.websocket.jakarta.client.webapp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer - + org.eclipse.jetty.ee10.websocket.jakarta.client.webapp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml index 19e8f7bb605a..41306616d4fa 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jakarta-client EE10 :: Websocket :: Jakarta Client @@ -17,11 +17,15 @@ jakarta.websocket - jakarta.websocket-client-api + jakarta.websocket-api jakarta.websocket - jakarta.websocket-api + jakarta.websocket-client-api + + + org.eclipse.jetty + jetty-client org.eclipse.jetty.ee10.websocket @@ -31,10 +35,6 @@ org.eclipse.jetty.websocket jetty-websocket-core-client - - org.eclipse.jetty - jetty-client - jakarta.servlet jakarta.servlet-api @@ -42,17 +42,17 @@ org.eclipse.jetty - jetty-xml + jetty-jmx test org.eclipse.jetty - jetty-jmx + jetty-slf4j-impl test org.eclipse.jetty - jetty-slf4j-impl + jetty-xml test @@ -71,15 +71,9 @@ jakarta.websocket.client Implementation - - org.eclipse.jetty.ee10.websocket.jakarta.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=jakarta.websocket.ContainerProvider - + org.eclipse.jetty.ee10.websocket.jakarta.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=jakarta.websocket.ContainerProvider diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml index b4ab7c3a7e19..ba18dea079b7 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jakarta-common EE10 :: Websocket :: Jakarta Common @@ -14,31 +14,6 @@ ${project.groupId}.jakarta.common - - - - org.apache.felix - maven-bundle-plugin - true - - - - manifest - - - - Jakarta Websocket Common Implementation - - org.eclipse.jetty.ee10.websocket.jakarta.common.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - - - - - - - jakarta.websocket @@ -56,16 +31,39 @@ org.slf4j slf4j-api - - org.eclipse.jetty - jetty-slf4j-impl + org.awaitility + awaitility test + - org.awaitility - awaitility + org.eclipse.jetty + jetty-slf4j-impl test + + + + + org.apache.felix + maven-bundle-plugin + true + + + + manifest + + + + Jakarta Websocket Common Implementation + org.eclipse.jetty.ee10.websocket.jakarta.common.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + + + + + + + diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml index 8771ed30022e..f3c01a08800a 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jakarta-server EE10 :: Websocket :: Jakarta Server @@ -16,20 +16,20 @@ - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-client - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-servlet + jakarta.websocket + jakarta.websocket-api org.eclipse.jetty.ee10 jetty-ee10-annotations - jakarta.websocket - jakarta.websocket-api + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-client + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-servlet org.slf4j @@ -44,14 +44,6 @@ - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.websocket.jakarta.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.jakarta.common=org.eclipse.jetty.websocket.jakarta.server - - - org.apache.felix maven-bundle-plugin @@ -64,18 +56,20 @@ jakarta.websocket.server Implementation - - org.eclipse.jetty.ee10.websocket.jakarta.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.ee10.websocket.jakarta.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=jakarta.websocket.server.ServerEndpointConfig$Configurator - + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=jakarta.websocket.server.ServerEndpointConfig$Configurator + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.websocket.jakarta.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.jakarta.common=org.eclipse.jetty.websocket.jakarta.server + + diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml index 5e2a020a7e9a..d6132dad8939 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jakarta-tests EE10 :: Websocket :: Jakarta Tests @@ -18,8 +18,12 @@ - org.slf4j - slf4j-api + jakarta.websocket + jakarta.websocket-api + + + org.eclipse.jetty + jetty-http-tools org.eclipse.jetty.ee10.websocket @@ -30,17 +34,16 @@ jetty-ee10-websocket-jakarta-server - org.eclipse.jetty - jetty-http-tools + org.eclipse.jetty.toolchain + jetty-test-helper - jakarta.websocket - jakarta.websocket-api + org.junit.jupiter + junit-jupiter - org.eclipse.jetty - jetty-util-ajax - test + org.slf4j + slf4j-api org.eclipse.jetty @@ -48,12 +51,9 @@ test - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.junit.jupiter - junit-jupiter + org.eclipse.jetty + jetty-util-ajax + test @@ -71,9 +71,7 @@ jakarta.websocket Integration Tests - - org.eclipse.jetty.websocket.jakarta.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.jakarta.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml index b1b64e8a93e7..086e75f41617 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jetty-client-webapp EE10 :: Websocket :: Jetty Client WebApp @@ -14,6 +14,17 @@ ${project.groupId}.client.webapp + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + + + @@ -22,27 +33,12 @@ true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - - - diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml index a89db268c34d..7223f2de223c 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jetty-server EE10 :: Websocket :: Jetty Server @@ -16,33 +16,33 @@ - org.eclipse.jetty.websocket - jetty-websocket-jetty-api - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-common + jakarta.servlet + jakarta.servlet-api - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-servlet + org.eclipse.jetty + jetty-jmx + true - jakarta.servlet - jakarta.servlet-api + org.eclipse.jetty.ee10 + jetty-ee10-annotations org.eclipse.jetty.ee10 jetty-ee10-servlet - org.eclipse.jetty.ee10 - jetty-ee10-annotations + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-servlet - org.eclipse.jetty - jetty-jmx - true + org.eclipse.jetty.websocket + jetty-websocket-jetty-api + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-common org.slf4j @@ -65,9 +65,7 @@ Jetty Websocket Server osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer - + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml index 6d2bb69fb50c..b9d458ae3bbe 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jetty-tests EE10 :: Websocket :: Jetty Tests @@ -33,51 +33,50 @@ test - org.eclipse.jetty.http2 - jetty-http2-client-transport + org.eclipse.jetty + jetty-slf4j-impl test - org.eclipse.jetty.http2 - jetty-http2-server + org.eclipse.jetty + jetty-xml test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-client-webapp test - org.eclipse.jetty.websocket - jetty-websocket-jetty-api + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server test - org.eclipse.jetty.websocket - jetty-websocket-jetty-client + org.eclipse.jetty.http2 + jetty-http2-client-transport test - org.eclipse.jetty.websocket - jetty-websocket-jetty-server + org.eclipse.jetty.http2 + jetty-http2-server test - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-client-webapp + org.eclipse.jetty.websocket + jetty-websocket-jetty-api test - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server + org.eclipse.jetty.websocket + jetty-websocket-jetty-client test - org.eclipse.jetty - jetty-xml + org.eclipse.jetty.websocket + jetty-websocket-jetty-server test - diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml index d7f539a8292d..624359b14bb2 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-servlet EE10 :: Websocket :: Servlet @@ -15,14 +15,14 @@ - - org.eclipse.jetty.websocket - jetty-websocket-core-server - org.eclipse.jetty.ee10 jetty-ee10-servlet + + org.eclipse.jetty.websocket + jetty-websocket-core-server + org.slf4j slf4j-api diff --git a/jetty-ee10/jetty-ee10-websocket/pom.xml b/jetty-ee10/jetty-ee10-websocket/pom.xml index d3746bcb3840..0b80c0e680d8 100644 --- a/jetty-ee10/jetty-ee10-websocket/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/pom.xml @@ -1,20 +1,16 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - EE10 :: Websocket pom - - - true - + EE10 :: Websocket jetty-ee10-websocket-jakarta-client @@ -28,4 +24,8 @@ jetty-ee10-websocket-servlet + + true + + diff --git a/jetty-ee10/pom.xml b/jetty-ee10/pom.xml index 7f1aa34eed40..6a70c6ccb434 100644 --- a/jetty-ee10/pom.xml +++ b/jetty-ee10/pom.xml @@ -1,16 +1,42 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 - EE10 pom + EE10 + + + jetty-ee10-annotations + jetty-ee10-apache-jsp + jetty-ee10-bom + jetty-ee10-cdi + jetty-ee10-demos + jetty-ee10-examples + jetty-ee10-fcgi-proxy + jetty-ee10-glassfish-jstl + jetty-ee10-home + jetty-ee10-jaspi + jetty-ee10-jndi + jetty-ee10-jspc-maven-plugin + jetty-ee10-maven-plugin + jetty-ee10-osgi + jetty-ee10-plus + jetty-ee10-proxy + jetty-ee10-quickstart + jetty-ee10-runner + jetty-ee10-servlet + jetty-ee10-servlets + jetty-ee10-tests + jetty-ee10-webapp + jetty-ee10-websocket + 2.1.2 @@ -22,53 +48,147 @@ 2.0.1 2.1.0 2.1.2 - 2.0.1 6.0.0 3.1.1 3.0.0 3.0.1 + 2.0.1 + 2.1.1 3.1.0 4.0.0 4.0.1 - 4.0.0 4.0.0 - 2.1.1 + 4.0.0 10.1.7 2.0.1 - 5.1.1.Final true + 5.1.1.Final - - jetty-ee10-demos - jetty-ee10-apache-jsp - jetty-ee10-glassfish-jstl - jetty-ee10-annotations - jetty-ee10-cdi - jetty-ee10-jaspi - jetty-ee10-jndi - jetty-ee10-jspc-maven-plugin - jetty-ee10-maven-plugin - jetty-ee10-osgi - jetty-ee10-plus - jetty-ee10-proxy - jetty-ee10-quickstart - jetty-ee10-runner - jetty-ee10-servlet - jetty-ee10-servlets - jetty-ee10-webapp - jetty-ee10-websocket - jetty-ee10-tests - jetty-ee10-examples - jetty-ee10-bom - jetty-ee10-home - jetty-ee10-fcgi-proxy - - + + com.sun.mail + jakarta.mail + ${mail.impl.version} + + + com.sun.xml.ws + jaxws-rt + ${jakarta.xml.jaxws.impl.version} + + + jakarta.activation + jakarta.activation-api + ${jakarta.activation.api.version} + + + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation.api.version} + + + jakarta.authentication + jakarta.authentication-api + ${jakarta.authentication.api.version} + + + jakarta.el + jakarta.el-api + ${jakarta.el.api.version} + + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${jakarta.enterprise.cdi.api.version} + + + jakarta.enterprise + jakarta.enterprise.lang-model + ${jakarta.enterprise.lang.model.version} + + + jakarta.inject + jakarta.inject-api + ${jakarta.inject.api.version} + + + jakarta.interceptor + jakarta.interceptor-api + ${jakarta.interceptor.api.version} + + + jakarta.mail + jakarta.mail-api + ${jakarta.mail.api.version} + + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.api.version} + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + ${jakarta.servlet.jsp.api.version} + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + ${jakarta.servlet.jsp.jstl.api.version} + + + jakarta.el + jakarta.el-api + + + jakarta.servlet + jakarta.servlet-api + + + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + + + jakarta.websocket + jakarta.websocket-api + ${jakarta.websocket.api.version} + + + jakarta.websocket + jakarta.websocket-client-api + ${jakarta.websocket.api.version} + + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs.api.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind.api.version} + + + jakarta.xml.ws + jakarta.xml.ws-api + ${jakarta.xml.ws.api.version} + + + org.eclipse.jetty + jetty-openid + ${project.version} + + + org.eclipse.jetty + jetty-security + ${project.version} + org.eclipse.jetty.ee10 @@ -95,11 +215,6 @@ jetty-ee10-glassfish-jstl ${project.version} - - org.eclipse.jetty - jetty-security - ${project.version} - org.eclipse.jetty.ee10 jetty-ee10-jaspi @@ -120,11 +235,6 @@ jetty-ee10-maven-plugin ${project.version} - - org.eclipse.jetty - jetty-openid - ${project.version} - org.eclipse.jetty.ee10 jetty-ee10-plus @@ -155,41 +265,6 @@ jetty-ee10-webapp ${project.version} - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-client - ${project.version} - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-client-webapp - ${project.version} - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-common - ${project.version} - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-server - ${project.version} - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-client-webapp - ${project.version} - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server - ${project.version} - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-servlet - ${project.version} - org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest-jar @@ -242,13 +317,13 @@ org.eclipse.jetty.ee10.demos - jetty-ee10-demo-spec-webapp + jetty-ee10-demo-simple-webapp ${project.version} war org.eclipse.jetty.ee10.demos - jetty-ee10-demo-simple-webapp + jetty-ee10-demo-spec-webapp ${project.version} war @@ -257,126 +332,40 @@ jetty-ee10-demo-web-fragment ${project.version} - - - org.mortbay.jasper - apache-jsp - ${jsp.impl.version} - - - org.mortbay.jasper - apache-el - ${jsp.impl.version} - - - com.sun.xml.ws - jaxws-rt - ${jakarta.xml.jaxws.impl.version} - - - com.sun.mail - jakarta.mail - ${mail.impl.version} - - - jakarta.el - jakarta.el-api - ${jakarta.el.api.version} - - - jakarta.enterprise - jakarta.enterprise.cdi-api - ${jakarta.enterprise.cdi.api.version} - - - jakarta.enterprise - jakarta.enterprise.lang-model - ${jakarta.enterprise.lang.model.version} - - - jakarta.activation - jakarta.activation-api - ${jakarta.activation.api.version} - - - jakarta.annotation - jakarta.annotation-api - ${jakarta.annotation.api.version} - - - jakarta.authentication - jakarta.authentication-api - ${jakarta.authentication.api.version} - - - jakarta.interceptor - jakarta.interceptor-api - ${jakarta.interceptor.api.version} - - - jakarta.inject - jakarta.inject-api - ${jakarta.inject.api.version} - - - jakarta.mail - jakarta.mail-api - ${jakarta.mail.api.version} - - - jakarta.servlet - jakarta.servlet-api - ${jakarta.servlet.api.version} - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - ${jakarta.servlet.jsp.api.version} - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - ${jakarta.servlet.jsp.jstl.api.version} - - - jakarta.servlet - jakarta.servlet-api - - - jakarta.el - jakarta.el-api - - + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-client + ${project.version} - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-client-webapp + ${project.version} - jakarta.ws.rs - jakarta.ws.rs-api - ${jakarta.ws.rs.api.version} + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-common + ${project.version} - jakarta.xml.bind - jakarta.xml.bind-api - ${jakarta.xml.bind.api.version} + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server + ${project.version} - jakarta.xml.ws - jakarta.xml.ws-api - ${jakarta.xml.ws.api.version} + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-client-webapp + ${project.version} - jakarta.websocket - jakarta.websocket-client-api - ${jakarta.websocket.api.version} + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server + ${project.version} - jakarta.websocket - jakarta.websocket-api - ${jakarta.websocket.api.version} + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-servlet + ${project.version} org.glassfish.jaxb @@ -388,6 +377,17 @@ jakarta.servlet.jsp.jstl ${jakarta.servlet.jsp.jstl.impl.version} + + org.mortbay.jasper + apache-el + ${jsp.impl.version} + + + + org.mortbay.jasper + apache-jsp + ${jsp.impl.version} + @@ -406,10 +406,10 @@ ee10-report - validate dependency-updates-aggregate-report + validate html diff --git a/jetty-ee8/jetty-ee8-annotations/pom.xml b/jetty-ee8/jetty-ee8-annotations/pom.xml index ca8c82a060ed..cb5757bffc32 100644 --- a/jetty-ee8/jetty-ee8-annotations/pom.xml +++ b/jetty-ee8/jetty-ee8-annotations/pom.xml @@ -1,77 +1,26 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-annotations EE8 :: Servlet Annotations Annotation support for deploying servlets in jetty. - jetty-ee9-annotations ${project.groupId}.annotations + jetty-ee9-annotations org.eclipse.jetty.ee8.annotations.* - - - - src/test/jar - jar - - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.annotations=org.eclipse.jetty.logging --add-opens org.eclipse.jetty.ee8.annotations/org.eclipse.jetty.ee8.annotations.resources=org.eclipse.jetty.ee8.plus - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-ee8-test-resources - generate-test-resources - - copy-resources - - - ${project.build.testOutputDirectory} - - - ${maven.multiModuleProjectDirectory}/jetty-ee9/${ee9.module}/src/test/resources - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},org.objectweb.asm;version="[$(version;==;${asm.version}),$(version;+;${asm.version}))",* - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)", osgi.serviceloader; filter:="(osgi.serviceloader=jakarta.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration - - - - - - - + + jakarta.annotation + jakarta.annotation-api + org.eclipse.jetty.ee8 jetty-ee8-plus @@ -81,8 +30,8 @@ jetty-ee8-webapp - jakarta.annotation - jakarta.annotation-api + org.eclipse.jetty.toolchain + jetty-servlet-api org.ow2.asm @@ -96,20 +45,11 @@ org.slf4j slf4j-api - - org.eclipse.jetty.toolchain - jetty-servlet-api - jakarta.transaction jakarta.transaction-api test - - org.eclipse.jetty.toolchain - jetty-test-helper - test - org.eclipse.jetty jetty-jndi @@ -120,5 +60,61 @@ jetty-slf4j-impl test + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + + + jar + src/test/jar + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},org.objectweb.asm;version="[$(version;==;${asm.version}),$(version;+;${asm.version}))",* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)", osgi.serviceloader; filter:="(osgi.serviceloader=jakarta.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-ee8-test-resources + + copy-resources + + generate-test-resources + + ${project.build.testOutputDirectory} + + + ${maven.multiModuleProjectDirectory}/jetty-ee9/${ee9.module}/src/test/resources + + + + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.annotations=org.eclipse.jetty.logging --add-opens org.eclipse.jetty.ee8.annotations/org.eclipse.jetty.ee8.annotations.resources=org.eclipse.jetty.ee8.plus + + + + diff --git a/jetty-ee8/jetty-ee8-apache-jsp/pom.xml b/jetty-ee8/jetty-ee8-apache-jsp/pom.xml index 8d1b48ab9a60..02aec5d5ae2a 100644 --- a/jetty-ee8/jetty-ee8-apache-jsp/pom.xml +++ b/jetty-ee8/jetty-ee8-apache-jsp/pom.xml @@ -1,20 +1,61 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-apache-jsp EE8 :: Apache JSP - jetty-ee9-apache-jsp ${project.groupId}.apache-jsp + jetty-ee9-apache-jsp true + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty.toolchain + jetty-servlet-api + + + org.mortbay.jasper + apache-jsp + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + @@ -24,14 +65,9 @@ Jetty-specific ServletContainerInitializer for Jasper - - org.eclipse.jetty.ee8.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", org.eclipse.jetty.ee8.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=org.apache.juli.logging.Log - + org.eclipse.jetty.ee8.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", org.eclipse.jetty.ee8.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=org.apache.juli.logging.Log <_nouses>true @@ -57,44 +93,4 @@ - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-util - - - org.mortbay.jasper - apache-jsp - - - org.eclipse.jetty.ee8 - jetty-ee8-servlet - test - - - org.eclipse.jetty.toolchain - jetty-servlet-api - - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - - diff --git a/jetty-ee8/jetty-ee8-bom/pom.xml b/jetty-ee8/jetty-ee8-bom/pom.xml index a259f29bd0b3..5918261813e2 100644 --- a/jetty-ee8/jetty-ee8-bom/pom.xml +++ b/jetty-ee8/jetty-ee8-bom/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -8,34 +9,9 @@ jetty-ee8-bom + pom EE8 :: BOM Jetty EE8 APIs BOM artifact - pom - - - - - org.codehaus.mojo - flatten-maven-plugin - - - flatten - - flatten - - process-resources - - - flatten-clean - - clean - - clean - - - - - @@ -157,4 +133,29 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + flatten-clean + + clean + + clean + + + flatten + + flatten + + process-resources + + + + + diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-jar/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-jar/pom.xml index 904319779c3a..aa2af8f53d02 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-jar/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-jar/pom.xml @@ -1,18 +1,19 @@ + + + 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demo-async-rest 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-demo-async-rest-jar jar EE8 :: Demo :: Async Rest :: Jar - jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-jar ${project.parent.groupId}.async.rest + jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-jar diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-server/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-server/pom.xml index d8ba53fca9d4..6854a23329ee 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-server/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-server/pom.xml @@ -1,18 +1,19 @@ + + + 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demo-async-rest 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-demo-async-rest-server jar EE8 :: Demo :: Async Rest :: Server - jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-server ${project.parent.groupId}.async.rest.server + jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-server diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/pom.xml index 96435bcedd95..d9b085c926bd 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demo-async-rest 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-demo-async-rest-webapp war EE8 :: Demo :: Async Rest :: WebApp @@ -15,10 +16,6 @@ - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-slf4j-impl @@ -28,6 +25,10 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demo-async-rest-jar + + org.slf4j + slf4j-api + org.eclipse.jetty.toolchain jetty-servlet-api diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/pom.xml index d8b25175bd1e..26e699de4737 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/pom.xml @@ -1,19 +1,20 @@ + + + 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demos 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-demo-async-rest pom EE8 :: Demo :: Async Rest jetty-ee8-demo-async-rest-jar - jetty-ee8-demo-async-rest-webapp jetty-ee8-demo-async-rest-server + jetty-ee8-demo-async-rest-webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/pom.xml index 5af6cd8111b2..76223a9d85a6 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/pom.xml @@ -7,11 +7,11 @@ 12.0.3-SNAPSHOT jetty-ee8-demo-jaas-webapp - EE8 :: Demo :: JAAS WebApp war + EE8 :: Demo :: JAAS WebApp - jetty-ee9-demos/jetty-ee9-demo-jaas-webapp ${project.groupId}.jaas + jetty-ee9-demos/jetty-ee9-demo-jaas-webapp + / + + .,WEB-INF/classes + @@ -37,10 +150,10 @@ web-bundle-assembly - package single + package src/main/assembly/web-bundle.xml @@ -53,27 +166,20 @@ - org.apache.felix - maven-bundle-plugin - true + org.apache.maven.plugins + maven-surefire-plugin - - war - - - javax.servlet.jsp.*;version="[3,4)",org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",* - !org.example* - - / - - .,WEB-INF/classes - + + **/WebAppTest.java + **/Test*.java + + + + test + test + + @@ -85,111 +191,5 @@ - - - - org.eclipse.jetty.ee8 - jetty-ee8-maven-plugin - ${project.version} - - - org.eclipse.jetty - jetty-client - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-servlet - ${project.version} - - - - 8087 - foo - 1 - - 222 - - - /test - ${project.build.directory}/work - - - - Test Realm - ${project.build.testOutputDirectory}/test-realm.properties - - - - - - - - - org.eclipse.jetty.ee8 - jetty-ee8-servlets - provided - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - org.eclipse.jetty.ee8 - jetty-ee8-webapp - test - - - org.eclipse.jetty - jetty-jmx - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-server - provided - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided - - - jakarta.annotation - jakarta.annotation-api - provided - - - org.eclipse.jetty.toolchain - jetty-javax-websocket-api - provided - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-api - provided - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-server - provided - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-javax-server - test - - diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/pom.xml index a976e2dd945c..1a599f03fa68 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/pom.xml @@ -7,58 +7,79 @@ 12.0.3-SNAPSHOT jetty-ee8-demo-jndi-webapp - EE8 :: Demo :: JNDI WebApp war + EE8 :: Demo :: JNDI WebApp - jetty-ee9-demos/jetty-ee9-demo-jndi-webapp ${project.groupId}.jndi + jetty-ee9-demos/jetty-ee9-demo-jndi-webapp + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-mock-resources + provided + + + org.eclipse.jetty.orbit + javax.mail.glassfish + provided + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${project.version} + + ${project.build.directory}/plugin-context.xml + + src/main/webapp + ${project.build.directory}/webapp/WEB-INF/web.xml + /test-jndi + + + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-mock-resources + ${project.version} + + + + + - - org.apache.maven.plugins - maven-resources-plugin - - - copy-templates-resources - generate-resources - - copy-resources - - - - ee9-to-ee8 - - ${project.build.directory}/templates - - - true - ${ee9.module.path}/src/main/templates - - - - - - maven-antrun-plugin generate-xml-files + + run + process-resources - + - + - - run - @@ -67,10 +88,10 @@ maven-dependency-plugin - package copy-dependencies + package jakarta.transaction-api,ee8-demo-mock-resources ${project.build.directory}/lib/jndi @@ -78,52 +99,31 @@ + + org.apache.maven.plugins + maven-resources-plugin + + + copy-templates-resources + + copy-resources + + generate-resources + + + ee9-to-ee8 + + ${project.build.directory}/templates + + + true + ${ee9.module.path}/src/main/templates + + + + + + - - - - org.eclipse.jetty - jetty-maven-plugin - ${project.version} - - ${project.build.directory}/plugin-context.xml - - src/main/webapp - ${project.build.directory}/webapp/WEB-INF/web.xml - /test-jndi - - - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-mock-resources - ${project.version} - - - - - - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-mock-resources - provided - - - jakarta.transaction - jakarta.transaction-api - provided - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - org.eclipse.jetty.orbit - javax.mail.glassfish - provided - - diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jsp-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jsp-webapp/pom.xml index 28699f31c956..8c1e5a7f1394 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jsp-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jsp-webapp/pom.xml @@ -1,21 +1,39 @@ + + 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demos 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-demo-jsp-webapp - EE8 :: Demo :: JSP WebApp war + EE8 :: Demo :: JSP WebApp - jetty-ee9-demos/jetty-ee9-demo-jsp-webapp ${project.groupId}.jsp + jetty-ee9-demos/jetty-ee9-demo-jsp-webapp + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + provided + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + + @@ -34,24 +52,15 @@ - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - maven-assembly-plugin web-bundle-assembly - package single + package src/main/assembly/web-bundle.xml @@ -63,32 +72,30 @@ + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided - - - precompile-jsp + + org.apache.maven.plugins + maven-war-plugin + + ${basedir}/target/web.xml + + org.eclipse.jetty jetty-jspc-maven-plugin @@ -110,13 +117,6 @@ - - org.apache.maven.plugins - maven-war-plugin - - ${basedir}/target/web.xml - - diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/pom.xml index beffcc38967c..b9024dd7f75d 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -5,13 +6,30 @@ jetty-ee8-demos 12.0.3-SNAPSHOT - EE8 :: Demo :: Mock Resources jetty-ee8-demo-mock-resources jar + EE8 :: Demo :: Mock Resources - jetty-ee9-demos/jetty-ee9-demo-mock-resources ${project.groupId}.mocks + jetty-ee9-demos/jetty-ee9-demo-mock-resources + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.orbit + javax.mail.glassfish + provided + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + @@ -27,12 +45,8 @@ org.eclipse.jetty.ee8.demos.ee8-demo-mock-resources Mock resources used for testing - - org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - javax.sql, jakarta.transaction;version="1.3.3" - + org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + javax.sql, jakarta.transaction;version="1.3.3" <_nouses>true @@ -41,21 +55,4 @@ - - - jakarta.transaction - jakarta.transaction-api - provided - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - org.eclipse.jetty.orbit - javax.mail.glassfish - provided - - diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/pom.xml index fe9df35b4fd6..8c400285ec9a 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/pom.xml @@ -1,36 +1,22 @@ + 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demos 12.0.3-SNAPSHOT - 4.0.0 jetty-ee8-demo-proxy-webapp - EE8 :: Demo :: Proxy WebApp war + EE8 :: Demo :: Proxy WebApp - jetty-ee9-demos/jetty-ee9-demo-proxy-webapp ${project.groupId}.proxy + jetty-ee9-demos/jetty-ee9-demo-proxy-webapp - - - - maven-war-plugin - - ${warSourceDirectory} - true - - ${warSourceDirectory}/META-INF/MANIFEST.MF - - - - - - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-client org.eclipse.jetty @@ -42,37 +28,37 @@ jetty-ee8-proxy - org.eclipse.jetty.toolchain - jetty-servlet-api - provided + org.slf4j + slf4j-api - org.eclipse.jetty.ee8 - jetty-ee8-webapp - test + jakarta.servlet.jsp + jakarta.servlet.jsp-api + provided - org.eclipse.jetty - jetty-client + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided org.eclipse.jetty - jetty-jmx - test + jetty-server + provided - org.eclipse.jetty - jetty-server + org.eclipse.jetty.toolchain + jetty-servlet-api provided - org.eclipse.jetty.http2 - jetty-http2-server + org.eclipse.jetty + jetty-alpn-java-server test org.eclipse.jetty - jetty-alpn-java-server + jetty-jmx test @@ -81,14 +67,28 @@ test - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided + org.eclipse.jetty.ee8 + jetty-ee8-webapp + test - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided + org.eclipse.jetty.http2 + jetty-http2-server + test + + + + maven-war-plugin + + ${warSourceDirectory} + true + + ${warSourceDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-simple-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-simple-webapp/pom.xml index 3dad68c56a90..8a0eaeef67a6 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-simple-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-simple-webapp/pom.xml @@ -1,23 +1,21 @@ + + 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demos 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-demo-simple-webapp - EE8 :: Demo :: Simple WebApp war + EE8 :: Demo :: Simple WebApp - jetty-ee9-demos/jetty-ee9-demo-simple-webapp ${project.groupId}.simple + jetty-ee9-demos/jetty-ee9-demo-simple-webapp - - org.eclipse.jetty.toolchain diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-container-initializer/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-container-initializer/pom.xml index 49ba1412a37c..3291d0336606 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-container-initializer/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-container-initializer/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -9,9 +10,16 @@ jar EE8 :: Demo :: Servlet Spec :: ServletContainerInitializer Jar - jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer ${project.groupId}.sci + jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + @@ -31,11 +39,4 @@ - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml index d21eeab4e105..355cffc63708 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml @@ -6,54 +6,90 @@ jetty-ee8-demo-spec 12.0.3-SNAPSHOT - EE8 :: Demo :: Servlet Spec :: WebApp jetty-ee8-demo-spec-webapp war + EE8 :: Demo :: Servlet Spec :: WebApp - jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp ${project.groupId}.spec.webapp + jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp + + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-container-initializer + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-web-fragment + + + jakarta.annotation + jakarta.annotation-api + provided + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + + + + + + + + org.eclipse.jetty.ee8 + jetty-ee8-maven-plugin + ${project.version} + + 10 + ${project.build.directory}/plugin-context.xml + + src/main/webapp + src/main/webapp/WEB-INF/web.xml + /test-spec + .*/jetty-jakarta-servlet-api-[^/]*\.jar$ + true + ${basedir}/src/main/webapp/WEB-INF/jetty-env.xml + + + + Test Realm + ${project.build.directory}/realm.properties + + + + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-mock-resources + ${project.version} + + + + + - - org.apache.maven.plugins - maven-assembly-plugin - - - web-bundle-assembly - package - - single - - - - src/main/assembly/web-bundle.xml - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - target - - plugin-context.xml - - META-INF - - - - org.apache.felix @@ -66,10 +102,8 @@ Test Webapp for Servlet 5.0 Features - - jakarta.transaction*;version="2.0.0", jakarta.servlet*;version="[5,6)", org.eclipse.jetty*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.eclipse.jetty.webapp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", org.eclipse.jetty.plus.jndi;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", * - - <_nouses /> + jakarta.transaction*;version="2.0.0", jakarta.servlet*;version="[5,6)", org.eclipse.jetty*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.eclipse.jetty.webapp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", org.eclipse.jetty.plus.jndi;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", * + <_nouses> org.example.test;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}";-noimport:=true / .,WEB-INF/classes,WEB-INF/lib @@ -77,65 +111,46 @@ - - org.apache.maven.plugins - maven-resources-plugin - - - copy-templates-resources - generate-resources - - copy-resources - - - - ee9-to-ee8 - - ${project.build.directory}/templates - - - true - ${ee9.module.path}/src/main/templates - - - - - - copy-realm - generate-resources - - copy-resources - - - ${project.build.directory}/realm - - - ${ee9.module.path}/src/etc - - - - - - maven-antrun-plugin generate-xml-files + + run + process-resources - + - + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + web-bundle-assembly - run + single + package + + + src/main/assembly/web-bundle.xml + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + @@ -144,10 +159,10 @@ maven-dependency-plugin - package copy + package @@ -185,81 +200,64 @@ + + org.apache.maven.plugins + maven-resources-plugin + + + copy-realm + + copy-resources + + generate-resources + + ${project.build.directory}/realm + + + ${ee9.module.path}/src/etc + + + + + + copy-templates-resources + + copy-resources + + generate-resources + + + ee9-to-ee8 + + ${project.build.directory}/templates + + + true + ${ee9.module.path}/src/main/templates + + + + + + + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + target + + plugin-context.xml + + META-INF + + + + - - - - org.eclipse.jetty.ee8 - jetty-ee8-maven-plugin - ${project.version} - - 10 - ${project.build.directory}/plugin-context.xml - - src/main/webapp - src/main/webapp/WEB-INF/web.xml - /test-spec - .*/jetty-jakarta-servlet-api-[^/]*\.jar$ - true - ${basedir}/src/main/webapp/WEB-INF/jetty-env.xml - - - - Test Realm - ${project.build.directory}/realm.properties - - - - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-mock-resources - ${project.version} - - - - - - - - - jakarta.transaction - jakarta.transaction-api - provided - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - jakarta.annotation - jakarta.annotation-api - provided - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-web-fragment - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-container-initializer - - - - - diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-web-fragment/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-web-fragment/pom.xml index 4c8a7ffe84b3..b20ea2950934 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-web-fragment/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-web-fragment/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -5,14 +6,14 @@ jetty-ee8-demo-spec 12.0.3-SNAPSHOT - - EE8 :: Demo :: Servlet Spec :: Fragment Jar jetty-ee8-demo-web-fragment jar + EE8 :: Demo :: Servlet Spec :: Fragment Jar + - jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment ${project.groupId}.spec.fragment + jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/pom.xml index 210b2f3fac1a..ca95ce75a39a 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/pom.xml @@ -6,13 +6,13 @@ jetty-ee8-demos 12.0.3-SNAPSHOT - EE8 :: Demo :: Servlet Spec jetty-ee8-demo-spec pom + EE8 :: Demo :: Servlet Spec - jetty-ee8-demo-spec-webapp jetty-ee8-demo-container-initializer + jetty-ee8-demo-spec-webapp jetty-ee8-demo-web-fragment diff --git a/jetty-ee8/jetty-ee8-demos/pom.xml b/jetty-ee8/jetty-ee8-demos/pom.xml index 281d469cd9e7..8e211a37d69b 100644 --- a/jetty-ee8/jetty-ee8-demos/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/pom.xml @@ -1,16 +1,33 @@ + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demos - EE8 :: Demos pom + EE8 :: Demos + + + jetty-ee8-demo-async-rest + jetty-ee8-demo-jaas-webapp + jetty-ee8-demo-jetty-webapp + jetty-ee8-demo-jndi-webapp + + + jetty-ee8-demo-jsp-webapp + jetty-ee8-demo-mock-resources + + jetty-ee8-demo-proxy-webapp + jetty-ee8-demo-simple-webapp + + jetty-ee8-demo-spec + + true @@ -40,23 +57,6 @@ - - jetty-ee8-demo-simple-webapp - jetty-ee8-demo-async-rest - jetty-ee8-demo-jaas-webapp - jetty-ee8-demo-mock-resources - jetty-ee8-demo-jndi-webapp - jetty-ee8-demo-jetty-webapp - - jetty-ee8-demo-proxy-webapp - - - jetty-ee8-demo-jsp-webapp - - jetty-ee8-demo-spec - - - demo-webapp-module @@ -73,10 +73,10 @@ copy-ee8-webapp-resources - generate-resources copy-resources + generate-resources ee9-to-ee8 diff --git a/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml b/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml index aab1712c8ff5..d7c625fca83c 100644 --- a/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml +++ b/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml @@ -1,35 +1,21 @@ + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - 4.0.0 jetty-ee8-glassfish-jstl + jar EE8 :: Glassfish JSTL https://projects.eclipse.org/projects/ee4j.glassfish - jar - jetty-ee9-glassfish-jstl ${project.groupId}.glassfish.jstl + jetty-ee9-glassfish-jstl true - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - .*/jetty-jakarta-servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-[^/]*\.jar|.*jsp.jstl-[^/]*\.jar - - - - - - @@ -48,19 +34,19 @@ javax.servlet.jsp.jstl - javax.servlet.jsp + javax.servlet * - javax.servlet + javax.servlet.jsp * - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty.ee8 + jetty-ee8-annotations test @@ -72,13 +58,13 @@ org.eclipse.jetty.ee8 - jetty-ee8-annotations + jetty-ee8-webapp test - org.eclipse.jetty.ee8 - jetty-ee8-webapp + org.eclipse.jetty.toolchain + jetty-test-helper test @@ -90,4 +76,19 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + + .*/jetty-jakarta-servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-[^/]*\.jar|.*jsp.jstl-[^/]*\.jar + + + + + + diff --git a/jetty-ee8/jetty-ee8-home/pom.xml b/jetty-ee8/jetty-ee8-home/pom.xml index 891c35b05460..78160444e8f1 100644 --- a/jetty-ee8/jetty-ee8-home/pom.xml +++ b/jetty-ee8/jetty-ee8-home/pom.xml @@ -1,14 +1,14 @@ + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - 4.0.0 jetty-ee8-home - EE8 :: Home Assembly pom + EE8 :: Home Assembly ${basedir}/target/jetty-ee8-home @@ -16,325 +16,512 @@ true + + + + + + + + org.eclipse.jetty.ee8 + jetty-ee8-annotations + + + org.eclipse.jetty.ee8 + jetty-ee8-apache-jsp + + + org.eclipse.jetty.ee8 + jetty-ee8-glassfish-jstl + + + jakarta.el + jakarta.el-api + + + javax.el + el-api + + + xalan + xalan + + + + + + + + + + org.eclipse.jetty.ee8 + jetty-ee8-jndi + true + + + org.eclipse.jetty.ee8 + jetty-ee8-openid + true + + + org.eclipse.jetty.ee8 + jetty-ee8-plus + + + org.eclipse.jetty.ee8 + jetty-ee8-proxy + + + + org.eclipse.jetty.ee8 + jetty-ee8-quickstart + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + + + org.eclipse.jetty.ee8 + jetty-ee8-servlets + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-async-rest-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-jaas-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-jetty-webapp + ${project.version} + config + jar + true + + + javax.el + el-api + + + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-jndi-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-jsp-webapp + ${project.version} + config + jar + true + + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-mock-resources + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-proxy-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-simple-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-spec-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-javax-server + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-client + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-client-webapp + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-server + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-servlet + + + org.ow2.asm + asm + + + org.ow2.asm + asm-analysis + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-tree + + + xalan + xalan + + + org.apache.maven.plugins - maven-dependency-plugin + maven-assembly-plugin + + posix + false + - unpack-config-deps - generate-resources + binary - unpack-dependencies + single + package - - org.eclipse.jetty.ee8, org.eclipse.jetty.ee8.demos - - - config - false - META-INF/**,webapps/**,start.d/**,start.ini - ${assembly-directory} + + src/main/assembly/jetty-assembly.xml + - copy-lib-core-websocket-deps - generate-resources + sources - copy-dependencies + single + package - org.eclipse.jetty.websocket - jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core* - jar - ${assembly-directory}/lib + + src/main/assembly/jetty-source-assembly.xml + + true + + + + org.apache.maven.plugins + maven-dependency-plugin + - copy-lib-ee8-websocket-deps - generate-resources + copy-ee8-annotations-deps copy-dependencies + generate-resources - org.eclipse.jetty.toolchain,org.eclipse.jetty.ee8.websocket - jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core* + jakarta.annotation,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis jar - ${assembly-directory}/lib/ee8-websocket + ${assembly-directory}/lib/ee8-annotations - copy-lib-core-websocket-src-deps - generate-resources + copy-ee8-annotations-src-deps copy-dependencies + generate-resources - org.eclipse.jetty.websocket + jakarta.annotation,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis jar sources - ${source-assembly-directory}/lib + ${source-assembly-directory}/lib/ee8-annotations + + + + + + + + + + + + + + + + + + + + + + + + + + + + - copy-lib-ee8-websocket-src-deps - generate-resources + copy-ee8-deps copy-dependencies + generate-resources - org.eclipse.jetty.ee8.websocket + org.eclipse.jetty.ee8 + jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server + org.eclipse.jetty.ee8.demos,org.eclipse.jetty.ee8.websocket jar - sources - ${source-assembly-directory}/lib/ee8-websocket + ${assembly-directory}/lib - copy-lib-servlet-api-deps - generate-resources + copy-ee8-jsp-deps - copy + copy-dependencies + generate-resources - - - org.eclipse.jetty.toolchain - jetty-servlet-api - ${jetty.servlet.api.version} - - - ${assembly-directory}/lib + true + org.mortbay.jasper,org.eclipse.jdt + apache-jsp,apache-el,ecj + jar + ${assembly-directory}/lib/ee8-apache-jsp - copy-lib-transaction-api-deps - generate-resources + copy-ee8-jsp-src-deps - copy + copy-dependencies + generate-resources - - - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} - - - ${assembly-directory}/lib + true + org.mortbay.jasper,org.eclipse.jdt + apache-jsp,apache-el,ecj + jar + sources + ${source-assembly-directory}/lib/ee8-apache-jsp - copy-lib-servlet-api-src-deps - generate-resources + copy-ee8-jstl-deps - copy + copy-dependencies + generate-resources - - - org.eclipse.jetty.toolchain - jetty-servlet-api - ${jetty.servlet.api.version} - sources - - - ${source-assembly-directory}/lib + true + jakarta.servlet.jsp.jstl,org.glassfish.web + jakarta.servlet.jsp.jstl-api,javax.servlet.jsp.jstl + jar + ${assembly-directory}/lib/ee8-glassfish-jstl - copy-lib-transaction-api-src-deps - generate-resources + copy-ee8-jstl-src-deps - copy + copy-dependencies + generate-resources - - - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} - sources - - - ${source-assembly-directory}/lib + true + jakarta.servlet.jsp.jstl,org.glassfish.web + jakarta.servlet.jsp.jstl-api,javax.servlet.jsp.jstl + jar + sources + ${source-assembly-directory}/lib/ee8-glassfish-jstl - copy-ee8-annotations-deps - generate-resources + copy-ee8-src-deps copy-dependencies + generate-resources - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + org.eclipse.jetty.ee8 jar - ${assembly-directory}/lib/ee8-annotations + org.eclipse.jetty.ee8.demos,org.eclipse.jetty.ee8.websocket + sources + ${source-assembly-directory}/lib - copy-ee8-annotations-src-deps - generate-resources + copy-lib-core-websocket-deps copy-dependencies + generate-resources - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + org.eclipse.jetty.websocket + jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core* jar - sources - ${source-assembly-directory}/lib/ee8-annotations + ${assembly-directory}/lib - copy-ee8-jsp-src-deps - generate-resources + copy-lib-core-websocket-src-deps copy-dependencies + generate-resources - true - org.mortbay.jasper,org.eclipse.jdt - apache-jsp,apache-el,ecj + org.eclipse.jetty.websocket jar sources - ${source-assembly-directory}/lib/ee8-apache-jsp + ${source-assembly-directory}/lib - copy-ee8-jsp-deps - generate-resources + copy-lib-ee8-websocket-deps copy-dependencies + generate-resources - true - org.mortbay.jasper,org.eclipse.jdt - apache-jsp,apache-el,ecj + org.eclipse.jetty.toolchain,org.eclipse.jetty.ee8.websocket + jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core* jar - ${assembly-directory}/lib/ee8-apache-jsp + ${assembly-directory}/lib/ee8-websocket - copy-ee8-jstl-src-deps - generate-resources + copy-lib-ee8-websocket-src-deps copy-dependencies + generate-resources - true - jakarta.servlet.jsp.jstl,org.glassfish.web - jakarta.servlet.jsp.jstl-api,javax.servlet.jsp.jstl + org.eclipse.jetty.ee8.websocket jar sources - ${source-assembly-directory}/lib/ee8-glassfish-jstl + ${source-assembly-directory}/lib/ee8-websocket - copy-ee8-jstl-deps - generate-resources + copy-lib-servlet-api-deps - copy-dependencies + copy + generate-resources - true - jakarta.servlet.jsp.jstl,org.glassfish.web - jakarta.servlet.jsp.jstl-api,javax.servlet.jsp.jstl - jar - ${assembly-directory}/lib/ee8-glassfish-jstl + + + org.eclipse.jetty.toolchain + jetty-servlet-api + ${jetty.servlet.api.version} + + + ${assembly-directory}/lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - copy-ee8-deps - generate-resources + copy-lib-servlet-api-src-deps - copy-dependencies + copy + generate-resources - org.eclipse.jetty.ee8 - jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server - org.eclipse.jetty.ee8.demos,org.eclipse.jetty.ee8.websocket - jar - ${assembly-directory}/lib + + + org.eclipse.jetty.toolchain + jetty-servlet-api + ${jetty.servlet.api.version} + sources + + + ${source-assembly-directory}/lib - copy-ee8-src-deps - generate-resources + copy-lib-transaction-api-deps - copy-dependencies + copy + generate-resources - org.eclipse.jetty.ee8 - jar - org.eclipse.jetty.ee8.demos,org.eclipse.jetty.ee8.websocket - sources - ${source-assembly-directory}/lib + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + + + ${assembly-directory}/lib - - - - org.apache.maven.plugins - maven-assembly-plugin - - posix - false - - - binary - package + copy-lib-transaction-api-src-deps - single + copy + generate-resources - - src/main/assembly/jetty-assembly.xml - + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + sources + + + ${source-assembly-directory}/lib - sources - package + unpack-config-deps - single + unpack-dependencies + generate-resources - - src/main/assembly/jetty-source-assembly.xml - - true + org.eclipse.jetty.ee8, org.eclipse.jetty.ee8.demos + + config + false + META-INF/**,webapps/**,start.d/**,start.ini + ${assembly-directory} @@ -342,193 +529,4 @@ - - - org.ow2.asm - asm - - - org.ow2.asm - asm-commons - - - org.ow2.asm - asm-tree - - - org.ow2.asm - asm-analysis - - - - org.eclipse.jetty.ee8 - jetty-ee8-quickstart - - - org.eclipse.jetty.ee8 - jetty-ee8-servlet - - - org.eclipse.jetty.ee8 - jetty-ee8-servlets - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-servlet - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-server - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-client - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-client-webapp - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-javax-server - - - org.eclipse.jetty.ee8 - jetty-ee8-apache-jsp - - - org.eclipse.jetty.ee8 - jetty-ee8-glassfish-jstl - - - xalan - xalan - - - javax.el - el-api - - - jakarta.el - jakarta.el-api - - - - - xalan - xalan - - - org.eclipse.jetty.ee8 - jetty-ee8-plus - - - org.eclipse.jetty.ee8 - jetty-ee8-proxy - - - - - - - - org.eclipse.jetty.ee8 - jetty-ee8-annotations - - - org.eclipse.jetty.ee8 - jetty-ee8-openid - true - - - - - - - - org.eclipse.jetty.ee8 - jetty-ee8-jndi - true - - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-mock-resources - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-jetty-webapp - ${project.version} - config - jar - true - - - javax.el - el-api - - - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-jaas-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-jndi-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-spec-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-async-rest-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-proxy-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-simple-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-jsp-webapp - ${project.version} - config - jar - true - - - diff --git a/jetty-ee8/jetty-ee8-jaspi/pom.xml b/jetty-ee8/jetty-ee8-jaspi/pom.xml index ade86a2d4713..f6b7fdd47209 100644 --- a/jetty-ee8/jetty-ee8-jaspi/pom.xml +++ b/jetty-ee8/jetty-ee8-jaspi/pom.xml @@ -1,21 +1,58 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-jaspi EE8 :: Jetty :: JASPI Security Jetty security infrastructure - jetty-ee9-jaspi ${project.groupId}.security.jaspi + jetty-ee9-jaspi org.eclipse.jetty.jaspi.* + + + jakarta.security.auth.message + jakarta.security.auth.message-api + 1.1.3 + + + org.eclipse.jetty.ee8 + jetty-ee8-security + + + org.eclipse.jetty.toolchain + jetty-servlet-api + + + org.slf4j + slf4j-api + + + jakarta.activation + jakarta.activation-api + 1.2.2 + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + @@ -33,58 +70,22 @@ maven-antrun-plugin + + run + process-resources - - + + - - run - - - - - jakarta.security.auth.message - jakarta.security.auth.message-api - 1.1.3 - - - org.eclipse.jetty.toolchain - jetty-servlet-api - - - org.eclipse.jetty.ee8 - jetty-ee8-security - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - jakarta.activation - jakarta.activation-api - test - 1.2.2 - - diff --git a/jetty-ee8/jetty-ee8-jndi/pom.xml b/jetty-ee8/jetty-ee8-jndi/pom.xml index 2bcb1b48e467..9911bb7cb942 100644 --- a/jetty-ee8/jetty-ee8-jndi/pom.xml +++ b/jetty-ee8/jetty-ee8-jndi/pom.xml @@ -1,41 +1,31 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-jndi EE8 :: JNDI EE8 JNDI factories - jetty-ee9-jndi ${project.groupId}.jndi + jetty-ee9-jndi org.eclipse.jetty.ee8.jndi.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* - - - - - - org.eclipse.jetty jetty-jndi + + org.slf4j + slf4j-api + org.eclipse.jetty.orbit javax.mail.glassfish @@ -47,10 +37,6 @@ - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-slf4j-impl @@ -62,4 +48,19 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* + + + + + diff --git a/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml b/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml index 4bbcfbb55515..367f2aba0512 100644 --- a/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml +++ b/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - 4.0.0 jetty-ee8-jspc-maven-plugin maven-plugin EE8 :: Jetty JSPC Maven Plugin @@ -14,66 +14,34 @@ jetty-ee9-jspc-maven-plugin true - - - - org.apache.maven.plugins - maven-plugin-plugin - - - exec-plugin-doc - process-classes - - descriptor - helpmojo - - - - - - org.apache.maven.plugins - maven-invoker-plugin - - - integration-test - - install - integration-test - verify - - - - - - ${maven.surefire.plugin.version} - - - clean - - - - - - org.eclipse.jetty - jetty-util + org.apache.ant + ant - org.apache.maven - maven-plugin-api - provided + org.apache.maven.plugin-tools + maven-plugin-tools-api - javax.annotation - javax.annotation-api + junit + junit - org.apache.maven.plugin-tools - maven-plugin-annotations - provided + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty.ee8 + jetty-ee8-apache-jsp + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-glassfish-jstl + ${project.version} org.apache.maven @@ -84,6 +52,12 @@ org.apache.maven maven-core provided + + + javax.annotation + javax.annotation-api + + org.apache.maven @@ -91,28 +65,60 @@ provided - org.apache.maven.plugin-tools - maven-plugin-tools-api + org.apache.maven + maven-plugin-api + provided - junit - junit + javax.annotation + javax.annotation-api - org.eclipse.jetty.ee8 - jetty-ee8-apache-jsp - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-glassfish-jstl - ${project.version} - - - org.apache.ant - ant + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + + org.apache.maven.plugins + maven-invoker-plugin + + + ${maven.surefire.plugin.version} + + + clean + + + + + integration-test + + install + integration-test + verify + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + + exec-plugin-doc + + descriptor + helpmojo + + process-classes + + + + + diff --git a/jetty-ee8/jetty-ee8-maven-plugin/pom.xml b/jetty-ee8/jetty-ee8-maven-plugin/pom.xml index c05fc8aab599..7847a0e07188 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/pom.xml +++ b/jetty-ee8/jetty-ee8-maven-plugin/pom.xml @@ -1,129 +1,38 @@ + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - 4.0.0 jetty-ee8-maven-plugin maven-plugin EE8 :: Jetty Maven Plugin Jetty maven plugins - false ${project.groupId}.maven.plugin - FREEBEER - jetty-ee9-maven-plugin true + + FREEBEER + false - - - - org.codehaus.mojo - build-helper-maven-plugin - - - test-reserve-ports - process-test-classes - - reserve-network-port - - - - test.stopPort - test.jettyPort - - - - - reserve-ports - pre-integration-test - - reserve-network-port - - - - jetty.stopPort - - - - - - - maven-surefire-plugin - - -Dstop.port=@{test.stopPort} -Djetty.port=@{test.jettyPort} - - **/IntegrationTest*.java - - - - - org.apache.maven.plugins - maven-plugin-plugin - - jetty - - - - exec-plugin-doc - generate-sources - - helpmojo - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - org.apache.maven.plugins - maven-invoker-plugin - - - integration-test - integration-test - - install - integration-test - verify - - - - - org.eclipse.jetty.maven.its.ee8 - - it-parent-pom/pom.xml - - - ${jetty.stopKey} - ${jetty.stopPort} - - ${jetty.servlet.api.version} - - src/it/settings.xml - - - jetty-effective-web-xml-it/pom.xml - - - clean - - - - - + + jakarta.transaction + jakarta.transaction-api + true + + + org.apache.maven.plugin-tools + maven-plugin-tools-api + + + org.apache.maven.shared + maven-artifact-transfer + ${maven-artifact-transfer.version} + org.codehaus.plexus plexus-xml @@ -134,11 +43,11 @@ org.apache.maven - maven-xml-impl + maven-api-xml org.apache.maven - maven-api-xml + maven-xml-impl org.apache.maven @@ -147,44 +56,9 @@ - org.apache.maven.shared - maven-artifact-transfer - ${maven-artifact-transfer.version} - - - org.apache.maven - maven-plugin-api - provided - - - javax.annotation - javax.annotation-api - - - - - org.apache.maven - maven-artifact - provided - - - org.apache.maven - maven-core - provided - - - org.apache.maven - maven-model - provided - - - org.apache.maven.plugin-tools - maven-plugin-tools-api - - - org.apache.maven.plugin-tools - maven-plugin-annotations - provided + org.eclipse.jetty + jetty-client + true org.eclipse.jetty @@ -199,27 +73,17 @@ org.eclipse.jetty - jetty-util - - - org.eclipse.jetty.ee8 - jetty-ee8-webapp - - - jakarta.servlet - servlet-api - - + jetty-http true - org.eclipse.jetty.ee8 - jetty-ee8-quickstart + org.eclipse.jetty + jetty-io true - org.eclipse.jetty.ee8 - jetty-ee8-plus + org.eclipse.jetty + jetty-jmx true @@ -232,35 +96,50 @@ jetty-server true + + org.eclipse.jetty + jetty-util + org.eclipse.jetty.ee8 - jetty-ee8-servlet + jetty-ee8-annotations true - org.eclipse.jetty - jetty-client + org.eclipse.jetty.ee8 + jetty-ee8-apache-jsp true - org.eclipse.jetty - jetty-http + org.eclipse.jetty.ee8 + jetty-ee8-glassfish-jstl true - org.eclipse.jetty - jetty-io + org.eclipse.jetty.ee8 + jetty-ee8-plus true - org.eclipse.jetty - jetty-jmx + org.eclipse.jetty.ee8 + jetty-ee8-quickstart true org.eclipse.jetty.ee8 - jetty-ee8-annotations + jetty-ee8-servlet + true + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp true + + + jakarta.servlet + servlet-api + + org.eclipse.jetty.ee8.websocket @@ -273,24 +152,51 @@ true - org.eclipse.jetty.ee8 - jetty-ee8-apache-jsp + org.slf4j + slf4j-api true - org.eclipse.jetty.ee8 - jetty-ee8-glassfish-jstl - true + org.apache.maven + maven-artifact + provided - org.slf4j - slf4j-api - true + org.apache.maven + maven-core + provided + + + javax.annotation + javax.annotation-api + + - jakarta.transaction - jakarta.transaction-api - true + org.apache.maven + maven-model + provided + + + org.apache.maven + maven-plugin-api + provided + + + javax.annotation + javax.annotation-api + + + + + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + org.awaitility + awaitility + test org.eclipse.jetty @@ -302,10 +208,111 @@ jetty-test-helper test - - org.awaitility - awaitility - test - + + + + org.apache.maven.plugins + maven-invoker-plugin + + org.eclipse.jetty.maven.its.ee8 + + it-parent-pom/pom.xml + + + ${jetty.stopKey} + ${jetty.stopPort} + + ${jetty.servlet.api.version} + + src/it/settings.xml + + + jetty-effective-web-xml-it/pom.xml + + + clean + + + + + integration-test + + install + integration-test + verify + + integration-test + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + jetty + + + + exec-plugin-doc + + helpmojo + + generate-sources + + + + + maven-surefire-plugin + + -Dstop.port=@{test.stopPort} -Djetty.port=@{test.jettyPort} + + **/IntegrationTest*.java + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + test-reserve-ports + + reserve-network-port + + process-test-classes + + + test.stopPort + test.jettyPort + + + + + reserve-ports + + reserve-network-port + + pre-integration-test + + + jetty.stopPort + + + + + + + diff --git a/jetty-ee8/jetty-ee8-nested/pom.xml b/jetty-ee8/jetty-ee8-nested/pom.xml index c42a83231997..65bdf8a9c24d 100644 --- a/jetty-ee8/jetty-ee8-nested/pom.xml +++ b/jetty-ee8/jetty-ee8-nested/pom.xml @@ -1,43 +1,31 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-nested EE8 :: Nested The jetty core handler adapted to legacy ee8 handler. - jetty-ee9-nested ${project.groupId}.server + jetty-ee9-nested org.eclipse.jetty.ee8.server.* - - - - org.apache.maven.plugins - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.nested=org.eclipse.jetty.logging --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED - - - - - - - org.eclipse.jetty.toolchain - jetty-servlet-api + org.eclipse.jetty + jetty-http org.eclipse.jetty - jetty-http + jetty-jmx + true org.eclipse.jetty @@ -49,8 +37,12 @@ org.eclipse.jetty - jetty-jmx - true + jetty-session + compile + + + org.eclipse.jetty.toolchain + jetty-servlet-api org.slf4j @@ -58,17 +50,12 @@ org.eclipse.jetty - jetty-xml - test - - - org.eclipse.jetty.toolchain - jetty-test-helper + jetty-http-tools test org.eclipse.jetty - jetty-http-tools + jetty-slf4j-impl test @@ -78,14 +65,26 @@ org.eclipse.jetty - jetty-slf4j-impl + jetty-xml test - org.eclipse.jetty - jetty-session - compile + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + org.apache.maven.plugins + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.nested=org.eclipse.jetty.logging --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED + + + + + diff --git a/jetty-ee8/jetty-ee8-openid/pom.xml b/jetty-ee8/jetty-ee8-openid/pom.xml index 323171fd2a24..28d51ff9e6d8 100644 --- a/jetty-ee8/jetty-ee8-openid/pom.xml +++ b/jetty-ee8/jetty-ee8-openid/pom.xml @@ -1,41 +1,26 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-openid EE8 :: OpenID Jetty OpenID Connect infrastructure - jetty-ee9-openid ${project.groupId}.openid + jetty-ee9-openid org.eclipse.jetty.ee8.security.openid.* - - - - org.apache.felix - maven-bundle-plugin - true - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory - - - - - - org.eclipse.jetty - jetty-server + jetty-client org.eclipse.jetty @@ -43,16 +28,16 @@ org.eclipse.jetty - jetty-client - - - org.eclipse.jetty.ee8 - jetty-ee8-security + jetty-server org.eclipse.jetty jetty-util-ajax + + org.eclipse.jetty.ee8 + jetty-ee8-security + org.slf4j slf4j-api @@ -73,4 +58,20 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory + + + + + diff --git a/jetty-ee8/jetty-ee8-plus/pom.xml b/jetty-ee8/jetty-ee8-plus/pom.xml index 4e7b5911fb90..21e145bfb2db 100644 --- a/jetty-ee8/jetty-ee8-plus/pom.xml +++ b/jetty-ee8/jetty-ee8-plus/pom.xml @@ -1,42 +1,22 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-plus EE8 :: Plus Jetty JavaEE style services - jetty-ee9-plus ${project.groupId}.plus + jetty-ee9-plus org.eclipse.jetty.ee8.plus.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},jakarta.transaction.*;version="2.0.0",* - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration - - - - - - - jakarta.transaction @@ -66,4 +46,21 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},jakarta.transaction.*;version="2.0.0",* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration + + + + + + diff --git a/jetty-ee8/jetty-ee8-proxy/pom.xml b/jetty-ee8/jetty-ee8-proxy/pom.xml index 4d024766f3d8..db03534477f7 100644 --- a/jetty-ee8/jetty-ee8-proxy/pom.xml +++ b/jetty-ee8/jetty-ee8-proxy/pom.xml @@ -1,41 +1,33 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-proxy EE8 :: Proxy Jetty Proxy - jetty-ee9-proxy ${project.groupId}.proxy + jetty-ee9-proxy org.eclipse.jetty.ee8.proxy.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.proxy=org.eclipse.jetty.logging - - - - - - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-client - org.eclipse.jetty.toolchain - jetty-servlet-api - provided + org.eclipse.jetty + jetty-util + + + org.slf4j + slf4j-api org.eclipse.jetty.ee8 @@ -43,21 +35,18 @@ provided - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-client + org.eclipse.jetty.toolchain + jetty-servlet-api + provided org.eclipse.jetty - jetty-util-ajax + jetty-http-tools test org.eclipse.jetty - jetty-http-tools + jetty-rewrite test @@ -67,7 +56,7 @@ org.eclipse.jetty - jetty-rewrite + jetty-util-ajax test @@ -76,4 +65,14 @@ test + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.proxy=org.eclipse.jetty.logging + + + + diff --git a/jetty-ee8/jetty-ee8-quickstart/pom.xml b/jetty-ee8/jetty-ee8-quickstart/pom.xml index 1a590fe47283..459358d1f6c1 100644 --- a/jetty-ee8/jetty-ee8-quickstart/pom.xml +++ b/jetty-ee8/jetty-ee8-quickstart/pom.xml @@ -1,44 +1,25 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-quickstart EE8 :: Quick Start Jetty Quick Start - jetty-ee9-quickstart ${project.groupId}.quickstart + jetty-ee9-quickstart - - - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration - - - - - - - org.eclipse.jetty.ee8 - jetty-ee8-webapp + jetty-ee8-annotations org.eclipse.jetty.ee8 @@ -46,7 +27,7 @@ org.eclipse.jetty.ee8 - jetty-ee8-annotations + jetty-ee8-webapp org.slf4j @@ -64,4 +45,20 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration + + + + + + diff --git a/jetty-ee8/jetty-ee8-security/pom.xml b/jetty-ee8/jetty-ee8-security/pom.xml index 33ea8024012e..8dc8b85e51d5 100644 --- a/jetty-ee8/jetty-ee8-security/pom.xml +++ b/jetty-ee8/jetty-ee8-security/pom.xml @@ -1,36 +1,22 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-security EE8 :: Security Jetty security infrastructure - jetty-ee9-security ${project.groupId}.security + jetty-ee9-security org.eclipse.jetty.ee8.security.* - - - - org.apache.felix - maven-bundle-plugin - true - - - osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional - - - - - - org.eclipse.jetty.ee8 @@ -40,15 +26,15 @@ org.slf4j slf4j-api - org.eclipse.jetty - jetty-slf4j-impl + jetty-http-tools test + org.eclipse.jetty - jetty-http-tools + jetty-slf4j-impl test @@ -58,4 +44,19 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + + + + + + diff --git a/jetty-ee8/jetty-ee8-servlet/pom.xml b/jetty-ee8/jetty-ee8-servlet/pom.xml index 44ce98dc8e3f..bd12d0f8fe77 100644 --- a/jetty-ee8/jetty-ee8-servlet/pom.xml +++ b/jetty-ee8/jetty-ee8-servlet/pom.xml @@ -1,39 +1,33 @@ + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-servlet EE8 :: Servlet Jetty Servlet Container - jetty-ee9-servlet ${project.groupId}.servlet + jetty-ee9-servlet org.eclipse.jetty.ee8.servlet.* - - - - org.apache.maven.plugins - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules org.eclipse.jetty.util.ajax - --add-reads org.eclipse.jetty.ee8.servlet=org.eclipse.jetty.logging - - - - - - + + org.eclipse.jetty + jetty-jmx + true + + + org.eclipse.jetty + jetty-util-ajax + true + org.eclipse.jetty.ee8 jetty-ee8-nested @@ -48,13 +42,13 @@ org.eclipse.jetty - jetty-util-ajax - true + jetty-client + test org.eclipse.jetty - jetty-jmx - true + jetty-http-tools + test @@ -67,15 +61,19 @@ jetty-test-helper test - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty - jetty-client - test - + + + + + org.apache.maven.plugins + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules org.eclipse.jetty.util.ajax + --add-reads org.eclipse.jetty.ee8.servlet=org.eclipse.jetty.logging + + + + diff --git a/jetty-ee8/jetty-ee8-servlets/pom.xml b/jetty-ee8/jetty-ee8-servlets/pom.xml index 26b4c2f81906..fbd91e1c1a59 100644 --- a/jetty-ee8/jetty-ee8-servlets/pom.xml +++ b/jetty-ee8/jetty-ee8-servlets/pom.xml @@ -1,49 +1,39 @@ + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-servlets EE8 :: Utility Servlets and Filters Jetty Utility Servlets - jetty-ee9-servlets ${project.groupId}.servlets + jetty-ee9-servlets org.eclipse.jetty.ee8.servlets.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules jetty.servlet.api - --add-modules org.eclipse.jetty.util - --add-modules org.eclipse.jetty.io - --add-modules org.eclipse.jetty.http - --add-modules org.eclipse.jetty.server - --add-modules org.eclipse.jetty.session - --add-modules org.eclipse.jetty.ee8.nested - --add-reads org.eclipse.jetty.ee8.servlets=java.management - --add-reads org.eclipse.jetty.ee8.servlets=org.eclipse.jetty.logging - - - - - - org.eclipse.jetty jetty-http + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-util + + + org.slf4j + slf4j-api + org.eclipse.jetty.ee8 jetty-ee8-nested @@ -54,10 +44,6 @@ jetty-ee8-webapp provided - - org.eclipse.jetty - jetty-util - org.eclipse.jetty.toolchain jetty-servlet-api @@ -65,15 +51,7 @@ org.eclipse.jetty - jetty-io - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl + jetty-http-tools test @@ -83,7 +61,7 @@ org.eclipse.jetty - jetty-http-tools + jetty-slf4j-impl test @@ -93,4 +71,24 @@ + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules jetty.servlet.api + --add-modules org.eclipse.jetty.util + --add-modules org.eclipse.jetty.io + --add-modules org.eclipse.jetty.http + --add-modules org.eclipse.jetty.server + --add-modules org.eclipse.jetty.session + --add-modules org.eclipse.jetty.ee8.nested + --add-reads org.eclipse.jetty.ee8.servlets=java.management + --add-reads org.eclipse.jetty.ee8.servlets=org.eclipse.jetty.logging + + + + + diff --git a/jetty-ee8/jetty-ee8-webapp/pom.xml b/jetty-ee8/jetty-ee8-webapp/pom.xml index 95be0e8df412..0d68781bf6d7 100644 --- a/jetty-ee8/jetty-ee8-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-webapp/pom.xml @@ -1,23 +1,70 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-webapp EE8 :: WebApp Jetty web application support - jetty-ee9-webapp ${project.groupId}.webapp + jetty-ee9-webapp org.eclipse.jetty.ee8.webapp.* + + + org.eclipse.jetty + jetty-xml + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration + + + org.apache.maven.plugins @@ -25,10 +72,10 @@ copy-ee8-resources - generate-resources copy-resources + generate-resources ${project.build.outputDirectory} @@ -48,10 +95,10 @@ copy-ee8-test-resources - generate-test-resources copy-resources + generate-test-resources ${project.build.testOutputDirectory} @@ -75,9 +122,7 @@ org.apache.maven.plugins maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} - + @{argLine} ${jetty.surefire.argLine} false ${project.build.testOutputDirectory}/mods/foo-bar-janb.jar @@ -87,56 +132,6 @@ - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration - - - - - - - - org.eclipse.jetty.ee8 - jetty-ee8-servlet - - - org.eclipse.jetty - jetty-xml - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-client - test - - diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml index bbd1924ac142..cca4c4959bb4 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml @@ -1,19 +1,19 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-SNAPSHOT ../pom.xml - - 4.0.0 jetty-ee8-websocket-javax-client-webapp EE8 :: Websocket :: Javax Client Webapp - jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp ${project.groupId}.javax.client.webapp + jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp @@ -36,15 +36,9 @@ javax.websocket.client WebApp Implementation - - org.eclipse.jetty.ee8.websocket.javax.client.webapp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer - + org.eclipse.jetty.ee8.websocket.javax.client.webapp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml index f69c3860f46b..3ecf5e499878 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml @@ -1,56 +1,56 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-SNAPSHOT ../pom.xml - - 4.0.0 jetty-ee8-websocket-javax-client EE8 :: Websocket :: Javax Client - jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client ${project.groupId}.javax.client + jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client - org.eclipse.jetty.toolchain - jetty-javax-websocket-api + org.eclipse.jetty + jetty-client org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-javax-common + + org.eclipse.jetty.toolchain + jetty-javax-websocket-api + org.eclipse.jetty.websocket jetty-websocket-core-client org.eclipse.jetty - jetty-client - - - org.eclipse.jetty.toolchain - jetty-servlet-api + jetty-jmx test org.eclipse.jetty - jetty-xml + jetty-slf4j-impl test org.eclipse.jetty - jetty-jmx + jetty-xml test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.toolchain + jetty-servlet-api test @@ -64,15 +64,9 @@ javax.websocket.client Implementation - - org.eclipse.jetty.ee8.websocket.javax.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=javax.websocket.ContainerProvider - + org.eclipse.jetty.ee8.websocket.javax.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=javax.websocket.ContainerProvider diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml index 47808afffb5c..ac3d91ebbf76 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml @@ -1,39 +1,21 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-javax-common EE8 :: Websocket :: Javax Common - false - jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common ${project.groupId}.javax.common + jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common + false - - - - org.apache.felix - maven-bundle-plugin - true - - - javax.websocket.client Implementation - - org.eclipse.jetty.ee8.websocket.javax.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - - - - - org.eclipse.jetty.toolchain @@ -47,16 +29,32 @@ org.slf4j slf4j-api - - org.eclipse.jetty - jetty-slf4j-impl + org.awaitility + awaitility test + - org.awaitility - awaitility + org.eclipse.jetty + jetty-slf4j-impl test + + + + + org.apache.felix + maven-bundle-plugin + true + + + javax.websocket.client Implementation + org.eclipse.jetty.ee8.websocket.javax.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + + + + + diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml index 469428e5a22e..fc64f08362fe 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml @@ -1,21 +1,25 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-javax-server EE8 :: Websocket :: Javax Server - jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server ${project.groupId}.javax.server + jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server + + org.eclipse.jetty.ee8 + jetty-ee8-annotations + org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-javax-client @@ -24,10 +28,6 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-servlet - - org.eclipse.jetty.ee8 - jetty-ee8-annotations - org.eclipse.jetty.toolchain jetty-javax-websocket-api @@ -45,14 +45,6 @@ - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - - - org.apache.felix maven-bundle-plugin @@ -60,16 +52,18 @@ javax.websocket.server Implementation - - org.eclipse.jetty.websocket.javax.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.javax.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=javax.websocket.server.ServerEndpointConfig$Configurator - + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=javax.websocket.server.ServerEndpointConfig$Configurator + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + + diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml index 976608facbb5..7a5ee7cfddae 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml @@ -1,27 +1,27 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-javax-tests EE8 :: Websocket :: Javax Tests - false - jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests ${project.groupId}.javax.tests + jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests + false true true - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-http-tools org.eclipse.jetty.ee8.websocket @@ -32,17 +32,20 @@ jetty-ee8-websocket-javax-server - org.eclipse.jetty - jetty-http-tools + org.eclipse.jetty.toolchain + jetty-javax-websocket-api org.eclipse.jetty.toolchain - jetty-javax-websocket-api + jetty-test-helper - org.eclipse.jetty - jetty-util-ajax - test + org.junit.jupiter + junit-jupiter + + + org.slf4j + slf4j-api org.eclipse.jetty @@ -50,12 +53,9 @@ test - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.junit.jupiter - junit-jupiter + org.eclipse.jetty + jetty-util-ajax + test @@ -68,9 +68,7 @@ javax.websocket Integration Tests - - org.eclipse.jetty.websocket.javax.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.javax.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml index 301465e96501..b7946191cd9e 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml @@ -1,18 +1,18 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-jetty-api EE8 :: Websocket :: Jetty API - jetty-ee9-websocket/jetty-ee9-websocket-jetty-api ${project.groupId}.api + jetty-ee9-websocket/jetty-ee9-websocket-jetty-api diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml index cf9e1843552f..36db467217ed 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml @@ -1,20 +1,31 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-jetty-client-webapp EE8 :: Websocket :: Jetty Client WebApp - jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp ${project.groupId}.client.webapp + jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-client + + + @@ -23,27 +34,12 @@ true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-client - - - org.eclipse.jetty.ee8 - jetty-ee8-webapp - - - diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml index b847c88e54b9..dfe24e93f093 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml @@ -1,41 +1,25 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-jetty-client EE8 :: Websocket :: Jetty Client - jetty-ee9-websocket/jetty-ee9-websocket-jetty-client ${project.groupId}.client + jetty-ee9-websocket/jetty-ee9-websocket-jetty-client - - - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration - - - - - - - + + org.eclipse.jetty + jetty-client + org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-jetty-api @@ -48,24 +32,36 @@ org.eclipse.jetty.websocket jetty-websocket-core-client - - org.eclipse.jetty - jetty-client - org.slf4j slf4j-api - org.eclipse.jetty.ee8 - jetty-ee8-webapp + org.eclipse.jetty + jetty-slf4j-impl test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.ee8 + jetty-ee8-webapp test + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration + + + + + + diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml index b0b74e91dfde..9652470344f8 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-jetty-common EE8 :: Websocket :: Jetty Common @@ -14,34 +14,6 @@ ${project.groupId}.common jetty-ee9-websocket/jetty-ee9-websocket-jetty-common - - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.websocket.jetty.common=org.eclipse.jetty.io - - - - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.websocket.api.ExtensionConfig$Parser - - - - - - org.eclipse.jetty.ee8.websocket @@ -57,4 +29,26 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.websocket.api.ExtensionConfig$Parser + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.websocket.jetty.common=org.eclipse.jetty.io + + + + diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml index 572da497761c..adb5bd0dad12 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml @@ -1,21 +1,34 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-jetty-server EE8 :: Websocket :: Jetty Server - jetty-ee9-websocket/jetty-ee9-websocket-jetty-server ${project.groupId}.server + jetty-ee9-websocket/jetty-ee9-websocket-jetty-server + + org.eclipse.jetty + jetty-jmx + true + + + org.eclipse.jetty.ee8 + jetty-ee8-annotations + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-jetty-api @@ -32,19 +45,6 @@ org.eclipse.jetty.toolchain jetty-servlet-api - - org.eclipse.jetty.ee8 - jetty-ee8-servlet - - - org.eclipse.jetty.ee8 - jetty-ee8-annotations - - - org.eclipse.jetty - jetty-jmx - true - org.slf4j slf4j-api @@ -65,13 +65,9 @@ Jetty Websocket Server - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration, - osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration, + osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml index 391a221b332b..1595894ff8c8 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml @@ -1,61 +1,61 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-jetty-tests EE8 :: Websocket :: Jetty Tests - jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests ${project.groupId}.tests + jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests true true - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-alpn-java-server test - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-api + org.eclipse.jetty + jetty-alpn-server test - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-client-webapp + org.eclipse.jetty + jetty-http-tools test - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-server + org.eclipse.jetty + jetty-jmx test org.eclipse.jetty - jetty-http-tools + jetty-slf4j-impl test - org.eclipse.jetty.http2 - jetty-http2-server + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-api test - org.eclipse.jetty - jetty-alpn-server + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-client-webapp test - org.eclipse.jetty - jetty-alpn-java-server + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-server test @@ -64,13 +64,13 @@ test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.http2 + jetty-http2-server test - org.eclipse.jetty - jetty-jmx + org.slf4j + slf4j-api test @@ -84,13 +84,10 @@ jetty.websocket Integration Tests - - org.eclipse.jetty.websocket.jetty.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.jetty.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml index 4d66a02f6189..f8f1030971fd 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml @@ -1,29 +1,29 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-servlet EE8 :: Websocket :: Servlet - jetty-ee9-websocket/jetty-ee9-websocket-servlet ${project.groupId}.servlet + jetty-ee9-websocket/jetty-ee9-websocket-servlet - - org.eclipse.jetty.websocket - jetty-websocket-core-server - org.eclipse.jetty.ee8 jetty-ee8-servlet + + org.eclipse.jetty.websocket + jetty-websocket-core-server + org.slf4j slf4j-api diff --git a/jetty-ee8/jetty-ee8-websocket/pom.xml b/jetty-ee8/jetty-ee8-websocket/pom.xml index 91d15e6b6ba7..15fc60849f7c 100644 --- a/jetty-ee8/jetty-ee8-websocket/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/pom.xml @@ -1,34 +1,34 @@ + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT ../pom.xml - - 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - EE8 :: Websocket pom - - - true - + EE8 :: Websocket - jetty-ee8-websocket-javax-common - jetty-ee8-websocket-jetty-api - jetty-ee8-websocket-jetty-common jetty-ee8-websocket-javax-client jetty-ee8-websocket-javax-client-webapp - jetty-ee8-websocket-servlet + jetty-ee8-websocket-javax-common jetty-ee8-websocket-javax-server + jetty-ee8-websocket-javax-tests + jetty-ee8-websocket-jetty-api jetty-ee8-websocket-jetty-client jetty-ee8-websocket-jetty-client-webapp + jetty-ee8-websocket-jetty-common jetty-ee8-websocket-jetty-server - jetty-ee8-websocket-javax-tests jetty-ee8-websocket-jetty-tests + jetty-ee8-websocket-servlet + + + true + diff --git a/jetty-ee8/pom.xml b/jetty-ee8/pom.xml index aae28ab0bc16..4c26fba3c5ec 100644 --- a/jetty-ee8/pom.xml +++ b/jetty-ee8/pom.xml @@ -1,59 +1,254 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 - EE8 pom - - - 4.0.6 - 1.3.3 - 1.3.5 - 1.4.1.v201005082020 - 1.1.2 - 9.0.52 - 3.1.9.Final - - true - true - - ${maven.multiModuleProjectDirectory}/jetty-ee9/${ee9.module} - 1.0.6 - + EE8 + jetty-ee8-annotations + jetty-ee8-apache-jsp + jetty-ee8-bom + jetty-ee8-demos + jetty-ee8-glassfish-jstl + jetty-ee8-home + jetty-ee8-jaspi + jetty-ee8-jndi + jetty-ee8-jspc-maven-plugin + jetty-ee8-maven-plugin jetty-ee8-nested + jetty-ee8-openid + jetty-ee8-plus + jetty-ee8-proxy + jetty-ee8-quickstart jetty-ee8-security jetty-ee8-servlet jetty-ee8-servlets jetty-ee8-webapp - jetty-ee8-plus - jetty-ee8-jndi - jetty-ee8-maven-plugin - jetty-ee8-jaspi - jetty-ee8-jspc-maven-plugin - jetty-ee8-proxy - jetty-ee8-annotations jetty-ee8-websocket - jetty-ee8-quickstart - jetty-ee8-openid - jetty-ee8-apache-jsp - jetty-ee8-glassfish-jstl - jetty-ee8-bom - jetty-ee8-demos - jetty-ee8-home + + + true + + ${maven.multiModuleProjectDirectory}/jetty-ee9/${ee9.module} + 1.3.5 + 1.3.3 + 1.1.2 + 1.4.1.v201005082020 + 4.0.6 + 9.0.52 + 1.0.6 + true + 3.1.9.Final + + + + + + + + jakarta.activation + jakarta.activation-api + 1.2.2 + + + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation.api.version} + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + 2.3.6 + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + 1.2.7 + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-annotations + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-apache-jsp + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-glassfish-jstl + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-jndi + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-nested + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-openid + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-plus + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-proxy + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-quickstart + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-security + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-servlets + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + ${project.version} + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-container-initializer + ${project.version} + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-mock-resources + ${project.version} + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-web-fragment + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-javax-client + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-javax-client-webapp + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-javax-common + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-javax-server + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-api + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-client + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-client-webapp + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-common + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-server + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-servlet + ${project.version} + + + org.eclipse.jetty.orbit + javax.mail.glassfish + ${javax.mail.glassfish.version} + + + org.eclipse.jetty.orbit + javax.security.auth.message + 1.0.0.v201108011116 + + + org.eclipse.jetty.toolchain + jetty-javax-websocket-api + ${jakarta.websocket.api.version} + + + org.eclipse.jetty.toolchain + jetty-servlet-api + ${jetty.servlet.api.version} + + + org.glassfish.web + javax.servlet.jsp.jstl + 1.2.5 + + + org.mortbay.jasper + apache-jsp + ${jsp.impl.version} + + + xalan + xalan + 2.7.3 + + + + - ${project.build.directory}/generated-sources/ee8 - ${project.build.directory}/generated-test-sources/ee8 @@ -116,10 +311,10 @@ copy-ee8-resources - generate-resources copy-resources + generate-resources ${project.build.outputDirectory} @@ -134,31 +329,31 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + copy-ee8-test-resources - generate-test-resources copy-resources + generate-test-resources ee9-to-ee8 @@ -180,241 +375,46 @@ generate-ee8-sources - generate-sources modify-sources-ee9-to-ee8 + generate-sources ${ee9.module.path}/src/main/java ${project.build.sourceDirectory} - generate-ee8-test-sources - generate-test-sources + modify-services-loader-ee9-to-ee8 - modify-sources-ee9-to-ee8 + modify-service-loader-files-ee9-to-ee8 - - true - ${ee9.module.path}/src/test/java - ${project.build.testSourceDirectory} - - - - modify-services-loader-ee9-to-ee8 process-resources org.apache.juli.logging.Log + + + generate-ee8-test-sources - modify-service-loader-files-ee9-to-ee8 + modify-sources-ee9-to-ee8 + generate-test-sources + + true + ${ee9.module.path}/src/test/java + ${project.build.testSourceDirectory} + + ${project.build.directory}/generated-sources/ee8 + ${project.build.directory}/generated-test-sources/ee8 - - - - - - org.eclipse.jetty.toolchain - jetty-servlet-api - ${jetty.servlet.api.version} - - - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} - - - jakarta.annotation - jakarta.annotation-api - ${jakarta.annotation.api.version} - - - org.mortbay.jasper - apache-jsp - ${jsp.impl.version} - - - jakarta.activation - jakarta.activation-api - 1.2.2 - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - 1.2.7 - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - 2.3.6 - - - org.eclipse.jetty.orbit - javax.security.auth.message - 1.0.0.v201108011116 - - - org.glassfish.web - javax.servlet.jsp.jstl - 1.2.5 - - - xalan - xalan - 2.7.3 - - - org.eclipse.jetty.toolchain - jetty-javax-websocket-api - ${jakarta.websocket.api.version} - - - org.eclipse.jetty.orbit - javax.mail.glassfish - ${javax.mail.glassfish.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-apache-jsp - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-annotations - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-proxy - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-quickstart - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-nested - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-security - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-servlet - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-webapp - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-servlets - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-jndi - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-plus - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-openid - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-glassfish-jstl - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-javax-common - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-javax-client - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-javax-client-webapp - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-servlet - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-api - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-common - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-client - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-client-webapp - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-server - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-javax-server - ${project.version} - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-mock-resources - ${project.version} - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-web-fragment - ${project.version} - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-container-initializer - ${project.version} - - - - - /ee9-demo-jetty - - .,WEB-INF/classes - ee9 - - - - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - - - org.eclipse.jetty.ee9 - jetty-ee9-maven-plugin - ${project.version} - - - org.eclipse.jetty - jetty-client - ${project.version} - - - org.eclipse.jetty - jetty-servlets - ${project.version} - - - - 8087 - foo - 1 - - 222 - - - /test - ${project.build.directory}/work - - - - Test Realm - src/test/resources/test-realm.properties - - - - - - - - org.eclipse.jetty.ee9 - jetty-ee9-servlets + jakarta.annotation + jakarta.annotation-api provided - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api + jakarta.servlet.jsp + jakarta.servlet.jsp-api provided - - - jakarta.servlet - jakarta.servlet-api - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - test + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided org.eclipse.jetty - jetty-jmx - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test + jetty-server + provided - org.eclipse.jetty - jetty-server + org.eclipse.jetty.ee9 + jetty-ee9-servlets provided - jakarta.servlet.jsp - jakarta.servlet.jsp-api + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-api provided - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-server provided - jakarta.annotation - jakarta.annotation-api + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api provided + + + jakarta.servlet + jakarta.servlet-api + + org.eclipse.jetty.toolchain @@ -183,14 +65,19 @@ provided - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-api - provided + org.eclipse.jetty + jetty-jmx + test - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server - provided + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + test org.eclipse.jetty.ee9.websocket @@ -198,9 +85,122 @@ test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.toolchain + jetty-test-helper test + + + + + org.eclipse.jetty.ee9 + jetty-ee9-maven-plugin + ${project.version} + + 8087 + foo + 1 + + 222 + + + /test + ${project.build.directory}/work + + + + Test Realm + src/test/resources/test-realm.properties + + + + + + org.eclipse.jetty + jetty-client + ${project.version} + + + org.eclipse.jetty + jetty-servlets + ${project.version} + + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + war + + + jakarta.servlet.jsp.*;version="[3,4)",org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",* + !org.example* + + /ee9-demo-jetty + + .,WEB-INF/classes + ee9 + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + web-bundle-assembly + + single + + package + + + src/main/assembly/web-bundle.xml + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/WebAppTest.java + **/Test*.java + + + + + test + test + + + + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/pom.xml index cf8ef310a6e0..fc5dc241c8b2 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/pom.xml @@ -7,32 +7,78 @@ 12.0.3-SNAPSHOT jetty-ee9-demo-jndi-webapp - EE9 :: Demo :: JNDI WebApp war + EE9 :: Demo :: JNDI WebApp ${project.groupId}.jndi + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-mock-resources + provided + + + org.eclipse.jetty.orbit + javax.mail.glassfish + provided + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${project.version} + + ${project.build.directory}/plugin-context.xml + + src/main/webapp + src/main/webapp/WEB-INF/web.xml + /test-jndi + + + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-mock-resources + ${project.version} + + + + + maven-antrun-plugin generate-xml-files + + run + process-resources - + - + - - run - @@ -41,10 +87,10 @@ maven-dependency-plugin - package copy-dependencies + package jakarta.transaction-api,ee9-demo-mock-resources ${project.build.directory}/lib/jndi @@ -53,51 +99,5 @@ - - - - org.eclipse.jetty - jetty-maven-plugin - ${project.version} - - ${project.build.directory}/plugin-context.xml - - src/main/webapp - src/main/webapp/WEB-INF/web.xml - /test-jndi - - - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-mock-resources - ${project.version} - - - - - - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-mock-resources - provided - - - jakarta.transaction - jakarta.transaction-api - provided - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - - org.eclipse.jetty.orbit - javax.mail.glassfish - provided - - diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/pom.xml index 785302e4b16f..4f67d7893f0d 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/pom.xml @@ -1,20 +1,38 @@ + + 4.0.0 org.eclipse.jetty.ee9.demos jetty-ee9-demos 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-demo-jsp-webapp - EE9 :: Demo :: JSP WebApp war + EE9 :: Demo :: JSP WebApp ${project.groupId}.jsp + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + provided + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + + @@ -34,24 +52,15 @@ - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - maven-assembly-plugin web-bundle-assembly - package single + package src/main/assembly/web-bundle.xml @@ -63,32 +72,30 @@ + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided - - - precompile-jsp + + org.apache.maven.plugins + maven-war-plugin + + ${basedir}/target/web.xml + + org.eclipse.jetty jetty-jspc-maven-plugin @@ -110,13 +117,6 @@ - - org.apache.maven.plugins - maven-war-plugin - - ${basedir}/target/web.xml - - diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/pom.xml index f4ee0ad83bc6..372ff183832f 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -5,12 +6,29 @@ jetty-ee9-demos 12.0.3-SNAPSHOT - EE9 :: Demo :: Mock Resources jetty-ee9-demo-mock-resources jar + EE9 :: Demo :: Mock Resources ${project.groupId}.mocks + + + jakarta.mail + jakarta.mail-api + provided + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + @@ -26,12 +44,8 @@ org.eclipse.jetty.ee9.demos.ee9-demo-mock-resources Mock resources used for testing - - org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - javax.sql, jakarta.transaction;version="2.0.0" - + org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + javax.sql, jakarta.transaction;version="2.0.0" <_nouses>true @@ -40,21 +54,4 @@ - - - jakarta.transaction - jakarta.transaction-api - provided - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - - jakarta.mail - jakarta.mail-api - provided - - diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml index a049b605bd1b..10a96928db93 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml @@ -1,70 +1,58 @@ + 4.0.0 org.eclipse.jetty.ee9.demos jetty-ee9-demos 12.0.3-SNAPSHOT - 4.0.0 jetty-ee9-demo-proxy-webapp - EE9 :: Demo :: Proxy WebApp war + EE9 :: Demo :: Proxy WebApp ${project.groupId}.proxy - - - - maven-war-plugin - - - src/main/webapp/META-INF/MANIFEST.MF - - - - - - org.slf4j - slf4j-simple + org.eclipse.jetty + jetty-client org.eclipse.jetty.ee9 jetty-ee9-proxy - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided + org.slf4j + slf4j-simple - org.eclipse.jetty.ee9 - jetty-ee9-webapp - test + jakarta.servlet.jsp + jakarta.servlet.jsp-api + provided - org.eclipse.jetty - jetty-client + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided org.eclipse.jetty - jetty-jmx - test + jetty-server + provided - org.eclipse.jetty - jetty-server + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api provided - org.eclipse.jetty.http2 - jetty-http2-server + org.eclipse.jetty + jetty-alpn-java-server test org.eclipse.jetty - jetty-alpn-java-server + jetty-jmx test @@ -73,14 +61,26 @@ test - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided + org.eclipse.jetty.ee9 + jetty-ee9-webapp + test - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided + org.eclipse.jetty.http2 + jetty-http2-server + test + + + + maven-war-plugin + + + src/main/webapp/META-INF/MANIFEST.MF + + + + + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-simple-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-simple-webapp/pom.xml index 9e73f3659f31..9cd6a6496392 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-simple-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-simple-webapp/pom.xml @@ -1,15 +1,15 @@ + + 4.0.0 org.eclipse.jetty.ee9.demos jetty-ee9-demos 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-demo-simple-webapp - EE9 :: Demo :: Simple WebApp war + EE9 :: Demo :: Simple WebApp ${project.groupId}.simple diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer/pom.xml index ef34d634fc69..346321af1ec5 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -12,6 +13,13 @@ ${project.groupId}.sci + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + @@ -31,11 +39,4 @@ - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml index 79e2adf72074..81b3a34f19d0 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml @@ -7,53 +7,89 @@ 12.0.3-SNAPSHOT ../../pom.xml - EE9 :: Demo :: Servlet Spec :: WebApp jetty-ee9-demo-spec-webapp war + EE9 :: Demo :: Servlet Spec :: WebApp ${project.groupId}.spec.webapp + + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-container-initializer + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-web-fragment + + + jakarta.annotation + jakarta.annotation-api + provided + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + + + + + + + + org.eclipse.jetty.ee9 + jetty-ee9-maven-plugin + ${project.version} + + 10 + ${project.build.directory}/plugin-context.xml + + src/main/webapp + src/main/webapp/WEB-INF/web.xml + /test-spec + .*/jetty-jakarta-servlet-api-[^/]*\.jar$ + true + ${basedir}/src/main/webapp/WEB-INF/jetty-env.xml + + + + Test Realm + src/etc/realm.properties + + + + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-mock-resources + ${project.version} + + + + + - - org.apache.maven.plugins - maven-assembly-plugin - - - web-bundle-assembly - package - - single - - - - src/main/assembly/web-bundle.xml - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - target - - plugin-context.xml - - META-INF - - - - org.apache.felix @@ -66,10 +102,8 @@ Test Webapp for Servlet 5.0 Features - - jakarta.transaction*;version="2.0.0", jakarta.servlet*;version="[5,6)", org.eclipse.jetty*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.eclipse.jetty.webapp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", org.eclipse.jetty.plus.jndi;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", * - - <_nouses /> + jakarta.transaction*;version="2.0.0", jakarta.servlet*;version="[5,6)", org.eclipse.jetty*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.eclipse.jetty.webapp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", org.eclipse.jetty.plus.jndi;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", * + <_nouses> org.example.test;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}";-noimport:=true / .,WEB-INF/classes,WEB-INF/lib @@ -84,20 +118,41 @@ generate-xml-files + + run + process-resources - + - + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + web-bundle-assembly - run + single + package + + + src/main/assembly/web-bundle.xml + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + @@ -106,10 +161,10 @@ maven-dependency-plugin - package copy + package @@ -147,81 +202,24 @@ + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + target + + plugin-context.xml + + META-INF + + + + - - - - org.eclipse.jetty.ee9 - jetty-ee9-maven-plugin - ${project.version} - - 10 - ${project.build.directory}/plugin-context.xml - - src/main/webapp - src/main/webapp/WEB-INF/web.xml - /test-spec - .*/jetty-jakarta-servlet-api-[^/]*\.jar$ - true - ${basedir}/src/main/webapp/WEB-INF/jetty-env.xml - - - - Test Realm - src/etc/realm.properties - - - - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-mock-resources - ${project.version} - - - - - - - - - jakarta.transaction - jakarta.transaction-api - provided - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - - jakarta.annotation - jakarta.annotation-api - provided - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-web-fragment - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-container-initializer - - - - - diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment/pom.xml index 8474f10717a4..b5a65d09e28a 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -6,11 +7,11 @@ 12.0.3-SNAPSHOT ../../pom.xml - - EE9 :: Demo :: Servlet Spec :: Fragment Jar jetty-ee9-demo-web-fragment jar + EE9 :: Demo :: Servlet Spec :: Fragment Jar + ${project.groupId}.spec.fragment diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/pom.xml index 48dcf2d4dd19..60161925a088 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/pom.xml @@ -6,13 +6,13 @@ jetty-ee9-demos 12.0.3-SNAPSHOT - EE9 :: Demo :: Servlet Spec jetty-ee9-demo-spec pom + EE9 :: Demo :: Servlet Spec - jetty-ee9-demo-spec-webapp jetty-ee9-demo-container-initializer + jetty-ee9-demo-spec-webapp jetty-ee9-demo-web-fragment diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/pom.xml index 88714baa2878..151431cd94f3 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/pom.xml @@ -1,25 +1,25 @@ + + 4.0.0 org.eclipse.jetty.ee9.demos jetty-ee9-demos 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-demo-template - EE9 :: Demo :: Template jar + EE9 :: Demo :: Template - + org.apache.maven.plugins maven-jar-plugin - index.html - small_powered_by.gif + index.html + small_powered_by.gif diff --git a/jetty-ee9/jetty-ee9-demos/pom.xml b/jetty-ee9/jetty-ee9-demos/pom.xml index c9cc33793550..1395aae6ddb5 100644 --- a/jetty-ee9/jetty-ee9-demos/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/pom.xml @@ -1,16 +1,30 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee9.demos jetty-ee9-demos - EE9 :: Demos pom + EE9 :: Demos + + + jetty-ee9-demo-async-rest + jetty-ee9-demo-embedded + jetty-ee9-demo-jaas-webapp + jetty-ee9-demo-jetty-webapp + jetty-ee9-demo-jndi-webapp + jetty-ee9-demo-jsp-webapp + jetty-ee9-demo-mock-resources + jetty-ee9-demo-proxy-webapp + jetty-ee9-demo-simple-webapp + jetty-ee9-demo-spec + jetty-ee9-demo-template + true @@ -28,18 +42,4 @@ - - - jetty-ee9-demo-async-rest - jetty-ee9-demo-jaas-webapp - jetty-ee9-demo-jndi-webapp - jetty-ee9-demo-jetty-webapp - jetty-ee9-demo-proxy-webapp - jetty-ee9-demo-embedded - jetty-ee9-demo-simple-webapp - jetty-ee9-demo-jsp-webapp - jetty-ee9-demo-mock-resources - jetty-ee9-demo-spec - jetty-ee9-demo-template - diff --git a/jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml b/jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml index f1cccff7f059..8f592892a575 100644 --- a/jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml +++ b/jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-fcgi-proxy EE9 :: FCGI Proxy @@ -15,11 +15,6 @@ - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - org.eclipse.jetty jetty-server @@ -32,17 +27,22 @@ org.eclipse.jetty.fcgi jetty-fcgi-client - - org.eclipse.jetty.ee9 - jetty-ee9-servlet - test + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided org.eclipse.jetty jetty-slf4j-impl test + + + org.eclipse.jetty.ee9 + jetty-ee9-servlet + test + diff --git a/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml b/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml index 0fac6191c472..9ebefffa67d1 100644 --- a/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml +++ b/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml @@ -1,34 +1,20 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - 4.0.0 jetty-ee9-glassfish-jstl + jar EE9 :: Glassfish JSTL https://projects.eclipse.org/projects/ee4j.glassfish - jar ${project.groupId}.glassfish.jstl true - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - .*/jetty-jakarta-servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-[^/]*\.jar - - - - - - @@ -42,8 +28,8 @@ - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty.ee9 + jetty-ee9-annotations test @@ -55,13 +41,13 @@ org.eclipse.jetty.ee9 - jetty-ee9-annotations + jetty-ee9-webapp test - org.eclipse.jetty.ee9 - jetty-ee9-webapp + org.eclipse.jetty.toolchain + jetty-test-helper test @@ -73,4 +59,19 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + + .*/jetty-jakarta-servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-[^/]*\.jar + + + + + + diff --git a/jetty-ee9/jetty-ee9-home/pom.xml b/jetty-ee9/jetty-ee9-home/pom.xml index 1250447ba644..e9c8997a266a 100644 --- a/jetty-ee9/jetty-ee9-home/pom.xml +++ b/jetty-ee9/jetty-ee9-home/pom.xml @@ -1,14 +1,14 @@ + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - 4.0.0 jetty-ee9-home - EE9 :: Home Assembly pom + EE9 :: Home Assembly ${basedir}/target/jetty-ee9-home @@ -16,85 +16,366 @@ true + + + org.eclipse.jetty.ee9 + jetty-ee9-annotations + + + org.eclipse.jetty.ee9 + jetty-ee9-apache-jsp + + + org.eclipse.jetty.ee9 + jetty-ee9-cdi + true + + + org.eclipse.jetty.ee9 + jetty-ee9-fcgi-proxy + true + + + org.eclipse.jetty.ee9 + jetty-ee9-glassfish-jstl + + + jakarta.el + jakarta.el-api + + + javax.el + el-api + + + + + org.eclipse.jetty.ee9 + jetty-ee9-jaspi + true + + + org.eclipse.jetty.ee9 + jetty-ee9-jndi + true + + + org.eclipse.jetty.ee9 + jetty-ee9-openid + true + + + org.eclipse.jetty.ee9 + jetty-ee9-plus + + + org.eclipse.jetty.ee9 + jetty-ee9-proxy + + + + org.eclipse.jetty.ee9 + jetty-ee9-quickstart + + + org.eclipse.jetty.ee9 + jetty-ee9-servlet + + + org.eclipse.jetty.ee9 + jetty-ee9-servlets + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-async-rest-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-jaas-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-jetty-webapp + ${project.version} + config + jar + true + + + javax.el + el-api + + + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-jndi-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-jsp-webapp + ${project.version} + config + jar + true + + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-mock-resources + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-proxy-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-simple-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-spec-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-server + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client-webapp + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-server + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-servlet + + + org.ow2.asm + asm + + + org.ow2.asm + asm-analysis + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-tree + + + org.apache.maven.plugins - maven-dependency-plugin + maven-assembly-plugin + + posix + false + - unpack-config-deps - generate-resources + binary - unpack-dependencies + single + package - - org.eclipse.jetty.ee9, org.eclipse.jetty.ee9.demos - - - config - false - META-INF/**,webapps/**,start.d/**,start.ini - ${assembly-directory} + + src/main/assembly/jetty-assembly.xml + - copy-lib-core-websocket-deps - generate-resources + sources - copy-dependencies + single + package - org.eclipse.jetty.websocket - jar - ${assembly-directory}/lib + + src/main/assembly/jetty-source-assembly.xml + + true + + + + org.apache.maven.plugins + maven-dependency-plugin + - copy-lib-ee9-websocket-deps - generate-resources + copy-ee9-annotations-deps copy-dependencies + generate-resources - org.eclipse.jetty.ee9.websocket + jakarta.annotation,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis jar - ${assembly-directory}/lib/ee9-websocket + ${assembly-directory}/lib/ee9-annotations - copy-lib-core-websocket-src-deps - generate-resources + copy-ee9-annotations-src-deps copy-dependencies + generate-resources - org.eclipse.jetty.websocket + jakarta.annotation,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis jar sources - ${source-assembly-directory}/lib + ${source-assembly-directory}/lib/ee9-annotations + - copy-lib-ee9-websocket-src-deps - generate-resources + copy-ee9-deps copy-dependencies + generate-resources - org.eclipse.jetty.ee9.websocket + org.eclipse.jetty.ee9 + jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server + org.eclipse.jetty.ee9.demos,org.eclipse.jetty.ee9.websocket + jar + ${assembly-directory}/lib + + + + copy-ee9-jaspi-deps + + copy-dependencies + + generate-resources + + jakarta.authentication + jakarta.authentication-api + jar + ${assembly-directory}/lib/ee9-jaspi + + + + copy-ee9-jaspi-src-deps + + copy-dependencies + + generate-resources + + jakarta.authentication + jakarta.authentication-api jar sources - ${source-assembly-directory}/lib/ee9-websocket + ${source-assembly-directory}/lib/ee9-jaspi - copy-ee9-lib-jakarta-websocket-deps + copy-ee9-jsp-deps + + copy-dependencies + + generate-resources + + true + org.mortbay.jasper,org.eclipse.jdt + apache-jsp,apache-el,ecj + jar + ${assembly-directory}/lib/ee9-apache-jsp + + + + copy-ee9-jsp-src-deps + + copy-dependencies + + generate-resources + + true + org.mortbay.jasper,org.eclipse.jdt + apache-jsp,apache-el,ecj + jar + sources + ${source-assembly-directory}/lib/ee9-apache-jsp + + + + copy-ee9-jstl-deps + + copy-dependencies + + generate-resources + + true + jakarta.servlet.jsp.jstl,org.glassfish.web + jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl + jar + ${assembly-directory}/lib/ee9-glassfish-jstl + + + + copy-ee9-jstl-src-deps + + copy-dependencies + generate-resources + + true + jakarta.servlet.jsp.jstl,org.glassfish.web + jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl + jar + sources + ${source-assembly-directory}/lib/ee9-glassfish-jstl + + + + copy-ee9-lib-jakarta-websocket-deps copy + generate-resources @@ -108,10 +389,10 @@ copy-ee9-lib-jakarta-websocket-src-deps - generate-resources copy + generate-resources @@ -125,11 +406,75 @@ - copy-lib-servlet-api-deps + copy-ee9-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.ee9 + jar + org.eclipse.jetty.ee9.demos,org.eclipse.jetty.ee9.websocket + sources + ${source-assembly-directory}/lib + + + + copy-lib-core-websocket-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.websocket + jar + ${assembly-directory}/lib + + + + copy-lib-core-websocket-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.websocket + jar + sources + ${source-assembly-directory}/lib + + + + copy-lib-ee9-websocket-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.ee9.websocket + jar + ${assembly-directory}/lib/ee9-websocket + + + + copy-lib-ee9-websocket-src-deps + + copy-dependencies + generate-resources + + org.eclipse.jetty.ee9.websocket + jar + sources + ${source-assembly-directory}/lib/ee9-websocket + + + + copy-lib-servlet-api-deps copy + generate-resources @@ -143,10 +488,10 @@ copy-lib-servlet-api-src-deps - generate-resources copy + generate-resources @@ -161,10 +506,10 @@ copy-lib-transaction-api-deps - generate-resources copy + generate-resources @@ -194,10 +539,10 @@ copy-lib-transaction-api-src-deps - generate-resources copy + generate-resources @@ -211,179 +556,18 @@ - copy-ee9-annotations-deps - generate-resources - - copy-dependencies - - - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis - jar - ${assembly-directory}/lib/ee9-annotations - - - - copy-ee9-annotations-src-deps - generate-resources - - copy-dependencies - - - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis - jar - sources - ${source-assembly-directory}/lib/ee9-annotations - - - - copy-ee9-jsp-src-deps - generate-resources - - copy-dependencies - - - true - org.mortbay.jasper,org.eclipse.jdt - apache-jsp,apache-el,ecj - jar - sources - ${source-assembly-directory}/lib/ee9-apache-jsp - - - - copy-ee9-jsp-deps - generate-resources - - copy-dependencies - - - true - org.mortbay.jasper,org.eclipse.jdt - apache-jsp,apache-el,ecj - jar - ${assembly-directory}/lib/ee9-apache-jsp - - - - copy-ee9-jstl-src-deps - generate-resources + unpack-config-deps - copy-dependencies + unpack-dependencies - - true - jakarta.servlet.jsp.jstl,org.glassfish.web - jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl - jar - sources - ${source-assembly-directory}/lib/ee9-glassfish-jstl - - - - copy-ee9-jstl-deps generate-resources - - copy-dependencies - - true - jakarta.servlet.jsp.jstl,org.glassfish.web - jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl - jar - ${assembly-directory}/lib/ee9-glassfish-jstl - - - - copy-ee9-jaspi-deps - generate-resources - - copy-dependencies - - - jakarta.authentication - jakarta.authentication-api - jar - ${assembly-directory}/lib/ee9-jaspi - - - - copy-ee9-jaspi-src-deps - generate-resources - - copy-dependencies - - - jakarta.authentication - jakarta.authentication-api - jar - sources - ${source-assembly-directory}/lib/ee9-jaspi - - - - - copy-ee9-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.ee9 - jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server - org.eclipse.jetty.ee9.demos,org.eclipse.jetty.ee9.websocket - jar - ${assembly-directory}/lib - - - - copy-ee9-src-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.ee9 - jar - org.eclipse.jetty.ee9.demos,org.eclipse.jetty.ee9.websocket - sources - ${source-assembly-directory}/lib - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - posix - false - - - - binary - package - - single - - - - src/main/assembly/jetty-assembly.xml - - - - - sources - package - - single - - - - src/main/assembly/jetty-source-assembly.xml - - true + org.eclipse.jetty.ee9, org.eclipse.jetty.ee9.demos + + config + false + META-INF/**,webapps/**,start.d/**,start.ini + ${assembly-directory} @@ -391,191 +575,4 @@ - - - org.ow2.asm - asm - - - org.ow2.asm - asm-commons - - - org.ow2.asm - asm-tree - - - org.ow2.asm - asm-analysis - - - - - org.eclipse.jetty.ee9 - jetty-ee9-quickstart - - - org.eclipse.jetty.ee9 - jetty-ee9-servlet - - - org.eclipse.jetty.ee9 - jetty-ee9-servlets - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-servlet - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client-webapp - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-server - - - org.eclipse.jetty.ee9 - jetty-ee9-apache-jsp - - - org.eclipse.jetty.ee9 - jetty-ee9-glassfish-jstl - - - javax.el - el-api - - - jakarta.el - jakarta.el-api - - - - - org.eclipse.jetty.ee9 - jetty-ee9-plus - - - org.eclipse.jetty.ee9 - jetty-ee9-proxy - - - org.eclipse.jetty.ee9 - jetty-ee9-cdi - true - - - org.eclipse.jetty.ee9 - jetty-ee9-annotations - - - org.eclipse.jetty.ee9 - jetty-ee9-openid - true - - - org.eclipse.jetty.ee9 - jetty-ee9-jaspi - true - - - org.eclipse.jetty.ee9 - jetty-ee9-jndi - true - - - org.eclipse.jetty.ee9 - jetty-ee9-fcgi-proxy - true - - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-mock-resources - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jetty-webapp - ${project.version} - config - jar - true - - - javax.el - el-api - - - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jaas-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jndi-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-spec-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-async-rest-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-proxy-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-simple-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jsp-webapp - ${project.version} - config - jar - true - - - diff --git a/jetty-ee9/jetty-ee9-jaspi/pom.xml b/jetty-ee9/jetty-ee9-jaspi/pom.xml index 08305370fc14..60a260149122 100644 --- a/jetty-ee9/jetty-ee9-jaspi/pom.xml +++ b/jetty-ee9/jetty-ee9-jaspi/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-jaspi EE9 :: JASPI Jetty security infrastructure @@ -15,39 +16,28 @@ org.eclipse.jetty.ee9.security.jaspi.* - - - - org.apache.felix - maven-bundle-plugin - true - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory - - - - - - jakarta.authentication jakarta.authentication-api - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - org.eclipse.jetty.ee9 jetty-ee9-security + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + org.slf4j slf4j-api + + jakarta.activation + jakarta.activation-api + test + org.eclipse.jetty jetty-slf4j-impl @@ -58,10 +48,21 @@ jetty-test-helper test - - jakarta.activation - jakarta.activation-api - test - + + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory + + + + + diff --git a/jetty-ee9/jetty-ee9-jndi/pom.xml b/jetty-ee9/jetty-ee9-jndi/pom.xml index b12437507b82..aeaf573afe1d 100644 --- a/jetty-ee9/jetty-ee9-jndi/pom.xml +++ b/jetty-ee9/jetty-ee9-jndi/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-jndi EE9 :: JNDI EE9 JNDI factories @@ -15,26 +16,7 @@ org.eclipse.jetty.ee9.jndi.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* - - - - - - - - org.eclipse.jetty - jetty-jndi - jakarta.activation jakarta.activation-api @@ -45,6 +27,10 @@ jakarta.mail-api true + + org.eclipse.jetty + jetty-jndi + org.slf4j slf4j-api @@ -60,4 +46,19 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* + + + + + diff --git a/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml b/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml index 103e3d104bc6..62f7cc38e079 100644 --- a/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml +++ b/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - 4.0.0 jetty-ee9-jspc-maven-plugin maven-plugin EE9 :: Jetty JSPC Maven Plugin @@ -13,76 +13,34 @@ ${project.groupId}.jspc.plugin true - - - - org.apache.maven.plugins - maven-plugin-plugin - - - exec-plugin-doc - process-classes - - descriptor - helpmojo - - - - - - org.apache.maven.plugins - maven-invoker-plugin - - - integration-test - - install - integration-test - verify - - - - - - ${maven.surefire.plugin.version} - - - clean - - - - - - org.eclipse.jetty - jetty-util + org.apache.ant + ant - org.apache.maven - maven-plugin-api - provided + org.apache.maven.plugin-tools + maven-plugin-tools-api - javax.annotation - javax.annotation-api + junit + junit - org.apache.maven - maven-core - provided + org.eclipse.jetty + jetty-util - org.apache.maven - maven-model - provided + org.eclipse.jetty.ee9 + jetty-ee9-apache-jsp + ${project.version} - org.apache.maven.plugin-tools - maven-plugin-annotations - provided + org.eclipse.jetty.ee9 + jetty-ee9-glassfish-jstl + ${project.version} org.apache.maven @@ -90,28 +48,76 @@ provided - org.apache.maven.plugin-tools - maven-plugin-tools-api + org.apache.maven + maven-core + provided - junit - junit + javax.annotation + javax.annotation-api - org.eclipse.jetty.ee9 - jetty-ee9-apache-jsp - ${project.version} + org.apache.maven + maven-model + provided - org.eclipse.jetty.ee9 - jetty-ee9-glassfish-jstl - ${project.version} + org.apache.maven + maven-plugin-api + provided + + + javax.annotation + javax.annotation-api + + - org.apache.ant - ant + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + + org.apache.maven.plugins + maven-invoker-plugin + + + ${maven.surefire.plugin.version} + + + clean + + + + + integration-test + + install + integration-test + verify + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + + exec-plugin-doc + + descriptor + helpmojo + + process-classes + + + + + diff --git a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml index 313a188cde03..a2f770cf539e 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml +++ b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml @@ -1,196 +1,36 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - 4.0.0 jetty-ee9-maven-plugin maven-plugin EE9 :: Jetty Maven Plugin Jetty maven plugins - false ${project.groupId}.maven.plugin - FREEBEER - true + + FREEBEER + false - - - - org.codehaus.mojo - build-helper-maven-plugin - - - test-reserve-ports - process-test-classes - - reserve-network-port - - - - test.stopPort - test.jettyPort - - - - - reserve-ports - pre-integration-test - - reserve-network-port - - - - jetty.stopPort - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Dstop.port=@{test.stopPort} -Djetty.port=@{test.jettyPort} - - **/IntegrationTest*.java - - - - - org.apache.maven.plugins - maven-plugin-plugin - - jetty - - - - exec-plugin-doc - generate-sources - - helpmojo - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - package - - copy - - - - - - - org.eclipse.jetty - jetty-home - zip - false - ${project.build.directory} - ${jettyHomeZipFileName} - - - false - true - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - org.apache.maven.plugins - maven-invoker-plugin - - - integration-test - integration-test - - install - integration-test - verify - - - - - org.eclipse.jetty.maven.its.ee9 - - it-parent-pom/pom.xml - - - org.eclipse.jetty:jetty-slf4j-impl:${project.version} - - - - javax-annotation-api/pom.xml - - jetty-start-gwt-it/pom.xml - - jetty-start-war-mojo-it/pom.xml - - - - - ${jetty.stopKey} - ${jetty.stopPort} - ${maven.surefire.plugin.version} - ${jetty.servlet.api.version} - ${localRepoPath} - ${jettyHomeZip} - - - clean - - - - - - org.apache.maven.shared - maven-artifact-transfer - ${maven-artifact-transfer.version} - - - org.apache.maven - maven-plugin-api - provided - - - javax.annotation - javax.annotation-api - - - - - org.apache.maven - maven-artifact - provided + jakarta.transaction + jakarta.transaction-api + true - org.apache.maven - maven-core - provided + org.apache.maven.plugin-tools + maven-plugin-tools-api - org.apache.maven - maven-model - provided + org.apache.maven.shared + maven-artifact-transfer + ${maven-artifact-transfer.version} org.codehaus.plexus @@ -198,11 +38,11 @@ org.apache.maven - maven-xml-impl + maven-api-xml org.apache.maven - maven-api-xml + maven-xml-impl org.apache.maven @@ -211,13 +51,9 @@ - org.apache.maven.plugin-tools - maven-plugin-tools-api - - - org.apache.maven.plugin-tools - maven-plugin-annotations - provided + org.eclipse.jetty + jetty-client + true org.eclipse.jetty @@ -232,27 +68,17 @@ org.eclipse.jetty - jetty-util - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - - - jakarta.servlet - servlet-api - - + jetty-http true - org.eclipse.jetty.ee9 - jetty-ee9-quickstart + org.eclipse.jetty + jetty-io true - org.eclipse.jetty.ee9 - jetty-ee9-plus + org.eclipse.jetty + jetty-jmx true @@ -265,35 +91,50 @@ jetty-server true + + org.eclipse.jetty + jetty-util + org.eclipse.jetty.ee9 - jetty-ee9-servlet + jetty-ee9-annotations true - org.eclipse.jetty - jetty-client + org.eclipse.jetty.ee9 + jetty-ee9-apache-jsp true - org.eclipse.jetty - jetty-http + org.eclipse.jetty.ee9 + jetty-ee9-glassfish-jstl true - org.eclipse.jetty - jetty-io + org.eclipse.jetty.ee9 + jetty-ee9-plus true - org.eclipse.jetty - jetty-jmx + org.eclipse.jetty.ee9 + jetty-ee9-quickstart true org.eclipse.jetty.ee9 - jetty-ee9-annotations + jetty-ee9-servlet + true + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp true + + + jakarta.servlet + servlet-api + + org.eclipse.jetty.ee9.websocket @@ -306,24 +147,51 @@ true - org.eclipse.jetty.ee9 - jetty-ee9-apache-jsp + org.slf4j + slf4j-api true - org.eclipse.jetty.ee9 - jetty-ee9-glassfish-jstl - true + org.apache.maven + maven-artifact + provided - org.slf4j - slf4j-api - true + org.apache.maven + maven-core + provided + + + javax.annotation + javax.annotation-api + + - jakarta.transaction - jakarta.transaction-api - true + org.apache.maven + maven-model + provided + + + org.apache.maven + maven-plugin-api + provided + + + javax.annotation + javax.annotation-api + + + + + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + org.awaitility + awaitility + test org.eclipse.jetty @@ -335,10 +203,149 @@ jetty-test-helper test - - org.awaitility - awaitility - test - + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + org.eclipse.jetty + jetty-home + zip + false + ${project.build.directory} + ${jettyHomeZipFileName} + + + false + true + + + + copy + + copy + + package + + + + + org.apache.maven.plugins + maven-invoker-plugin + + org.eclipse.jetty.maven.its.ee9 + + it-parent-pom/pom.xml + + + org.eclipse.jetty:jetty-slf4j-impl:${project.version} + + + + javax-annotation-api/pom.xml + + jetty-start-gwt-it/pom.xml + + jetty-start-war-mojo-it/pom.xml + + + + + ${jetty.stopKey} + ${jetty.stopPort} + ${maven.surefire.plugin.version} + ${jetty.servlet.api.version} + ${localRepoPath} + ${jettyHomeZip} + + + clean + + + + + integration-test + + install + integration-test + verify + + integration-test + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + jetty + + + + exec-plugin-doc + + helpmojo + + generate-sources + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Dstop.port=@{test.stopPort} -Djetty.port=@{test.jettyPort} + + **/IntegrationTest*.java + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + test-reserve-ports + + reserve-network-port + + process-test-classes + + + test.stopPort + test.jettyPort + + + + + reserve-ports + + reserve-network-port + + pre-integration-test + + + jetty.stopPort + + + + + + + diff --git a/jetty-ee9/jetty-ee9-nested/pom.xml b/jetty-ee9/jetty-ee9-nested/pom.xml index 32b37ccffeaf..e0d501193baa 100644 --- a/jetty-ee9/jetty-ee9-nested/pom.xml +++ b/jetty-ee9/jetty-ee9-nested/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-nested EE9 :: Nested The jetty core handler adapted to legacy ee9 handler. @@ -15,30 +16,15 @@ org.eclipse.jetty.ee9.nested.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.ee9.nested=org.eclipse.jetty.logging - --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED - --add-reads org.eclipse.jetty.server=org.eclipse.jetty.logging - - - - - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api + org.eclipse.jetty + jetty-http org.eclipse.jetty - jetty-http + jetty-jmx + true org.eclipse.jetty @@ -50,8 +36,12 @@ org.eclipse.jetty - jetty-jmx - true + jetty-session + compile + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api org.slf4j @@ -59,17 +49,12 @@ org.eclipse.jetty - jetty-xml - test - - - org.eclipse.jetty.toolchain - jetty-test-helper + jetty-http-tools test org.eclipse.jetty - jetty-http-tools + jetty-slf4j-impl test @@ -79,14 +64,28 @@ org.eclipse.jetty - jetty-slf4j-impl + jetty-xml test - org.eclipse.jetty - jetty-session - compile + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.ee9.nested=org.eclipse.jetty.logging + --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED + --add-reads org.eclipse.jetty.server=org.eclipse.jetty.logging + + + + + diff --git a/jetty-ee9/jetty-ee9-openid/pom.xml b/jetty-ee9/jetty-ee9-openid/pom.xml index 4b9cd993093e..4820c24fbc01 100644 --- a/jetty-ee9/jetty-ee9-openid/pom.xml +++ b/jetty-ee9/jetty-ee9-openid/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-openid EE9 :: OpenID Jetty OpenID Connect infrastructure @@ -15,26 +16,14 @@ org.eclipse.jetty.ee9.security.openid.* - - - - org.apache.felix - maven-bundle-plugin - true - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory - - - - - - org.eclipse.jetty - jetty-server + jetty-client + + + org.eclipse.jetty + jetty-openid org.eclipse.jetty @@ -42,20 +31,16 @@ org.eclipse.jetty - jetty-openid + jetty-server org.eclipse.jetty - jetty-client + jetty-util-ajax org.eclipse.jetty.ee9 jetty-ee9-security - - org.eclipse.jetty - jetty-util-ajax - org.slf4j slf4j-api @@ -76,4 +61,20 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory + + + + + diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml index 14e4144a6e2f..c3d62d816ff6 100644 --- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi 12.0.3-SNAPSHOT - 4.0.0 jetty-ee9-osgi-boot-jsp EE9 :: OSGi :: Boot JSP Jetty OSGi Boot JSP bundle @@ -17,10 +18,15 @@ org.eclipse.jetty jetty-deploy + - org.eclipse.jetty.ee9.osgi - jetty-ee9-osgi-boot - provided + org.eclipse.jetty.ee9 + jetty-ee9-apache-jsp + + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api org.eclipse.platform @@ -30,38 +36,15 @@ org.eclipse.platform org.eclipse.osgi.services - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - - - org.eclipse.jetty.ee9 - jetty-ee9-apache-jsp + org.eclipse.jetty.ee9.osgi + jetty-ee9-osgi-boot + provided - - - org.codehaus.mojo - build-helper-maven-plugin - - - set-jsp-api-version - validate - - parse-version - - - ${jsp.impl.version} - jspImpl - - - - org.apache.felix @@ -70,11 +53,10 @@ Jetty-OSGi-Jasper Integration - + org.eclipse.jetty.ee9.osgi.boot !org.eclipse.jetty.ee9.osgi.boot.* - - ${osgi.slf4j.import.packages}, + ${osgi.slf4j.import.packages}, org.eclipse.jdt.*;resolution:=optional, org.eclipse.jdt.core.compiler.*;resolution:=optional, com.sun.el;resolution:=optional, @@ -137,15 +119,31 @@ javax.xml.*;resolution:=optional, org.w3c.dom;resolution:=optional, org.w3c.dom.ls;resolution:=optional, - javax.xml.parser;resolution:=optional - + javax.xml.parser;resolution:=optional org.eclipse.jetty.ee9.jsp.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.apache.jasper.*;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))", - org.apache.el.*;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))" - + org.apache.el.*;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))" + + + org.codehaus.mojo + build-helper-maven-plugin + + + set-jsp-api-version + + parse-version + + validate + + ${jsp.impl.version} + jspImpl + + + + diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml index 765220c6ffe1..83dc884bcc87 100644 --- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi 12.0.3-SNAPSHOT - 4.0.0 jetty-ee9-osgi-boot EE9 :: OSGi :: Boot Jetty OSGi Boot bundle @@ -14,20 +15,20 @@ - org.eclipse.jetty.ee9 - jetty-ee9-annotations - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp + org.eclipse.jetty + jetty-jmx org.eclipse.jetty jetty-osgi - org.eclipse.jetty - jetty-jmx + org.eclipse.jetty.ee9 + jetty-ee9-annotations + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp org.eclipse.platform @@ -58,27 +59,6 @@ - - maven-antrun-plugin - - - process-resources - - - - - - - - - - - - run - - - - org.apache.felix maven-bundle-plugin @@ -88,8 +68,7 @@ org.eclipse.jetty.ee9.osgi.boot;singleton:=true org.eclipse.jetty.ee9.osgi.boot.EE9Activator org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.eclipse.jetty.ee9.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))" - - ${osgi.slf4j.import.packages}, + ${osgi.slf4j.import.packages}, jakarta.mail;version="2.0";resolution:=optional, jakarta.mail.event;version="2.0";resolution:=optional, jakarta.mail.internet;version="2.0";resolution:=optional, @@ -111,18 +90,34 @@ org.xml.sax, org.xml.sax.helpers, org.eclipse.jetty.ee9.annotations;resolution:=optional, - * - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration - + * + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration <_nouses>true + + maven-antrun-plugin + + + + run + + process-resources + + + + + + + + + + + + + diff --git a/jetty-ee9/jetty-ee9-osgi/pom.xml b/jetty-ee9/jetty-ee9-osgi/pom.xml index 1caa6b108950..20893666a3e2 100644 --- a/jetty-ee9/jetty-ee9-osgi/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/pom.xml @@ -1,29 +1,30 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi - EE9 :: OSGi pom - - - true - + EE9 :: OSGi jetty-ee9-osgi-boot jetty-ee9-osgi-boot-jsp - test-jetty-ee9-osgi-webapp-resources + test-jetty-ee9-osgi test-jetty-ee9-osgi-fragment test-jetty-ee9-osgi-server - test-jetty-ee9-osgi + test-jetty-ee9-osgi-webapp-resources + + true + + @@ -42,8 +43,11 @@ - META-INF/.. true + META-INF/.. + + META-INF/**/* + **/.* **/*.jar @@ -55,9 +59,6 @@ target/**/* build.properties - - META-INF/**/* - src/main/java diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-fragment/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-fragment/pom.xml index 9cceab838325..f48874c36b72 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-fragment/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-fragment/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi 12.0.3-SNAPSHOT - 4.0.0 test-jetty-ee9-osgi-fragment EE9 :: OSGi :: WebApp Fragment Test Jetty OSGi Webapp Fragment bundle diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-server/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-server/pom.xml index 2fb39532639c..1ceff8d55d2c 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-server/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-server/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi 12.0.3-SNAPSHOT - 4.0.0 test-jetty-ee9-osgi-server EE9 :: OSGi :: Server Test Jetty OSGi bundle with a Server @@ -50,8 +51,7 @@ of the packages it uses; no need to reflect some tight dependency determined at compilation time. --> <_nouses>true - - org.osgi.framework, + org.osgi.framework, org.osgi.service.cm;version="${osgi-service-cm-version}", org.osgi.service.packageadmin, org.osgi.service.startlevel;version="1.0.0", @@ -59,8 +59,7 @@ org.osgi.util.tracker;version="${osgi-util-tracker-version}", org.xml.sax, org.xml.sax.helpers, - * - + * org.eclipse.jetty.*;version="[$(version;==;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))" diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-webapp-resources/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-webapp-resources/pom.xml index ede854c0511a..d74f364646e8 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-webapp-resources/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-webapp-resources/pom.xml @@ -1,31 +1,53 @@ + 4.0.0 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi 12.0.3-SNAPSHOT - 4.0.0 test-jetty-ee9-osgi-webapp-resources - EE9 :: OSGi :: WebApp With Resources war + EE9 :: OSGi :: WebApp With Resources ${project.groupId}.webapp.resources true true + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + + + org.apache.felix + maven-bundle-plugin + true + + + war + + + !com.acme* + / + ee9 + + + org.apache.maven.plugins maven-resources-plugin copy-resources - validate copy-resources + validate ${basedir}/target/classes @@ -37,21 +59,6 @@ - - org.apache.felix - maven-bundle-plugin - true - - - war - - - !com.acme* - / - ee9 - - - maven-war-plugin @@ -63,11 +70,4 @@ - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml index 45bc5ff67671..99d3f046f893 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml @@ -1,106 +1,28 @@ + + 4.0.0 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi 12.0.3-SNAPSHOT - 4.0.0 test-jetty-ee9-osgi EE9 :: OSGi :: Test Jetty OSGi Integration test + target/distribution ${project.groupId}.boot.test.osgi + 1.2 https://download.eclipse.org/jetty/orbit/ - target/distribution + true + true 4.13.5 2.6.14 + 1.3.6 1.8.3 3.0.0 - 1.3.6 - 1.2 - true - true - - - org.ops4j.pax.exam - pax-exam - test - - - org.ops4j.pax.exam - pax-exam-inject - test - - - - org.ops4j.pax.exam - pax-exam-container-forked - test - - - biz.aQute.bnd - bndlib - - - org.ops4j.pax.tinybundles - tinybundles - - - - - org.ops4j.pax.tinybundles - tinybundles - - - org.ops4j.pax.swissbox - pax-swissbox-framework - test - - - org.ops4j.base - ops4j-base-monitors - - - - - org.ops4j.pax.swissbox - pax-swissbox-tracker - test - - - org.ops4j.pax.exam - pax-exam-junit4 - test - - - org.ops4j.pax.exam - pax-exam-link-mvn - test - - - org.ops4j.pax.url - pax-url-aether - test - - - javax.annotation - javax.annotation-api - - - - - org.ops4j.pax.url - pax-url-wrap - test - - - biz.aQute.bnd - bndlib - - - biz.aQute.bnd biz.aQute.bndlib @@ -112,164 +34,76 @@ - org.eclipse.platform - org.eclipse.osgi - test - - - org.eclipse.platform - org.eclipse.osgi.services - test - - - org.eclipse.platform - org.eclipse.osgi.util - test - - - org.apache.geronimo.specs - geronimo-atinject_1.0_spec - test - - - org.osgi - org.osgi.util.promise - test - - - org.osgi - org.osgi.util.measurement - test - - - org.osgi - org.osgi.util.position - test - - - org.osgi - org.osgi.util.xml - test - - - - org.slf4j - slf4j-api - test - - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.ee9.osgi - jetty-ee9-osgi-boot - test + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api - org.eclipse.platform - org.eclipse.osgi - - - org.eclipse.platform - org.eclipse.osgi.services + jakarta.el + jakarta.el-api - org.eclipse.jetty.ee9.osgi - jetty-ee9-osgi-boot-jsp - test - - - org.eclipse.platform - org.eclipse.osgi - - - org.eclipse.platform - org.eclipse.osgi.services - - + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-mock-resources + ${project.version} - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api + org.eclipse.jetty.http2 + jetty-http2-hpack - jakarta.inject - jakarta.inject-api - test + org.eclipse.jetty.http2 + jetty-http2-server - jakarta.transaction - jakarta.transaction-api - test + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api - jakarta.interceptor - jakarta.interceptor-api - test + org.glassfish.web + jakarta.servlet.jsp.jstl - jakarta.enterprise - jakarta.enterprise.cdi-api - test + org.mortbay.jasper + apache-el - jakarta.el - jakarta.el-api - test + org.mortbay.jasper + apache-jsp - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - test - - - org.apache.felix - org.apache.felix.framework - - + org.ops4j.pax.tinybundles + tinybundles - jakarta.activation - jakarta.activation-api - test + org.eclipse.jetty + jetty-client + runtime - org.mortbay.jasper - apache-jsp + org.eclipse.jetty + jetty-deploy + runtime - org.mortbay.jasper - apache-el + org.eclipse.jetty + jetty-jmx + runtime - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - - - jakarta.el - jakarta.el-api - - + org.eclipse.jetty + jetty-server + runtime - org.glassfish.web - jakarta.servlet.jsp.jstl - - + org.eclipse.jetty + jetty-util + runtime + - org.eclipse.jetty.ee9 - jetty-ee9-jndi + org.eclipse.jetty + jetty-xml runtime @@ -277,19 +111,20 @@ jetty-ee9-annotations runtime + org.eclipse.jetty.ee9 - jetty-ee9-webapp + jetty-ee9-jndi runtime - org.eclipse.jetty - jetty-deploy + org.eclipse.jetty.ee9 + jetty-ee9-plus runtime - org.eclipse.jetty - jetty-server + org.eclipse.jetty.ee9 + jetty-ee9-security runtime @@ -304,76 +139,119 @@ org.eclipse.jetty.ee9 - jetty-ee9-security + jetty-ee9-webapp runtime - org.eclipse.jetty - jetty-xml + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-client runtime - org.eclipse.jetty - jetty-jmx + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-server runtime - org.eclipse.jetty - jetty-util + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-api runtime - org.eclipse.jetty - jetty-client + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client runtime org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-api + jetty-ee9-websocket-jetty-common runtime org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-common + jetty-ee9-websocket-jetty-server runtime org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client + jetty-ee9-websocket-servlet runtime - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-client + org.eclipse.jetty.toolchain + jetty-jakarta-websocket-api runtime - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-servlet - runtime + jakarta.activation + jakarta.activation-api + test + + + jakarta.el + jakarta.el-api + test + + + jakarta.enterprise + jakarta.enterprise.cdi-api + test + + + jakarta.inject + jakarta.inject-api + test + + + jakarta.interceptor + jakarta.interceptor-api + test + + + jakarta.transaction + jakarta.transaction-api + test + + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + test + + + org.apache.felix + org.apache.felix.framework + + + + + org.apache.geronimo.specs + geronimo-atinject_1.0_spec + test - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server - runtime + org.conscrypt + conscrypt-openjdk-uber + test - org.eclipse.jetty.toolchain - jetty-jakarta-websocket-api - runtime + org.eclipse.jetty + jetty-alpn-conscrypt-client + test - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-server - runtime + org.eclipse.jetty + jetty-alpn-conscrypt-server + test - org.eclipse.jetty.http2 - jetty-http2-server + org.eclipse.jetty + jetty-alpn-java-client + test - org.eclipse.jetty.http2 - jetty-http2-hpack + org.eclipse.jetty + jetty-alpn-java-server + test org.eclipse.jetty @@ -381,18 +259,22 @@ ${project.version} test + + + org.eclipse.jetty + jetty-slf4j-impl + test - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jsp-webapp + jetty-ee9-demo-container-initializer ${project.version} - webbundle test @@ -409,25 +291,51 @@ webbundle test + + org.eclipse.jetty.ee9.demos - jetty-ee9-demo-spec-webapp + jetty-ee9-demo-jsp-webapp ${project.version} - war + webbundle test org.eclipse.jetty.ee9.demos - jetty-ee9-demo-container-initializer + jetty-ee9-demo-spec-webapp ${project.version} + war test org.eclipse.jetty.ee9.osgi - test-jetty-ee9-osgi-webapp-resources - ${project.version} - war + jetty-ee9-osgi-boot + test + + + org.eclipse.platform + org.eclipse.osgi + + + org.eclipse.platform + org.eclipse.osgi.services + + + + + org.eclipse.jetty.ee9.osgi + jetty-ee9-osgi-boot-jsp test + + + org.eclipse.platform + org.eclipse.osgi + + + org.eclipse.platform + org.eclipse.osgi.services + + org.eclipse.jetty.ee9.osgi @@ -442,9 +350,21 @@ test - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-mock-resources + org.eclipse.jetty.ee9.osgi + test-jetty-ee9-osgi-webapp-resources ${project.version} + war + test + + + org.eclipse.jetty.http2 + jetty-http2-client + test + + + org.eclipse.jetty.http2 + jetty-http2-client-transport + test org.eclipse.jetty.toolchain @@ -452,63 +372,144 @@ test - org.ow2.asm - asm + org.eclipse.platform + org.eclipse.osgi test - org.ow2.asm - asm-commons + org.eclipse.platform + org.eclipse.osgi.services test - org.ow2.asm - asm-tree + org.eclipse.platform + org.eclipse.osgi.util + test + + + + org.ops4j.pax.exam + pax-exam test + - org.ow2.asm - asm-analysis + org.ops4j.pax.exam + pax-exam-container-forked test + + + biz.aQute.bnd + bndlib + + + org.ops4j.pax.tinybundles + tinybundles + + - org.ow2.asm - asm-util + org.ops4j.pax.exam + pax-exam-inject test - org.eclipse.jetty.http2 - jetty-http2-client + org.ops4j.pax.exam + pax-exam-junit4 test - org.eclipse.jetty.http2 - jetty-http2-client-transport + org.ops4j.pax.exam + pax-exam-link-mvn test - org.eclipse.jetty - jetty-alpn-conscrypt-server + org.ops4j.pax.swissbox + pax-swissbox-framework test + + + org.ops4j.base + ops4j-base-monitors + + - org.eclipse.jetty - jetty-alpn-conscrypt-client + org.ops4j.pax.swissbox + pax-swissbox-tracker test - org.conscrypt - conscrypt-openjdk-uber + org.ops4j.pax.url + pax-url-aether test + + + javax.annotation + javax.annotation-api + + - org.eclipse.jetty - jetty-alpn-java-server + org.ops4j.pax.url + pax-url-wrap + test + + + biz.aQute.bnd + bndlib + + + + + org.osgi + org.osgi.util.measurement test - org.eclipse.jetty - jetty-alpn-java-client + org.osgi + org.osgi.util.position + test + + + org.osgi + org.osgi.util.promise + test + + + org.osgi + org.osgi.util.xml + test + + + org.ow2.asm + asm + test + + + org.ow2.asm + asm-analysis + test + + + org.ow2.asm + asm-commons + test + + + org.ow2.asm + asm-tree + test + + + org.ow2.asm + asm-util + test + + + + org.slf4j + slf4j-api test @@ -569,7 +570,7 @@ - + @@ -581,20 +582,20 @@ maven-dependency-plugin + + test-jetty-ee9-osgi-webapp-resources + target + true + copy - process-test-resources copy-dependencies - + process-test-resources + - - test-jetty-ee9-osgi-webapp-resources - target - true - org.apache.servicemix.tooling diff --git a/jetty-ee9/jetty-ee9-plus/pom.xml b/jetty-ee9/jetty-ee9-plus/pom.xml index ba7a1ca23664..86f41de9bb73 100644 --- a/jetty-ee9/jetty-ee9-plus/pom.xml +++ b/jetty-ee9/jetty-ee9-plus/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-plus EE9 :: Plus Jetty JavaEE style services @@ -15,36 +16,15 @@ org.eclipse.jetty.ee9.plus.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},jakarta.transaction.*;version="2.0.0",* - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration - - - - - - - - - jakarta.transaction - jakarta.transaction-api - jakarta.enterprise jakarta.enterprise.cdi-api + + jakarta.transaction + jakarta.transaction-api + org.eclipse.jetty jetty-jndi @@ -69,4 +49,21 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},jakarta.transaction.*;version="2.0.0",* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration + + + + + + diff --git a/jetty-ee9/jetty-ee9-proxy/pom.xml b/jetty-ee9/jetty-ee9-proxy/pom.xml index 77ec0681f086..0d35590c9c65 100644 --- a/jetty-ee9/jetty-ee9-proxy/pom.xml +++ b/jetty-ee9/jetty-ee9-proxy/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-proxy EE9 :: Proxy Jetty Proxy @@ -14,28 +15,18 @@ ${project.groupId}.proxy org.eclipse.jetty.ee9.proxy.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.ee9.proxy=org.eclipse.jetty.logging - - - - - - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-client - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided + org.eclipse.jetty + jetty-util + + + org.slf4j + slf4j-api org.eclipse.jetty.ee9 @@ -43,21 +34,18 @@ provided - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-client + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided org.eclipse.jetty - jetty-util-ajax + jetty-http-tools test org.eclipse.jetty - jetty-http-tools + jetty-rewrite test @@ -67,7 +55,7 @@ org.eclipse.jetty - jetty-rewrite + jetty-util-ajax test @@ -76,4 +64,15 @@ test + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.ee9.proxy=org.eclipse.jetty.logging + + + + diff --git a/jetty-ee9/jetty-ee9-quickstart/pom.xml b/jetty-ee9/jetty-ee9-quickstart/pom.xml index 20e02edaf00b..575897a030f8 100644 --- a/jetty-ee9/jetty-ee9-quickstart/pom.xml +++ b/jetty-ee9/jetty-ee9-quickstart/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-quickstart EE9 :: Quick Start Jetty Quick Start @@ -14,30 +15,10 @@ ${project.groupId}.quickstart - - - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration - - - - - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp + jetty-ee9-annotations org.eclipse.jetty.ee9 @@ -45,7 +26,7 @@ org.eclipse.jetty.ee9 - jetty-ee9-annotations + jetty-ee9-webapp org.slf4j @@ -63,4 +44,20 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration + + + + + + diff --git a/jetty-ee9/jetty-ee9-runner/pom.xml b/jetty-ee9/jetty-ee9-runner/pom.xml index 9be1dd096999..761fc2ba981d 100644 --- a/jetty-ee9/jetty-ee9-runner/pom.xml +++ b/jetty-ee9/jetty-ee9-runner/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - 4.0.0 jetty-ee9-runner EE9 :: Runner @@ -15,7 +16,80 @@ true + + + org.eclipse.jetty + jetty-jndi + + + org.eclipse.jetty.ee9 + jetty-ee9-annotations + + + org.eclipse.jetty.ee9 + jetty-ee9-apache-jsp + + + org.eclipse.jetty.ee9 + jetty-ee9-glassfish-jstl + + + org.eclipse.jetty.ee9 + jetty-ee9-plus + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-server + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + runtime + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-simple-webapp + war + test + + + + + + + org.apache.felix + maven-bundle-plugin + + + true + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.eclipse.jetty.ee9.runner.Runner + + + Jetty Runner + + + + + + org.apache.maven.plugins @@ -23,14 +97,13 @@ unpack-dependencies - prepare-package unpack-dependencies + prepare-package ** - - **/MANIFEST.MF, + **/MANIFEST.MF, META-INF/LICENSE, META-INF/*.RSA, META-INF/*.DSA, @@ -39,8 +112,7 @@ readme.txt, MANIFEST.MF, about.html, - ecj.1 - + ecj.1 ${project.build.directory}/classes false true @@ -89,78 +161,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - true - - - - org.apache.maven.plugins - maven-jar-plugin - - - - org.eclipse.jetty.ee9.runner.Runner - - - Jetty Runner - - - - - - - - - - org.eclipse.jetty.ee9 - jetty-ee9-plus - - - org.eclipse.jetty.ee9 - jetty-ee9-annotations - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server - - - org.eclipse.jetty - jetty-jndi - - - org.eclipse.jetty.ee9 - jetty-ee9-apache-jsp - - - org.eclipse.jetty.ee9 - jetty-ee9-glassfish-jstl - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - runtime - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-simple-webapp - war - test - - - org.eclipse.jetty - jetty-client - test - - diff --git a/jetty-ee9/jetty-ee9-security/pom.xml b/jetty-ee9/jetty-ee9-security/pom.xml index 2ef2f204f4cd..9b926424fdc9 100644 --- a/jetty-ee9/jetty-ee9-security/pom.xml +++ b/jetty-ee9/jetty-ee9-security/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-security EE9 :: Security Jetty security infrastructure @@ -15,43 +16,28 @@ org.eclipse.jetty.ee9.security.* - - - - org.apache.felix - maven-bundle-plugin - true - - - osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional - - - - - - - - org.eclipse.jetty.ee9 - jetty-ee9-nested - org.eclipse.jetty jetty-security + + org.eclipse.jetty.ee9 + jetty-ee9-nested + org.slf4j slf4j-api - org.eclipse.jetty - jetty-slf4j-impl + jetty-http-tools test + org.eclipse.jetty - jetty-http-tools + jetty-slf4j-impl test @@ -61,4 +47,19 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + + + + + + diff --git a/jetty-ee9/jetty-ee9-servlet/pom.xml b/jetty-ee9/jetty-ee9-servlet/pom.xml index f36fcc01dc6f..4ffb71f67686 100644 --- a/jetty-ee9/jetty-ee9-servlet/pom.xml +++ b/jetty-ee9/jetty-ee9-servlet/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-servlet EE9 :: Servlet Jetty Servlet Container @@ -16,22 +16,17 @@ org.eclipse.jetty.ee9.servlet.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules org.eclipse.jetty.util.ajax - --add-reads org.eclipse.jetty.ee9.servlet=org.eclipse.jetty.logging - - - - - - + + org.eclipse.jetty + jetty-jmx + true + + + org.eclipse.jetty + jetty-util-ajax + true + org.eclipse.jetty.ee9 jetty-ee9-nested @@ -46,13 +41,13 @@ org.eclipse.jetty - jetty-util-ajax - true + jetty-client + test org.eclipse.jetty - jetty-jmx - true + jetty-http-tools + test @@ -65,15 +60,18 @@ jetty-test-helper test - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty - jetty-client - test - + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules org.eclipse.jetty.util.ajax + --add-reads org.eclipse.jetty.ee9.servlet=org.eclipse.jetty.logging + + + + diff --git a/jetty-ee9/jetty-ee9-servlets/pom.xml b/jetty-ee9/jetty-ee9-servlets/pom.xml index 326afcb94d6e..fc5e3353d676 100644 --- a/jetty-ee9/jetty-ee9-servlets/pom.xml +++ b/jetty-ee9/jetty-ee9-servlets/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-servlets EE9 :: Utility Servlets and Filters Jetty Utility Servlets @@ -16,33 +16,23 @@ org.eclipse.jetty.ee9.servlets.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules jetty.servlet.api - --add-modules org.eclipse.jetty.util - --add-modules org.eclipse.jetty.io - --add-modules org.eclipse.jetty.http - --add-modules org.eclipse.jetty.server - --add-modules org.eclipse.jetty.session - --add-modules org.eclipse.jetty.ee9.nested - --add-reads org.eclipse.jetty.ee9.servlets=java.management - --add-reads org.eclipse.jetty.ee9.servlets=org.eclipse.jetty.logging - - - - - - org.eclipse.jetty jetty-http + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-util + + + org.slf4j + slf4j-api + org.eclipse.jetty.ee9 jetty-ee9-nested @@ -53,10 +43,6 @@ jetty-ee9-webapp provided - - org.eclipse.jetty - jetty-util - org.eclipse.jetty.toolchain jetty-jakarta-servlet-api @@ -64,16 +50,7 @@ org.eclipse.jetty - jetty-io - - - org.slf4j - slf4j-api - - - - org.eclipse.jetty - jetty-slf4j-impl + jetty-http-tools test @@ -81,9 +58,10 @@ jetty-jmx test + org.eclipse.jetty - jetty-http-tools + jetty-slf4j-impl test @@ -93,4 +71,24 @@ + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules jetty.servlet.api + --add-modules org.eclipse.jetty.util + --add-modules org.eclipse.jetty.io + --add-modules org.eclipse.jetty.http + --add-modules org.eclipse.jetty.server + --add-modules org.eclipse.jetty.session + --add-modules org.eclipse.jetty.ee9.nested + --add-reads org.eclipse.jetty.ee9.servlets=java.management + --add-reads org.eclipse.jetty.ee9.servlets=org.eclipse.jetty.logging + + + + + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-bad-websocket-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-bad-websocket-webapp/pom.xml index 582f67110368..c1b0f31d6671 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-bad-websocket-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-bad-websocket-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-bad-websocket-webapp war @@ -14,11 +14,6 @@ Contains wrong websocket which should fail at deployment - - org.eclipse.jetty.toolchain - jetty-jakarta-websocket-api - provided - org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-common @@ -29,6 +24,11 @@ jetty-jakarta-servlet-api provided + + org.eclipse.jetty.toolchain + jetty-jakarta-websocket-api + provided + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi-common-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi-common-webapp/pom.xml index 13e6ecc9cea9..05e5caa76ee3 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi-common-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi-common-webapp/pom.xml @@ -1,39 +1,25 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-cdi-common-webapp - EE9 :: Tests :: CDI Common Demo WebApp war + EE9 :: Tests :: CDI Common Demo WebApp ${project.groupId}.cdi.common - - - - - org.apache.maven.plugins - maven-war-plugin - - false - - - - - - - + - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api + jakarta.enterprise + jakarta.enterprise.cdi-api provided @@ -42,13 +28,27 @@ jakarta.inject-api provided - + - jakarta.enterprise - jakarta.enterprise.cdi-api + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api provided + + + + + org.apache.maven.plugins + maven-war-plugin + + false + + + + + + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/pom.xml index bccb5438146c..7d1c277ebb72 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-cdi jar EE9 :: Tests :: CDI @@ -26,36 +26,13 @@ compile - org.slf4j - slf4j-api - compile + org.eclipse.jetty.toolchain + jetty-test-helper org.slf4j - jul-to-slf4j - test - - - org.jboss.weld.servlet - weld-servlet-core - ${weld.version} - test - - - io.undertow - * - - - javax.enterprise - cdi-api - - - - - org.jboss.logging - jboss-logging - ${jboss.logging.version} - test + slf4j-api + compile org.eclipse.jetty @@ -69,21 +46,44 @@ org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server + jetty-ee9-websocket-jetty-client test org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client + jetty-ee9-websocket-jetty-server test org.eclipse.jetty.toolchain - jetty-test-helper + jetty-jakarta-servlet-api + test - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api + org.jboss.logging + jboss-logging + ${jboss.logging.version} + test + + + org.jboss.weld.servlet + weld-servlet-core + ${weld.version} + test + + + io.undertow + * + + + javax.enterprise + cdi-api + + + + + org.slf4j + jul-to-slf4j test diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-client-transports/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-client-transports/pom.xml index 87bad34df7e0..32e1e26e008e 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-client-transports/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-client-transports/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-client-transports jar EE9 :: Tests :: HTTP Client Transports @@ -17,54 +17,10 @@ true - - - enable-incubator-foreign - - [17,19) - - - - - maven-surefire-plugin - - - @{argLine} - ${jetty.surefire.argLine} - --add-modules jdk.incubator.foreign - --enable-native-access ALL-UNNAMED - - - - - - - - enable-preview - - [19,21) - - - - - maven-surefire-plugin - - - @{argLine} - --enable-preview - - - - - - - - - org.slf4j - slf4j-api - test + org.eclipse.jetty.toolchain + jetty-test-helper org.awaitility @@ -83,63 +39,103 @@ org.eclipse.jetty - jetty-jmx + jetty-client test - org.eclipse.jetty.ee9 - jetty-ee9-servlet + org.eclipse.jetty + jetty-jmx test - org.eclipse.jetty.ee9 - jetty-ee9-servlets + org.eclipse.jetty + jetty-slf4j-impl test org.eclipse.jetty - jetty-client + jetty-unixdomain-server test - org.eclipse.jetty.http2 - jetty-http2-server + org.eclipse.jetty.ee9 + jetty-ee9-servlet test - org.eclipse.jetty.http2 - jetty-http2-client-transport + org.eclipse.jetty.ee9 + jetty-ee9-servlets test - org.eclipse.jetty.http3 - jetty-http3-server + org.eclipse.jetty.fcgi + jetty-fcgi-server test - org.eclipse.jetty.http3 - jetty-http3-client-transport + org.eclipse.jetty.http2 + jetty-http2-client-transport test - org.eclipse.jetty - jetty-unixdomain-server + org.eclipse.jetty.http2 + jetty-http2-server test - org.eclipse.jetty.fcgi - jetty-fcgi-server + org.eclipse.jetty.http3 + jetty-http3-client-transport test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.http3 + jetty-http3-server test - org.eclipse.jetty.toolchain - jetty-test-helper + org.slf4j + slf4j-api + test + + + enable-incubator-foreign + + [17,19) + + + + + maven-surefire-plugin + + @{argLine} + ${jetty.surefire.argLine} + --add-modules jdk.incubator.foreign + --enable-native-access ALL-UNNAMED + + + + + + + enable-preview + + [19,21) + + + + + maven-surefire-plugin + + @{argLine} + --enable-preview + + + + + + + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-felix-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-felix-webapp/pom.xml index 27f22158f628..73a7dca1698d 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-felix-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-felix-webapp/pom.xml @@ -1,20 +1,33 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-felix-webapp - EE9 :: Tests :: Felix WebApp war + EE9 :: Tests :: Felix WebApp ${project.groupId}.felix + + + org.apache.felix + org.apache.felix.framework + 7.0.5 + + + jakarta.servlet + jakarta.servlet-api + provided + + + @@ -34,17 +47,4 @@ - - - - jakarta.servlet - jakarta.servlet-api - provided - - - org.apache.felix - org.apache.felix.framework - 7.0.5 - - diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml index 46e465b35b22..21844e7df54d 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml @@ -1,20 +1,66 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-http2-webapp - EE9 :: Tests :: HTTP2 WebApp war + EE9 :: Tests :: HTTP2 WebApp ${project.groupId}.http2 + + + org.eclipse.jetty + jetty-alpn-java-client + + + org.eclipse.jetty.http2 + jetty-http2-client + + + org.eclipse.jetty.toolchain + jetty-test-helper + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + + + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + test + + + org.eclipse.jetty.http2 + jetty-http2-server + test + + + @@ -22,10 +68,10 @@ unpack-webapp - pre-integration-test unpack + pre-integration-test @@ -61,50 +107,4 @@ - - - - org.eclipse.jetty.http2 - jetty-http2-client - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - - org.eclipse.jetty - jetty-alpn-java-client - - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - test - - - org.eclipse.jetty.http2 - jetty-http2-server - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.eclipse.jetty - jetty-slf4j-impl - test - - diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml index 2e94568cb5eb..a32f48203ba3 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml @@ -1,70 +1,24 @@ + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - 4.0.0 jetty-ee9-test-integration jar EE9 :: Tests :: Integration - ${project.build.directory}/test-wars - ${project.build.directory}/test-libs - ${project.build.directory}/test-dist ${project.groupId}.integrations + ${project.build.directory}/test-dist + ${project.build.directory}/test-libs + ${project.build.directory}/test-wars - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-wars-for-testing - process-test-resources - - copy - - - - - org.eclipse.jetty.ee9 - jetty-ee9-test-webapp-rfc2616 - ${project.version} - war - ee9-test-rfc2616.war - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jetty-webapp - war - ee9-demo-jetty.war - - - true - ${project.build.directory}/webapps - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - true - false - - - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp + org.eclipse.jetty + jetty-client org.eclipse.jetty @@ -75,8 +29,16 @@ jetty-rewrite - org.eclipse.jetty - jetty-client + org.eclipse.jetty.ee9 + jetty-ee9-apache-jsp + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + + + org.eclipse.jetty.http2 + jetty-http2-server org.slf4j @@ -84,27 +46,19 @@ org.eclipse.jetty - jetty-http-tools + jetty-alpn-server test org.eclipse.jetty - jetty-slf4j-impl + jetty-http-tools test - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty + jetty-slf4j-impl test - - org.eclipse.jetty.ee9 - jetty-ee9-apache-jsp - - - org.eclipse.jetty.http2 - jetty-http2-server - org.eclipse.jetty.ee9 jetty-ee9-annotations @@ -116,13 +70,16 @@ test - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server + org.eclipse.jetty.ee9 + jetty-ee9-test-webapp-rfc2616 + ${project.version} + war test - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-jetty-webapp + war test @@ -131,22 +88,65 @@ test - org.eclipse.jetty.ee9 - jetty-ee9-test-webapp-rfc2616 - ${project.version} - war + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client test - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jetty-webapp - war + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-server test - org.eclipse.jetty - jetty-alpn-server + org.eclipse.jetty.toolchain + jetty-test-helper test + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-wars-for-testing + + copy + + process-test-resources + + + + org.eclipse.jetty.ee9 + jetty-ee9-test-webapp-rfc2616 + ${project.version} + war + ee9-test-rfc2616.war + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-jetty-webapp + war + ee9-demo-jetty.war + + + true + ${project.build.directory}/webapps + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + true + false + + + + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp-it/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp-it/pom.xml index f5dae81a4e22..d16b9ce7cf1e 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp-it/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp-it/pom.xml @@ -1,29 +1,29 @@ + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-test-jmx 12.0.3-SNAPSHOT - 4.0.0 jetty-ee9-jmx-webapp-it jar EE9 :: Tests :: JMX :: WebApp Integration + ${project.groupId}.jmx.webapp.it UTF-8 UTF-8 - ${project.groupId}.jmx.webapp.it ${project.build.directory}/test-base - - org.eclipse.jetty.ee9 - jetty-ee9-annotations - org.eclipse.jetty jetty-jmx + + org.eclipse.jetty.ee9 + jetty-ee9-annotations + org.eclipse.jetty.ee9 jetty-ee9-jmx-webapp @@ -45,10 +45,10 @@ copy-apps-for-testing - process-test-resources copy-dependencies + process-test-resources jetty-ee9-jmx-webapp runtime diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp/pom.xml index d1e9a20afdb4..e7db51e48fa9 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp/pom.xml @@ -14,11 +14,6 @@ true - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - org.eclipse.jetty jetty-jmx @@ -27,6 +22,11 @@ org.slf4j slf4j-api + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + jetty-ee9-jmx-webapp diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/pom.xml index 41c7590080ab..64114f6f2f52 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - 4.0.0 jetty-ee9-test-jmx pom EE9 :: Tests :: JMX diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jndi/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jndi/pom.xml index 33d25ed44256..02325db60f04 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jndi/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jndi/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-jndi jar EE9 :: Tests :: JNDI @@ -16,12 +16,6 @@ - - org.eclipse.jetty.ee9 - jetty-ee9-jndi - ${project.version} - test - org.eclipse.jetty.toolchain jetty-test-helper @@ -31,6 +25,12 @@ jakarta.mail test + + org.eclipse.jetty.ee9 + jetty-ee9-jndi + ${project.version} + test + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-loginservice/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-loginservice/pom.xml index 697c8c0708dd..7921d43e0e69 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-loginservice/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-loginservice/pom.xml @@ -9,68 +9,68 @@ jetty-ee9-test-loginservice EE9 :: Tests :: Login Service - false ${project.groupId}.loginservice + false org.eclipse.jetty - jetty-server + jetty-client - org.eclipse.jetty.ee9 - jetty-ee9-webapp + org.eclipse.jetty + jetty-jndi org.eclipse.jetty - jetty-client + jetty-server org.eclipse.jetty.ee9 - jetty-ee9-security + jetty-ee9-plus org.eclipse.jetty.ee9 - jetty-ee9-plus + jetty-ee9-security - org.eclipse.jetty - jetty-jndi + org.eclipse.jetty.ee9 + jetty-ee9-webapp - org.testcontainers - testcontainers + net.java.dev.jna + jna test - org.testcontainers - mariadb + org.eclipse.jetty.toolchain + jetty-test-helper test - net.java.dev.jna - jna + org.mariadb.jdbc + mariadb-java-client + ${mariadb.version} test - org.testcontainers - junit-jupiter + org.slf4j + slf4j-simple test - org.slf4j - slf4j-simple + org.testcontainers + junit-jupiter test - org.mariadb.jdbc - mariadb-java-client - ${mariadb.version} + org.testcontainers + mariadb test - org.eclipse.jetty.toolchain - jetty-test-helper + org.testcontainers + testcontainers test diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-openid-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-openid-webapp/pom.xml index 675c7a8fae1f..39e7f20af972 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-openid-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-openid-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-openid-webapp war diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/pom.xml index c09250d72424..97884e139fce 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/pom.xml @@ -1,41 +1,23 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-owb-cdi-webapp - EE9 :: Tests :: CDI OWB Demo WebApp war + EE9 :: Tests :: CDI OWB Demo WebApp ${project.groupId}.cdi.owb 2.0.27 - - jetty-ee9-test-owb-cdi-demo - - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - - - org.eclipse.jetty.ee9 - jetty-ee9-test-cdi-common-webapp - ${project.version} - war - runtime - - jakarta.annotation @@ -55,13 +37,31 @@ org.apache.openwebbeans - openwebbeans-web + openwebbeans-jetty9 ${openwebbeans.version} org.apache.openwebbeans - openwebbeans-jetty9 + openwebbeans-web ${openwebbeans.version} + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + + + org.eclipse.jetty.ee9 + jetty-ee9-test-cdi-common-webapp + ${project.version} + war + runtime + + + + jetty-ee9-test-owb-cdi-demo + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml index 8add51195b4f..5654ef8a7514 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - 4.0.0 jetty-ee9-test-quickstart EE9 :: Tests :: Quick Start Jetty Quick Start Test @@ -14,38 +14,43 @@ - org.eclipse.jetty.ee9 - jetty-ee9-quickstart + jakarta.transaction + jakarta.transaction-api test - org.eclipse.jetty.ee9 - jetty-ee9-webapp + org.eclipse.jetty + jetty-jmx test org.eclipse.jetty - jetty-jmx + jetty-slf4j-impl test org.eclipse.jetty.ee9 - jetty-ee9-plus + jetty-ee9-annotations test org.eclipse.jetty.ee9 - jetty-ee9-annotations + jetty-ee9-apache-jsp test - jakarta.transaction - jakarta.transaction-api + org.eclipse.jetty.ee9 + jetty-ee9-glassfish-jstl test - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-mock-resources + org.eclipse.jetty.ee9 + jetty-ee9-plus + test + + + org.eclipse.jetty.ee9 + jetty-ee9-quickstart test @@ -54,41 +59,41 @@ test - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jndi-webapp - war + org.eclipse.jetty.ee9 + jetty-ee9-webapp test org.eclipse.jetty.ee9.demos - jetty-ee9-demo-spec-webapp + jetty-ee9-demo-jetty-webapp war test org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jetty-webapp + jetty-ee9-demo-jndi-webapp war test - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-server + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-mock-resources test - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-spec-webapp + war test - org.eclipse.jetty.ee9 - jetty-ee9-apache-jsp + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-server test - org.eclipse.jetty.ee9 - jetty-ee9-glassfish-jstl + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-server test @@ -101,11 +106,6 @@ slf4j-api test - - org.eclipse.jetty - jetty-slf4j-impl - test - @@ -114,10 +114,10 @@ copy - process-test-classes copy + process-test-classes diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml index d1b04f26c92a..9391a5f021a8 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml @@ -13,9 +13,9 @@ - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - + org.eclipse.jetty + jetty-client + org.eclipse.jetty jetty-session @@ -25,23 +25,18 @@ jetty-ee9-webapp - org.eclipse.jetty - jetty-client - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test + org.eclipse.jetty.tests + jetty-test-session-common + + + org.hamcrest + hamcrest-core + + - org.eclipse.jetty - jetty-session - test-jar - test + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api org.eclipse.jetty.toolchain @@ -58,14 +53,25 @@ junit-jupiter-api compile + + org.slf4j + slf4j-api + org.awaitility awaitility test - org.eclipse.jetty.tests - jetty-test-session-common + org.eclipse.jetty + jetty-session + test-jar + test + + + org.eclipse.jetty + jetty-slf4j-impl + test diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-file/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-file/pom.xml index 7264097c87f0..7d6fea99c746 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-file/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-file/pom.xml @@ -14,23 +14,23 @@ org.eclipse.jetty - jetty-session + jetty-client test org.eclipse.jetty jetty-session - test-jar test - org.eclipse.jetty.ee9 - jetty-ee9-webapp + org.eclipse.jetty + jetty-session + test-jar test org.eclipse.jetty - jetty-client + jetty-slf4j-impl test @@ -39,18 +39,18 @@ test - org.slf4j - slf4j-api + org.eclipse.jetty.ee9 + jetty-ee9-webapp test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.toolchain + jetty-test-helper test - org.eclipse.jetty.toolchain - jetty-test-helper + org.slf4j + slf4j-api test diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-gcloud/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-gcloud/pom.xml index e5625745152e..ec5aae997950 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-gcloud/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-gcloud/pom.xml @@ -14,28 +14,28 @@ org.eclipse.jetty - jetty-session + jetty-client test org.eclipse.jetty jetty-session test - test-jar - org.eclipse.jetty.ee9 - jetty-ee9-webapp + org.eclipse.jetty + jetty-session + test-jar test - org.eclipse.jetty - jetty-client + org.eclipse.jetty.ee9 + jetty-ee9-test-sessions-common test org.eclipse.jetty.ee9 - jetty-ee9-test-sessions-common + jetty-ee9-webapp test @@ -44,18 +44,18 @@ test - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty.tests + jetty-test-session-common test - org.testcontainers - testcontainers + org.eclipse.jetty.toolchain + jetty-test-helper test - org.testcontainers - junit-jupiter + org.slf4j + slf4j-simple test @@ -64,13 +64,13 @@ test - org.slf4j - slf4j-simple + org.testcontainers + junit-jupiter test - org.eclipse.jetty.tests - jetty-test-session-common + org.testcontainers + testcontainers test diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-hazelcast/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-hazelcast/pom.xml index bc2a24678c3e..8e3190a4837b 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-hazelcast/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-hazelcast/pom.xml @@ -11,77 +11,61 @@ ${project.groupId}.sessions.hazelcast - - - - org.apache.maven.plugins - maven-surefire-plugin - - - --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED - --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED - --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED - - true - - com.hazelcast.logging.Slf4jFactory - - 45 - 240 - - - - + + com.hazelcast + hazelcast + org.eclipse.jetty - jetty-session + jetty-client test org.eclipse.jetty - jetty-session - test-jar + jetty-hazelcast test - org.eclipse.jetty.ee9 - jetty-ee9-webapp + org.eclipse.jetty + jetty-jmx test + true org.eclipse.jetty - jetty-client + jetty-session test - org.eclipse.jetty.ee9 - jetty-ee9-test-sessions-common + org.eclipse.jetty + jetty-session + test-jar test org.eclipse.jetty - jetty-hazelcast + jetty-slf4j-impl test - com.hazelcast - hazelcast + org.eclipse.jetty.ee9 + jetty-ee9-test-sessions-common + test - org.eclipse.jetty - jetty-jmx - true + org.eclipse.jetty.ee9 + jetty-ee9-webapp test - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty.tests + jetty-test-session-common test - org.slf4j - slf4j-api + org.eclipse.jetty.toolchain + jetty-test-helper test @@ -90,15 +74,29 @@ test - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.tests - jetty-test-session-common + org.slf4j + slf4j-api test + + + + org.apache.maven.plugins + maven-surefire-plugin + + --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED + --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED + true + + com.hazelcast.logging.Slf4jFactory + + 45 + 240 + + + + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml index e375be805704..2ae04752196a 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml @@ -14,91 +14,58 @@ infinispan/server - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*.java - - --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED - - ${infinispan.docker.image.version} - ${infinispan.docker.image.name} - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - generate-test-resources - - unpack - - - - - org.eclipse.jetty.toolchain - jetty-test-policy - ${jetty-test-policy.version} - jar - true - **/*.keystore,**/*.pem - ${jetty.test.policy.loc} - - - - - - - - - org.eclipse.jetty - jetty-session + com.google.code.gson + gson + ${gson.version} test org.eclipse.jetty - jetty-session - test-jar + jetty-client test - org.eclipse.jetty.ee9 - jetty-ee9-webapp + org.eclipse.jetty + jetty-infinispan-embedded-query test org.eclipse.jetty - jetty-client + jetty-infinispan-remote-query test - org.eclipse.jetty.ee9 - jetty-ee9-test-sessions-common + org.eclipse.jetty + jetty-jmx test + true org.eclipse.jetty - jetty-infinispan-remote-query + jetty-session test org.eclipse.jetty - jetty-infinispan-embedded-query + jetty-session + test-jar test - org.eclipse.jetty - jetty-jmx - true + org.eclipse.jetty.ee9 + jetty-ee9-test-sessions-common + test + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + test + + + org.eclipse.jetty.tests + jetty-test-session-common test @@ -106,6 +73,11 @@ jetty-test-helper test + + org.infinispan + infinispan-client-hotrod + test + org.infinispan infinispan-core @@ -122,11 +94,6 @@ infinispan-query test - - org.infinispan - infinispan-client-hotrod - test - org.infinispan infinispan-remote-query-client @@ -137,20 +104,14 @@ protostream test - - com.google.code.gson - gson - ${gson.version} - test - org.slf4j - slf4j-api + jul-to-slf4j test org.slf4j - jul-to-slf4j + slf4j-api test @@ -158,22 +119,61 @@ slf4j-simple test - - org.testcontainers - testcontainers - test - org.testcontainers junit-jupiter test - org.eclipse.jetty.tests - jetty-test-session-common + org.testcontainers + testcontainers test + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + + unpack + + generate-test-resources + + + + org.eclipse.jetty.toolchain + jetty-test-policy + ${jetty-test-policy.version} + jar + true + **/*.keystore,**/*.pem + ${jetty.test.policy.loc} + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*.java + + --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED + + ${infinispan.docker.image.version} + ${infinispan.docker.image.name} + + + + + jdk16 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-jdbc/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-jdbc/pom.xml index 1bd25f268a02..1d1c7109763f 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-jdbc/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-jdbc/pom.xml @@ -11,44 +11,31 @@ ${project.groupId}.sessions.jdbc - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${mariadb.docker.version} - - - - - org.eclipse.jetty - jetty-server + jetty-client test org.eclipse.jetty - jetty-session + jetty-server test org.eclipse.jetty jetty-session - test-jar test - org.eclipse.jetty.ee9 - jetty-ee9-webapp + org.eclipse.jetty + jetty-session + test-jar test org.eclipse.jetty - jetty-client + jetty-slf4j-impl test @@ -57,39 +44,52 @@ test - org.slf4j - slf4j-api + org.eclipse.jetty.ee9 + jetty-ee9-webapp test - org.testcontainers - testcontainers + org.eclipse.jetty.toolchain + jetty-test-helper test - org.eclipse.jetty - jetty-slf4j-impl + org.mariadb.jdbc + mariadb-java-client test - org.eclipse.jetty.toolchain - jetty-test-helper + org.slf4j + slf4j-api test org.testcontainers - mariadb + junit-jupiter test org.testcontainers - junit-jupiter + mariadb test - org.mariadb.jdbc - mariadb-java-client + org.testcontainers + testcontainers test + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${mariadb.docker.version} + + + + + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-memcached/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-memcached/pom.xml index 04de285071a3..a62ae5c6263f 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-memcached/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-memcached/pom.xml @@ -14,17 +14,17 @@ org.eclipse.jetty - jetty-session + jetty-client test - org.eclipse.jetty.ee9 - jetty-ee9-webapp + org.eclipse.jetty + jetty-session test org.eclipse.jetty - jetty-client + jetty-slf4j-impl test @@ -33,23 +33,23 @@ test - org.eclipse.jetty.memcached - jetty-memcached-sessions + org.eclipse.jetty.ee9 + jetty-ee9-webapp test - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty.memcached + jetty-memcached-sessions test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.tests + jetty-test-session-common test - org.testcontainers - testcontainers + org.eclipse.jetty.toolchain + jetty-test-helper test @@ -58,8 +58,8 @@ test - org.eclipse.jetty.tests - jetty-test-session-common + org.testcontainers + testcontainers test diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-mongodb/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-mongodb/pom.xml index 542530a1212b..181945c89212 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-mongodb/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-mongodb/pom.xml @@ -11,65 +11,52 @@ ${project.groupId}.sessions.mongo - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${mongo.docker.version} - - - - - org.eclipse.jetty - jetty-session + jetty-client test org.eclipse.jetty - jetty-session - test-jar + jetty-jmx test + true - org.eclipse.jetty.ee9 - jetty-ee9-webapp + org.eclipse.jetty + jetty-nosql test org.eclipse.jetty - jetty-client + jetty-session test - org.eclipse.jetty.ee9 - jetty-ee9-test-sessions-common + org.eclipse.jetty + jetty-session + test-jar test org.eclipse.jetty - jetty-nosql + jetty-slf4j-impl test - org.eclipse.jetty - jetty-jmx - true + org.eclipse.jetty.ee9 + jetty-ee9-test-sessions-common test - org.slf4j - slf4j-api + org.eclipse.jetty.ee9 + jetty-ee9-webapp test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.tests + jetty-test-session-common test @@ -78,29 +65,42 @@ test - org.testcontainers - testcontainers + org.slf4j + slf4j-api test - org.testcontainers - junit-jupiter + org.slf4j + slf4j-simple test org.testcontainers - mongodb + junit-jupiter test - org.slf4j - slf4j-simple + org.testcontainers + mongodb test - org.eclipse.jetty.tests - jetty-test-session-common + org.testcontainers + testcontainers test + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${mongo.docker.version} + + + + + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/pom.xml index ae6c46d3d6f7..330c82dc7f9e 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/pom.xml @@ -7,36 +7,36 @@ 12.0.3-SNAPSHOT jetty-ee9-test-sessions - EE9 :: Tests :: Sessions pom - - true - true - true - + EE9 :: Tests :: Sessions jetty-ee9-test-sessions-common jetty-ee9-test-sessions-file - jetty-ee9-test-sessions-jdbc - jetty-ee9-test-sessions-mongodb - jetty-ee9-test-sessions-infinispan jetty-ee9-test-sessions-gcloud - jetty-ee9-test-sessions-memcached jetty-ee9-test-sessions-hazelcast + jetty-ee9-test-sessions-infinispan + jetty-ee9-test-sessions-jdbc + jetty-ee9-test-sessions-memcached + jetty-ee9-test-sessions-mongodb + + true + true + true + - - org.eclipse.jetty.ee9 - jetty-ee9-test-sessions-common - ${project.version} - org.eclipse.jetty jetty-session ${project.version} test-jar + + org.eclipse.jetty.ee9 + jetty-ee9-test-sessions-common + ${project.version} + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-webapp-rfc2616/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-webapp-rfc2616/pom.xml index 74fdb2629b9c..8c0625669c2d 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-webapp-rfc2616/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-webapp-rfc2616/pom.xml @@ -7,12 +7,23 @@ 12.0.3-SNAPSHOT jetty-ee9-test-webapp-rfc2616 - EE9 :: Tests :: RFC2616 WebApp war + EE9 :: Tests :: RFC2616 WebApp ${project.groupId}.rfc2616 true + + + org.eclipse.jetty.ee9 + jetty-ee9-servlets + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + @@ -24,21 +35,10 @@ foo 1 - 222 + 222 - - - org.eclipse.jetty.ee9 - jetty-ee9-servlets - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-provided-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-provided-webapp/pom.xml index 4330a877f06c..e59484dd728e 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-provided-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-provided-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-websocket-client-provided-webapp war @@ -18,18 +18,18 @@ slf4j-simple - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client provided org.eclipse.jetty.toolchain - jetty-jakarta-websocket-api + jetty-jakarta-servlet-api provided - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client + org.eclipse.jetty.toolchain + jetty-jakarta-websocket-api provided diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-webapp/pom.xml index bc7a1bb6f70d..678cca75399f 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-webapp/pom.xml @@ -1,18 +1,22 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-websocket-client-webapp war EE9 :: Tests :: WebSocket Simple WebApp with WebSocketClient + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client + org.slf4j slf4j-simple @@ -27,9 +31,5 @@ jetty-jakarta-websocket-api provided - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client - diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-webapp/pom.xml index cdee008ecd55..d935f28bc283 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-websocket-webapp war @@ -21,11 +21,6 @@ org.slf4j slf4j-simple - - org.eclipse.jetty.toolchain - jetty-jakarta-websocket-api - provided - org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-common @@ -36,6 +31,11 @@ jetty-jakarta-servlet-api provided + + org.eclipse.jetty.toolchain + jetty-jakarta-websocket-api + provided + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-weld-cdi-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-weld-cdi-webapp/pom.xml index c6909aec6117..a47b7c5675c8 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-weld-cdi-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-weld-cdi-webapp/pom.xml @@ -1,32 +1,25 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-weld-cdi-webapp - EE9 :: Tests :: CDI Weld Demo WebApp war + EE9 :: Tests :: CDI Weld Demo WebApp ${project.groupId}.cdi.weld - - jetty-ee9-test-weld-cdi-demo - - - - org.eclipse.jetty.ee9 - jetty-ee9-test-cdi-common-webapp - ${project.version} - war - runtime + org.jboss.logging + jboss-logging + ${jboss.logging.version} @@ -35,10 +28,17 @@ weld-servlet-core ${weld.version} + - org.jboss.logging - jboss-logging - ${jboss.logging.version} + org.eclipse.jetty.ee9 + jetty-ee9-test-cdi-common-webapp + ${project.version} + war + runtime + + + jetty-ee9-test-weld-cdi-demo + diff --git a/jetty-ee9/jetty-ee9-tests/pom.xml b/jetty-ee9/jetty-ee9-tests/pom.xml index 17089fa3946e..11e5479914cc 100644 --- a/jetty-ee9/jetty-ee9-tests/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/pom.xml @@ -1,44 +1,44 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-tests - EE9 :: Tests pom - - - true - true - true - + EE9 :: Tests jetty-ee9-test-bad-websocket-webapp + jetty-ee9-test-badinit-webapp jetty-ee9-test-cdi - jetty-ee9-test-http2-webapp + jetty-ee9-test-cdi-common-webapp jetty-ee9-test-client-transports + jetty-ee9-test-felix-webapp + jetty-ee9-test-http2-webapp jetty-ee9-test-integration jetty-ee9-test-jmx jetty-ee9-test-jndi jetty-ee9-test-loginservice - jetty-ee9-test-quickstart - jetty-ee9-test-websocket-client-provided-webapp - jetty-ee9-test-websocket-client-webapp - jetty-ee9-test-websocket-webapp - jetty-ee9-test-cdi-common-webapp - jetty-ee9-test-felix-webapp jetty-ee9-test-openid-webapp jetty-ee9-test-owb-cdi-webapp + jetty-ee9-test-quickstart + jetty-ee9-test-sessions jetty-ee9-test-simple-session-webapp jetty-ee9-test-webapp-rfc2616 + jetty-ee9-test-websocket-client-provided-webapp + jetty-ee9-test-websocket-client-webapp + jetty-ee9-test-websocket-webapp jetty-ee9-test-weld-cdi-webapp - jetty-ee9-test-badinit-webapp - jetty-ee9-test-sessions + + true + true + true + + diff --git a/jetty-ee9/jetty-ee9-webapp/pom.xml b/jetty-ee9/jetty-ee9-webapp/pom.xml index db656d456637..c64dc3e5b8de 100644 --- a/jetty-ee9/jetty-ee9-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-webapp/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-webapp EE9 :: WebApp Jetty web application support @@ -15,15 +16,50 @@ org.eclipse.jetty.ee9.webapp.* + + + org.eclipse.jetty + jetty-xml + + + org.eclipse.jetty.ee9 + jetty-ee9-servlet + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + src/main/resources - src/main/config/etc org/eclipse/jetty/ee9/webapp false + src/main/config/etc webdefault-ee9.xml @@ -34,29 +70,38 @@ src/test/resources - src/test/webapp webapp + src/test/webapp - src/test/webapp-with-resources webapp-with-resources + src/test/webapp-with-resources - src/test/webapp-alt-jsp webapp-alt-jsp + src/test/webapp-alt-jsp + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration + + + org.apache.maven.plugins maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} + @{argLine} ${jetty.surefire.argLine} --add-exports org.eclipse.jetty.ee9.webapp/org.acme.webapp=org.eclipse.jetty.ee9.servlet - --add-exports org.eclipse.jetty.ee9.webapp/org.acme.webapp=org.eclipse.jetty.ee9.nested - + --add-exports org.eclipse.jetty.ee9.webapp/org.acme.webapp=org.eclipse.jetty.ee9.nested false ${project.build.testOutputDirectory}/mods/foo-bar-janb.jar @@ -66,56 +111,6 @@ - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration - - - - - - - - org.eclipse.jetty.ee9 - jetty-ee9-servlet - - - org.eclipse.jetty - jetty-xml - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-client - test - - diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/pom.xml index f30fa845b247..64cf8c3442b1 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/pom.xml @@ -1,13 +1,13 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.3-SNAPSHOT ../pom.xml - - 4.0.0 jetty-ee9-websocket-jakarta-client-webapp EE9 :: Websocket :: Jakarta Client Webapp @@ -35,15 +35,9 @@ jakarta.websocket.client WebApp Implementation - - org.eclipse.jetty.ee9.websocket.jakarta.client.webapp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer - + org.eclipse.jetty.ee9.websocket.jakarta.client.webapp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml index 5d1c24c25d32..be4f71998a77 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml @@ -1,13 +1,13 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.3-SNAPSHOT ../pom.xml - - 4.0.0 jetty-ee9-websocket-jakarta-client EE9 :: Websocket :: Jakarta Client @@ -17,39 +17,39 @@ - org.eclipse.jetty.toolchain - jetty-jakarta-websocket-api + org.eclipse.jetty + jetty-client org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-common + + org.eclipse.jetty.toolchain + jetty-jakarta-websocket-api + org.eclipse.jetty.websocket jetty-websocket-core-client org.eclipse.jetty - jetty-client - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api + jetty-jmx test org.eclipse.jetty - jetty-xml + jetty-slf4j-impl test org.eclipse.jetty - jetty-jmx + jetty-xml test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api test @@ -63,15 +63,9 @@ jakarta.websocket.client Implementation - - org.eclipse.jetty.ee9.websocket.jakarta.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=jakarta.websocket.ContainerProvider - + org.eclipse.jetty.ee9.websocket.jakarta.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=jakarta.websocket.ContainerProvider diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml index a6632f89b399..7973fc006e65 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml @@ -1,38 +1,20 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jakarta-common EE9 :: Websocket :: Jakarta Common - false ${project.groupId}.jakarta.common + false - - - - org.apache.felix - maven-bundle-plugin - true - - - jakarta.websocket.client Implementation - - org.eclipse.jetty.ee9.websocket.jakarta.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - - - - - org.eclipse.jetty.toolchain @@ -46,16 +28,32 @@ org.slf4j slf4j-api - - org.eclipse.jetty - jetty-slf4j-impl + org.awaitility + awaitility test + - org.awaitility - awaitility + org.eclipse.jetty + jetty-slf4j-impl test + + + + + org.apache.felix + maven-bundle-plugin + true + + + jakarta.websocket.client Implementation + org.eclipse.jetty.ee9.websocket.jakarta.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + + + + + diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/pom.xml index 3f37c774236e..6fe347a28f20 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jakarta-server EE9 :: Websocket :: Jakarta Server @@ -15,6 +15,10 @@ + + org.eclipse.jetty.ee9 + jetty-ee9-annotations + org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-client @@ -23,10 +27,6 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-servlet - - org.eclipse.jetty.ee9 - jetty-ee9-annotations - org.eclipse.jetty.toolchain jetty-jakarta-websocket-api @@ -44,14 +44,6 @@ - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.websocket.jakarta.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.jakarta.common=org.eclipse.jetty.websocket.jakarta.server - - - org.apache.felix maven-bundle-plugin @@ -59,16 +51,18 @@ jakarta.websocket.server Implementation - - org.eclipse.jetty.websocket.jakarta.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.jakarta.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=jakarta.websocket.server.ServerEndpointConfig$Configurator - + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=jakarta.websocket.server.ServerEndpointConfig$Configurator + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.websocket.jakarta.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.jakarta.common=org.eclipse.jetty.websocket.jakarta.server + + diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/pom.xml index 2350b4383b97..8090f8338bf9 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/pom.xml @@ -1,26 +1,26 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jakarta-tests EE9 :: Websocket :: Jakarta Tests - false ${project.groupId}.jakarta.tests + false true true - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-http-tools org.eclipse.jetty.ee9.websocket @@ -31,17 +31,20 @@ jetty-ee9-websocket-jakarta-server - org.eclipse.jetty - jetty-http-tools + org.eclipse.jetty.toolchain + jetty-jakarta-websocket-api org.eclipse.jetty.toolchain - jetty-jakarta-websocket-api + jetty-test-helper - org.eclipse.jetty - jetty-util-ajax - test + org.junit.jupiter + junit-jupiter + + + org.slf4j + slf4j-api org.eclipse.jetty @@ -49,12 +52,9 @@ test - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.junit.jupiter - junit-jupiter + org.eclipse.jetty + jetty-util-ajax + test @@ -67,9 +67,7 @@ jakarta.websocket Integration Tests - - org.eclipse.jetty.websocket.jakarta.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.jakarta.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-api/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-api/pom.xml index 725a278473fe..579d638a0397 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-api/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-api/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jetty-api EE9 :: Websocket :: Jetty API diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml index 410b53ae5855..ff79ecab2f83 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jetty-client-webapp EE9 :: Websocket :: Jetty Client WebApp @@ -14,6 +14,17 @@ ${project.groupId}.client.webapp + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client + + + @@ -22,27 +33,12 @@ true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - - - diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml index 1107e2920b6e..b1b6a7e566d2 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jetty-client EE9 :: Websocket :: Jetty Client @@ -15,6 +15,10 @@ + + org.eclipse.jetty + jetty-client + org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jetty-api @@ -27,22 +31,18 @@ org.eclipse.jetty.websocket jetty-websocket-core-client - - org.eclipse.jetty - jetty-client - org.slf4j slf4j-api - org.eclipse.jetty.ee9 - jetty-ee9-webapp + org.eclipse.jetty + jetty-slf4j-impl test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.ee9 + jetty-ee9-webapp test diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml index e09ce502980b..b0206232dc28 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml @@ -1,46 +1,18 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jetty-common EE9 :: Websocket :: Jetty Common ${project.groupId}.common - - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee9.websocket.jetty.common=org.eclipse.jetty.io - - - - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.websocket.api.ExtensionConfig$Parser - - - - - - org.eclipse.jetty.ee9.websocket @@ -56,4 +28,26 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.websocket.api.ExtensionConfig$Parser + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee9.websocket.jetty.common=org.eclipse.jetty.io + + + + diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/pom.xml index a0b7d56be02b..3f92c27242df 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jetty-server EE9 :: Websocket :: Jetty Server @@ -15,6 +15,19 @@ + + org.eclipse.jetty + jetty-jmx + true + + + org.eclipse.jetty.ee9 + jetty-ee9-servlet + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jetty-api @@ -31,19 +44,6 @@ org.eclipse.jetty.toolchain jetty-jakarta-servlet-api - - org.eclipse.jetty.ee9 - jetty-ee9-servlet - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - - - org.eclipse.jetty - jetty-jmx - true - org.slf4j slf4j-api @@ -64,13 +64,9 @@ Jetty Websocket Server - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration, - osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration, + osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml index 767fbd35505d..91b8c84a0d1e 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jetty-tests EE9 :: Websocket :: Jetty Tests @@ -18,63 +18,63 @@ - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-alpn-java-server test - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-api + org.eclipse.jetty + jetty-alpn-server test - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client-webapp + org.eclipse.jetty + jetty-http-tools test - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server + org.eclipse.jetty + jetty-jmx test org.eclipse.jetty - jetty-http-tools + jetty-slf4j-impl test - org.eclipse.jetty.http2 - jetty-http2-server + org.eclipse.jetty.ee9 + jetty-ee9-annotations test - org.eclipse.jetty - jetty-alpn-server + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-api test - org.eclipse.jetty - jetty-alpn-java-server + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client-webapp test - org.eclipse.jetty.http2 - jetty-http2-client-transport + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-server test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.http2 + jetty-http2-client-transport test - org.eclipse.jetty - jetty-jmx + org.eclipse.jetty.http2 + jetty-http2-server test - org.eclipse.jetty.ee9 - jetty-ee9-annotations + org.slf4j + slf4j-api test @@ -88,13 +88,10 @@ jetty.websocket Integration Tests - - org.eclipse.jetty.websocket.jetty.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.jetty.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml index 7305bf4d1e9c..616602548edb 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-servlet EE9 :: Websocket :: Servlet @@ -15,14 +15,14 @@ - - org.eclipse.jetty.websocket - jetty-websocket-core-server - org.eclipse.jetty.ee9 jetty-ee9-servlet + + org.eclipse.jetty.websocket + jetty-websocket-core-server + org.slf4j slf4j-api diff --git a/jetty-ee9/jetty-ee9-websocket/pom.xml b/jetty-ee9/jetty-ee9-websocket/pom.xml index b42b32bfc004..38a5ad08a783 100644 --- a/jetty-ee9/jetty-ee9-websocket/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/pom.xml @@ -1,34 +1,34 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT ../pom.xml - - 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - EE9 :: Websocket pom - - - true - + EE9 :: Websocket - jetty-ee9-websocket-jakarta-common jetty-ee9-websocket-jakarta-client jetty-ee9-websocket-jakarta-client-webapp + jetty-ee9-websocket-jakarta-common jetty-ee9-websocket-jakarta-server jetty-ee9-websocket-jakarta-tests jetty-ee9-websocket-jetty-api - jetty-ee9-websocket-jetty-common jetty-ee9-websocket-jetty-client jetty-ee9-websocket-jetty-client-webapp + jetty-ee9-websocket-jetty-common jetty-ee9-websocket-jetty-server jetty-ee9-websocket-jetty-tests jetty-ee9-websocket-servlet + + + true + diff --git a/jetty-ee9/pom.xml b/jetty-ee9/pom.xml index 5795a4baf99a..f4698eb4d277 100644 --- a/jetty-ee9/pom.xml +++ b/jetty-ee9/pom.xml @@ -1,24 +1,46 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 - EE9 pom + EE9 - - - 5.0.2 + + jetty-ee9-annotations + jetty-ee9-apache-jsp + jetty-ee9-bom + jetty-ee9-cdi + jetty-ee9-demos + jetty-ee9-fcgi-proxy + jetty-ee9-glassfish-jstl + jetty-ee9-home + jetty-ee9-jaspi + jetty-ee9-jndi + jetty-ee9-jspc-maven-plugin + jetty-ee9-maven-plugin + jetty-ee9-nested + jetty-ee9-openid + jetty-ee9-osgi + jetty-ee9-plus + jetty-ee9-proxy + jetty-ee9-quickstart + jetty-ee9-runner + jetty-ee9-security + jetty-ee9-servlet + jetty-ee9-servlets + jetty-ee9-tests + jetty-ee9-webapp + jetty-ee9-websocket + - - 1.1.0.v201105071233 - 1.4.1.v201005082020 + 2.0.1 2.0.0 @@ -28,54 +50,128 @@ 2.0.1 2.0.1 2.0.1 - 2.0.1 5.0.0 3.0.0 2.0.0 - 2.0.0 + 2.0.0 + 2.0.1 + 2.0.0 + 3.0.0 3.0.1 3.0.2 - 3.0.1 3.0.2 - 2.0.0 + 3.0.1 + + + 1.1.0.v201105071233 + 1.4.1.v201005082020 + + 5.0.2 10.0.14 - 4.0.3.Final true + 4.0.3.Final - - jetty-ee9-nested - jetty-ee9-security - jetty-ee9-servlet - jetty-ee9-webapp - jetty-ee9-servlets - jetty-ee9-demos - jetty-ee9-apache-jsp - jetty-ee9-glassfish-jstl - jetty-ee9-annotations - jetty-ee9-cdi - jetty-ee9-jaspi - jetty-ee9-jndi - jetty-ee9-jspc-maven-plugin - jetty-ee9-maven-plugin - jetty-ee9-openid - jetty-ee9-osgi - jetty-ee9-plus - jetty-ee9-proxy - jetty-ee9-quickstart - jetty-ee9-runner - jetty-ee9-websocket - jetty-ee9-tests - jetty-ee9-bom - jetty-ee9-home - jetty-ee9-fcgi-proxy - - + + com.sun.mail + jakarta.mail + ${jakarta.mail.api.version} + + + com.sun.xml.ws + jaxws-rt + ${jakarta.xml.jaxws.impl.version} + + + jakarta.activation + jakarta.activation-api + ${jakarta.activation.api.version} + + + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation.api.version} + + + jakarta.authentication + jakarta.authentication-api + ${jakarta.authentication.api.version} + + + jakarta.el + jakarta.el-api + ${jakarta.el.api.version} + + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${jakarta.enterprise.cdi.api.version} + + + jakarta.inject + jakarta.inject-api + ${jakarta.inject.api.version} + + + jakarta.interceptor + jakarta.interceptor-api + ${jakarta.interceptor.api.version} + + + jakarta.mail + jakarta.mail-api + ${jakarta.mail.api.version} + + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.api.version} + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + ${jakarta.servlet.jsp.api.version} + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + ${jakarta.servlet.jsp.jstl.api.version} + + + jakarta.el + jakarta.el-api + + + jakarta.servlet + jakarta.servlet-api + + + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs.api.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind.api.version} + + + jakarta.xml.ws + jakarta.xml.ws-api + ${jakarta.xml.ws.api.version} + @@ -103,11 +199,6 @@ jetty-ee9-glassfish-jstl ${project.version} - - org.eclipse.jetty.ee9 - jetty-ee9-nested - ${project.version} - org.eclipse.jetty.ee9 jetty-ee9-jaspi @@ -128,6 +219,11 @@ jetty-ee9-maven-plugin ${project.version} + + org.eclipse.jetty.ee9 + jetty-ee9-nested + ${project.version} + org.eclipse.jetty.ee9 jetty-ee9-openid @@ -168,56 +264,6 @@ jetty-ee9-webapp ${project.version} - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-client - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-client-webapp - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-common - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-server - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-api - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client-webapp - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-common - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-servlet - ${project.version} - org.eclipse.jetty.ee9.demos jetty-ee9-demo-async-rest-jar @@ -270,13 +316,13 @@ org.eclipse.jetty.ee9.demos - jetty-ee9-demo-spec-webapp + jetty-ee9-demo-simple-webapp ${project.version} war org.eclipse.jetty.ee9.demos - jetty-ee9-demo-simple-webapp + jetty-ee9-demo-spec-webapp ${project.version} war @@ -285,116 +331,65 @@ jetty-ee9-demo-web-fragment ${project.version} - - - org.mortbay.jasper - apache-jsp - ${jsp.impl.version} - - - org.mortbay.jasper - apache-el - ${jsp.impl.version} - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - ${jetty.servlet.api.version} - - - com.sun.xml.ws - jaxws-rt - ${jakarta.xml.jaxws.impl.version} - - - com.sun.mail - jakarta.mail - ${jakarta.mail.api.version} - - - jakarta.el - jakarta.el-api - ${jakarta.el.api.version} - - - jakarta.enterprise - jakarta.enterprise.cdi-api - ${jakarta.enterprise.cdi.api.version} - - jakarta.activation - jakarta.activation-api - ${jakarta.activation.api.version} - - - jakarta.annotation - jakarta.annotation-api - ${jakarta.annotation.api.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-client + ${project.version} - jakarta.authentication - jakarta.authentication-api - ${jakarta.authentication.api.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-client-webapp + ${project.version} - jakarta.interceptor - jakarta.interceptor-api - ${jakarta.interceptor.api.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-common + ${project.version} - jakarta.inject - jakarta.inject-api - ${jakarta.inject.api.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-server + ${project.version} - jakarta.mail - jakarta.mail-api - ${jakarta.mail.api.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-api + ${project.version} - jakarta.servlet - jakarta.servlet-api - ${jakarta.servlet.api.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client + ${project.version} - jakarta.servlet.jsp - jakarta.servlet.jsp-api - ${jakarta.servlet.jsp.api.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client-webapp + ${project.version} - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - ${jakarta.servlet.jsp.jstl.api.version} - - - jakarta.servlet - jakarta.servlet-api - - - jakarta.el - jakarta.el-api - - + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-common + ${project.version} - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-server + ${project.version} - jakarta.ws.rs - jakarta.ws.rs-api - ${jakarta.ws.rs.api.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-servlet + ${project.version} - jakarta.xml.bind - jakarta.xml.bind-api - ${jakarta.xml.bind.api.version} + org.eclipse.jetty.orbit + javax.activation + ${javax.activation.impl.version} - jakarta.xml.ws - jakarta.xml.ws-api - ${jakarta.xml.ws.api.version} + org.eclipse.jetty.orbit + javax.mail.glassfish + ${javax.mail.glassfish.version} org.eclipse.jetty.orbit @@ -411,6 +406,11 @@ + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + ${jetty.servlet.api.version} + org.eclipse.jetty.toolchain jetty-jakarta-websocket-api @@ -427,14 +427,15 @@ ${jakarta.servlet.jsp.jstl.impl.version} - org.eclipse.jetty.orbit - javax.mail.glassfish - ${javax.mail.glassfish.version} + org.mortbay.jasper + apache-el + ${jsp.impl.version} + - org.eclipse.jetty.orbit - javax.activation - ${javax.activation.impl.version} + org.mortbay.jasper + apache-jsp + ${jsp.impl.version} @@ -454,10 +455,10 @@ ee9-report - validate dependency-updates-aggregate-report + validate html diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 450eea5b8dd5..97e1c28f2ad4 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -1,50 +1,285 @@ + 4.0.0 - jetty-project org.eclipse.jetty + jetty-project 12.0.3-SNAPSHOT ../pom.xml - 4.0.0 jetty-home - Home pom + Home ${basedir}/target/jetty-home - ${basedir}/target/jetty-home-sources 2.0.2 + ${basedir}/target/jetty-home-sources true + + + org.eclipse.jetty + jetty-alpn-conscrypt-server + + + org.eclipse.jetty + jetty-alpn-java-server + + + org.eclipse.jetty + jetty-alpn-server + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-deploy + + + org.eclipse.jetty + jetty-hazelcast + true + + + + org.eclipse.jetty + jetty-infinispan-embedded + ${project.version} + pom + true + + + org.eclipse.jetty + jetty-infinispan-embedded-query + true + + + org.eclipse.jetty + jetty-infinispan-remote + ${project.version} + pom + true + + + org.wildfly.common + * + + + + + org.eclipse.jetty + jetty-infinispan-remote-query + + + org.eclipse.jetty + jetty-jmx + + + org.eclipse.jetty + jetty-keystore + true + + + org.eclipse.jetty + jetty-nosql + true + + + org.eclipse.jetty + jetty-openid + + + org.eclipse.jetty + jetty-rewrite + + + org.eclipse.jetty + jetty-security + + + org.eclipse.jetty + jetty-start + ${project.version} + shaded + + + org.eclipse.jetty + jetty-unixdomain-server + true + + + org.eclipse.jetty + jetty-util-ajax + + + org.eclipse.jetty.demos + jetty-demo-handler + ${project.version} + true + + + org.eclipse.jetty.ee10 + jetty-ee10-home + ${project.version} + zip + + + org.eclipse.jetty.ee8 + jetty-ee8-home + ${project.version} + zip + + + org.eclipse.jetty.ee9 + jetty-ee9-home + ${project.version} + zip + + + org.eclipse.jetty.fcgi + jetty-fcgi-proxy + true + + + org.eclipse.jetty.fcgi + jetty-fcgi-server + true + + + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager + true + + + org.eclipse.jetty.http2 + jetty-http2-server + + + org.eclipse.jetty.http3 + jetty-http3-server + + + org.eclipse.jetty.memcached + jetty-memcached-sessions + true + + + org.eclipse.jetty.toolchain.setuid + jetty-setuid-jna + ${jetty-setuid-version} + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-server + + + org.jboss.logging + jboss-logging + true + + + + + + + + + + + + + + + + + + + + org.ow2.asm + asm + + + org.ow2.asm + asm-analysis + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-tree + + + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.apache.maven.plugins - maven-resources-plugin + maven-antrun-plugin - copy-base-assembly-tree - generate-resources + set jetty.sh - copy-resources + run + process-resources - false - true - ${assembly-directory} - UTF-8 - false - - @ - - - - ${basedir}/src/main/resources - true - - + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + posix + false + + + + binary + + single + + package + + 0 + 0 + + src/main/assembly/jetty-assembly.xml + + + + + sources + + single + + package + + + src/main/assembly/jetty-source-assembly.xml + + true @@ -55,10 +290,10 @@ copy - generate-resources copy + generate-resources @@ -87,74 +322,64 @@ copy-jetty-core-deps - generate-resources copy-dependencies + generate-resources org.eclipse.jetty - - org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.websocket,org.eclipse.jetty.ee8.websocket,org.eclipse.jetty.ee9.websocket,org.eclipse.jetty.ee10.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs - - - jetty-ee8-apache-jsp,jetty-ee9-apache-jsp,jetty-ee10-apache-jsp,jetty-ee8-glassfish-jstl,jetty-ee9-glassfish-jstl,jetty-ee10-glassfish-jstl,jetty-start,jetty-slf4j-impl,javadoc - + org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.websocket,org.eclipse.jetty.ee8.websocket,org.eclipse.jetty.ee9.websocket,org.eclipse.jetty.ee10.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs + jetty-ee8-apache-jsp,jetty-ee9-apache-jsp,jetty-ee10-apache-jsp,jetty-ee8-glassfish-jstl,jetty-ee9-glassfish-jstl,jetty-ee10-glassfish-jstl,jetty-start,jetty-slf4j-impl,javadoc jar ${assembly-directory}/lib copy-jetty-core-src-deps - generate-resources copy-dependencies + generate-resources org.eclipse.jetty - - org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs - - - jetty-ee8-apache-jsp,jetty-ee8-glassfish-jstl,jetty-ee9-apache-jsp,jetty-ee9-glassfish-jstl,jetty-ee10-apache-jsp,jetty-ee10-glassfish-jtl,jetty-start - + org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs + jetty-ee8-apache-jsp,jetty-ee8-glassfish-jstl,jetty-ee9-apache-jsp,jetty-ee9-glassfish-jstl,jetty-ee10-apache-jsp,jetty-ee10-glassfish-jtl,jetty-start jar sources ${source-assembly-directory}/lib - copy-lib-logging-deps - generate-resources + copy-lib-fcgi-deps copy-dependencies + generate-resources - org.eclipse.jetty,org.slf4j - jetty-slf4j-impl,slf4j-api + org.eclipse.jetty.fcgi jar - ${assembly-directory}/lib/logging + ${assembly-directory}/lib/fcgi - copy-lib-logging-src-deps - generate-resources + copy-lib-fcgi-src-deps copy-dependencies + generate-resources - org.eclipse.jetty,org.slf4j - jetty-slf4j-impl,slf4j-api + org.eclipse.jetty.fcgi jar sources - ${source-assembly-directory}/lib/logging + ${source-assembly-directory}/lib/fcgi copy-lib-http2-deps - generate-resources copy-dependencies + generate-resources org.eclipse.jetty.http2 jetty-http2-hpack,jetty-http2-common,jetty-http2-server @@ -164,10 +389,10 @@ copy-lib-http2-src-deps - generate-resources copy-dependencies + generate-resources org.eclipse.jetty.http2 jetty-http2-hpack,jetty-http2-common,jetty-http2-server @@ -178,10 +403,10 @@ copy-lib-http3-deps - generate-resources copy-dependencies + generate-resources org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.quiche jetty-http3-server,jetty-http3-common,jetty-http3-qpack,jetty-quic-server,jetty-quic-common,jetty-quic-quiche-common,jetty-quic-quiche-jna,jetty-quic-quiche-foreign-incubator,jetty-quiche-native @@ -191,10 +416,10 @@ copy-lib-http3-src-deps - generate-resources copy-dependencies + generate-resources org.eclipse.jetty.http3 jetty-http3-server @@ -204,36 +429,54 @@ - copy-lib-fcgi-deps - generate-resources + copy-lib-logging-deps copy-dependencies + generate-resources - org.eclipse.jetty.fcgi + org.eclipse.jetty,org.slf4j + jetty-slf4j-impl,slf4j-api jar - ${assembly-directory}/lib/fcgi + ${assembly-directory}/lib/logging - copy-lib-fcgi-src-deps - generate-resources + copy-lib-logging-src-deps copy-dependencies + generate-resources - org.eclipse.jetty.fcgi + org.eclipse.jetty,org.slf4j + jetty-slf4j-impl,slf4j-api jar sources - ${source-assembly-directory}/lib/fcgi + ${source-assembly-directory}/lib/logging - unpack-eeX-home + unpack-config-deps + + unpack-dependencies + generate-resources + + + org.eclipse.jetty, org.eclipse.jetty.websocket, org.eclipse.jetty.toolchain.setuid + jetty-infinispan-embedded,jetty-infinispan-remote,jetty-test-helper,alpn-api,javax.security.auth.message,javax.activation + config + false + META-INF/**,webapps/**,start.d/**,start.ini + ${assembly-directory} + + + + unpack-eeX-home unpack + generate-resources @@ -258,104 +501,31 @@ ${assembly-directory} - - unpack-config-deps - generate-resources - - unpack-dependencies - - - - - org.eclipse.jetty, org.eclipse.jetty.websocket, org.eclipse.jetty.toolchain.setuid - - jetty-infinispan-embedded,jetty-infinispan-remote,jetty-test-helper,alpn-api,javax.security.auth.message,javax.activation - config - false - META-INF/**,webapps/**,start.d/**,start.ini - ${assembly-directory} - - unpack-infinispan-config - generate-resources unpack + generate-resources - - - org.eclipse.jetty - jetty-infinispan-embedded - ${project.version} - config - jar - - - org.eclipse.jetty - jetty-infinispan-remote - ${project.version} - config - jar - - - META-INF/** - ${assembly-directory} - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - set jetty.sh - process-resources - - run - - - - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - posix - false - - - - binary - package - - single - - - 0 - 0 - - src/main/assembly/jetty-assembly.xml - - - - - sources - package - - single - - - - src/main/assembly/jetty-source-assembly.xml - - true + + + org.eclipse.jetty + jetty-infinispan-embedded + ${project.version} + config + jar + + + org.eclipse.jetty + jetty-infinispan-remote + ${project.version} + config + jar + + + META-INF/** + ${assembly-directory} @@ -398,215 +568,35 @@ + + org.apache.maven.plugins + maven-resources-plugin + + + copy-base-assembly-tree + + copy-resources + + generate-resources + + false + true + ${assembly-directory} + UTF-8 + false + + @ + + + + ${basedir}/src/main/resources + true + + + + + + - - - - - - - - - - - - - - - - - - - - - org.ow2.asm - asm - - - org.ow2.asm - asm-commons - - - org.ow2.asm - asm-tree - - - org.ow2.asm - asm-analysis - - - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-deploy - - - org.eclipse.jetty - jetty-security - - - org.eclipse.jetty - jetty-openid - - - org.eclipse.jetty - jetty-util-ajax - - - org.eclipse.jetty - jetty-jmx - - - org.eclipse.jetty - jetty-start - shaded - ${project.version} - - - org.eclipse.jetty.ee10 - jetty-ee10-home - ${project.version} - zip - - - org.eclipse.jetty.ee9 - jetty-ee9-home - ${project.version} - zip - - - org.eclipse.jetty.ee8 - jetty-ee8-home - ${project.version} - zip - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty - jetty-unixdomain-server - true - - - org.eclipse.jetty.fcgi - jetty-fcgi-proxy - true - - - org.eclipse.jetty.fcgi - jetty-fcgi-server - true - - - org.jboss.logging - jboss-logging - true - - - org.eclipse.jetty - jetty-rewrite - - - org.eclipse.jetty.http2 - jetty-http2-server - - - org.eclipse.jetty.http3 - jetty-http3-server - - - org.eclipse.jetty - jetty-alpn-server - - - org.eclipse.jetty - jetty-alpn-java-server - - - org.eclipse.jetty - jetty-alpn-conscrypt-server - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-server - - - - org.eclipse.jetty - jetty-infinispan-embedded - ${project.version} - pom - true - - - org.eclipse.jetty - jetty-infinispan-embedded-query - true - - - org.eclipse.jetty - jetty-infinispan-remote - ${project.version} - pom - true - - - org.wildfly.common - * - - - - - org.eclipse.jetty - jetty-infinispan-remote-query - - - org.eclipse.jetty - jetty-hazelcast - true - - - org.eclipse.jetty.gcloud - jetty-gcloud-session-manager - true - - - org.eclipse.jetty.memcached - jetty-memcached-sessions - true - - - org.eclipse.jetty - jetty-nosql - true - - - org.eclipse.jetty.demos - jetty-demo-handler - ${project.version} - true - - - org.eclipse.jetty - jetty-keystore - true - - - org.eclipse.jetty.toolchain.setuid - jetty-setuid-jna - ${jetty-setuid-version} - - diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index 6e4c3a4bddd1..8bb35a1e6669 100644 --- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.gcloud jetty-gcloud 12.0.3-SNAPSHOT - - 4.0.0 jetty-gcloud-session-manager Integrations :: GCloud :: Sessions @@ -15,14 +15,6 @@ - - org.eclipse.jetty - jetty-session - - - org.slf4j - slf4j-api - com.google.cloud google-cloud-datastore @@ -30,11 +22,11 @@ jakarta.servlet - servlet-api + jakarta.servlet-api jakarta.servlet - jakarta.servlet-api + servlet-api javax.annotation @@ -47,6 +39,14 @@ protobuf-java 3.22.2 + + org.eclipse.jetty + jetty-session + + + org.slf4j + slf4j-api + @@ -57,67 +57,65 @@ true - - org.eclipse.jetty.gcloud.session.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.gcloud.session.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - org.apache.maven.plugins - maven-dependency-plugin - - - build-deps-file - generate-resources - - list - - - false - ${project.build.directory}/deps.txt - true - org.eclipse.jetty,jakarta.servlet - true - runtime - - - - org.apache.maven.plugins maven-antrun-plugin process-deps - process-resources run + process-resources - - + + process-mod - process-resources run + process-resources - - + + + + org.apache.maven.plugins + maven-dependency-plugin + + + build-deps-file + + list + + generate-resources + + false + ${project.build.directory}/deps.txt + true + org.eclipse.jetty,jakarta.servlet + true + runtime + + + + diff --git a/jetty-integrations/jetty-gcloud/pom.xml b/jetty-integrations/jetty-gcloud/pom.xml index d911da0ea49d..1a6093d04316 100644 --- a/jetty-integrations/jetty-gcloud/pom.xml +++ b/jetty-integrations/jetty-gcloud/pom.xml @@ -1,23 +1,23 @@ + + 4.0.0 org.eclipse.jetty jetty-integrations 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.gcloud jetty-gcloud pom Integrations :: GCloud - - 2.11.4 - - jetty-gcloud-session-manager + + 2.11.4 + + diff --git a/jetty-integrations/jetty-hazelcast/pom.xml b/jetty-integrations/jetty-hazelcast/pom.xml index 8330db1983c9..00d71e07bd2f 100644 --- a/jetty-integrations/jetty-hazelcast/pom.xml +++ b/jetty-integrations/jetty-hazelcast/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-integrations 12.0.3-SNAPSHOT - - 4.0.0 jetty-hazelcast Integrations :: Hazelcast :: Sessions @@ -36,10 +36,10 @@ maven-assembly-plugin - package single + package config diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml index 02f46aff0b38..398be6502156 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml @@ -1,39 +1,21 @@ + + 4.0.0 org.eclipse.jetty jetty-infinispan 12.0.3-SNAPSHOT - 4.0.0 jetty-infinispan-common Integrations :: Infinispan :: Sessions ${project.groupId}.infinispan.common - - - install - - - org.apache.maven.plugins - maven-assembly-plugin - - - package - - single - - - - config - - - - - - - + + org.eclipse.jetty + jetty-session + org.infinispan infinispan-core @@ -45,25 +27,10 @@ - - org.infinispan.protostream - protostream - true - provided - - - org.eclipse.jetty - jetty-session - org.slf4j slf4j-api - - org.eclipse.jetty - jetty-slf4j-impl - test - org.infinispan infinispan-client-hotrod @@ -74,5 +41,39 @@ infinispan-remote-query-client provided + + org.infinispan.protostream + protostream + provided + true + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + + install + + + org.apache.maven.plugins + maven-assembly-plugin + + + + single + + package + + + config + + + + + + + diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml index 9fe2b9c3fdbf..21d06fe2e7f5 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml @@ -1,103 +1,104 @@ + + 4.0.0 org.eclipse.jetty jetty-infinispan 12.0.3-SNAPSHOT - 4.0.0 jetty-infinispan-embedded-query Integrations :: Infinispan :: Embedded with Querying ${project.groupId}.infinispan.embedded.query + + + org.eclipse.jetty + jetty-infinispan-common + + + org.infinispan + infinispan-commons + + + org.infinispan + infinispan-core + + + + + org.infinispan + infinispan-query + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + install - - org.apache.maven.plugins - maven-dependency-plugin - - - build-deps-file - generate-resources - - list - - - false - ${project.build.directory}/deps.txt - true - org.eclipse.jetty,jakarta.servlet,org.slf4j - true - runtime - - - - org.apache.maven.plugins maven-antrun-plugin process-deps - process-resources run + process-resources - - + + process-mod - process-resources run + process-resources - - + + + + org.apache.maven.plugins + maven-dependency-plugin + + + build-deps-file + + list + + generate-resources + + false + ${project.build.directory}/deps.txt + true + org.eclipse.jetty,jakarta.servlet,org.slf4j + true + runtime + + + + - - - org.eclipse.jetty - jetty-infinispan-common - - - org.infinispan - infinispan-core - - - org.infinispan - infinispan-commons - - - - - org.infinispan - infinispan-query - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml index 9ab9ec7086c8..ade768d1adac 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml @@ -1,91 +1,92 @@ + + 4.0.0 org.eclipse.jetty jetty-infinispan 12.0.3-SNAPSHOT - 4.0.0 jetty-infinispan-embedded pom Integrations :: Infinispan :: Embedded ${project.groupId}.infinispan.embedded + + + org.eclipse.jetty + jetty-infinispan-common + + + org.infinispan + infinispan-core + + + org.wildfly.common + wildfly-common + + + + install - - org.apache.maven.plugins - maven-dependency-plugin - - - build-deps-file - generate-resources - - list - - - false - ${project.build.directory}/deps.txt - true - org.eclipse.jetty,jakarta.servlet,org.slf4j - true - runtime - - - - org.apache.maven.plugins maven-antrun-plugin process-deps - process-resources run + process-resources - - + + process-mod - process-resources run + process-resources - - + + + + org.apache.maven.plugins + maven-dependency-plugin + + + build-deps-file + + list + + generate-resources + + false + ${project.build.directory}/deps.txt + true + org.eclipse.jetty,jakarta.servlet,org.slf4j + true + runtime + + + + - - - org.eclipse.jetty - jetty-infinispan-common - - - org.infinispan - infinispan-core - - - org.wildfly.common - wildfly-common - - - - diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml index 0f4b361f2f2c..8d0c7f549111 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml @@ -1,73 +1,121 @@ + + 4.0.0 org.eclipse.jetty jetty-infinispan 12.0.3-SNAPSHOT - 4.0.0 jetty-infinispan-remote-query Integrations :: Infinispan :: Remote with Querying ${project.groupId}.infinispan.remote.query + + + com.google.code.gson + gson + + + org.eclipse.jetty + jetty-infinispan-common + + + org.infinispan + infinispan-commons + + + org.infinispan + infinispan-core + + + + + org.infinispan + infinispan-client-hotrod + + + org.infinispan + infinispan-query + + + org.infinispan + infinispan-remote-query-client + + + org.slf4j + slf4j-simple + test + + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + testcontainers + test + + - - org.apache.maven.plugins - maven-dependency-plugin - - - build-deps-file - generate-resources - - list - - - false - ${project.build.directory}/deps.txt - true - org.eclipse.jetty,jakarta.servlet - true - runtime - - - - org.apache.maven.plugins maven-antrun-plugin process-deps - process-resources run + process-resources - - - + + + process-mod - process-resources run + process-resources - - + + + + org.apache.maven.plugins + maven-dependency-plugin + + + build-deps-file + + list + + generate-resources + + false + ${project.build.directory}/deps.txt + true + org.eclipse.jetty,jakarta.servlet + true + runtime + + + + org.apache.maven.plugins maven-surefire-plugin @@ -79,51 +127,4 @@ - - - org.eclipse.jetty - jetty-infinispan-common - - - org.infinispan - infinispan-core - - - org.infinispan - infinispan-commons - - - - - org.infinispan - infinispan-query - - - org.infinispan - infinispan-client-hotrod - - - org.infinispan - infinispan-remote-query-client - - - com.google.code.gson - gson - - - org.slf4j - slf4j-simple - test - - - org.testcontainers - testcontainers - test - - - org.testcontainers - junit-jupiter - test - - diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml index a79af41fa1b5..e2000faa4539 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml @@ -1,96 +1,97 @@ + + 4.0.0 org.eclipse.jetty jetty-infinispan 12.0.3-SNAPSHOT - 4.0.0 jetty-infinispan-remote pom Integrations :: Infinispan :: Remote ${project.groupId}.infinispan.remote + + + org.eclipse.jetty + jetty-infinispan-common + + + org.infinispan + infinispan-client-hotrod + provided + + + org.infinispan + infinispan-remote-query-client + provided + + + org.infinispan.protostream + protostream + provided + + install - - org.apache.maven.plugins - maven-dependency-plugin - - - build-deps-file - generate-resources - - list - - - false - ${project.build.directory}/deps.txt - true - org.eclipse.jetty,jakarta.servlet - true - provided - - - - org.apache.maven.plugins maven-antrun-plugin process-deps - process-resources run + process-resources - - - + + + process-mod - process-resources run + process-resources - - + + + + org.apache.maven.plugins + maven-dependency-plugin + + + build-deps-file + + list + + generate-resources + + false + ${project.build.directory}/deps.txt + true + org.eclipse.jetty,jakarta.servlet + true + provided + + + + - - - org.eclipse.jetty - jetty-infinispan-common - - - org.infinispan - infinispan-client-hotrod - provided - - - org.infinispan - infinispan-remote-query-client - provided - - - org.infinispan.protostream - protostream - provided - - diff --git a/jetty-integrations/jetty-infinispan/pom.xml b/jetty-integrations/jetty-infinispan/pom.xml index a9f807c774db..1982ab78f824 100644 --- a/jetty-integrations/jetty-infinispan/pom.xml +++ b/jetty-integrations/jetty-infinispan/pom.xml @@ -1,25 +1,25 @@ + + 4.0.0 org.eclipse.jetty jetty-integrations 12.0.3-SNAPSHOT - - 4.0.0 jetty-infinispan pom Integrations :: Infinispan - - - ${project.groupId}.infinispan - jetty-infinispan-common jetty-infinispan-embedded - jetty-infinispan-remote jetty-infinispan-embedded-query + jetty-infinispan-remote jetty-infinispan-remote-query + + ${project.groupId}.infinispan + + diff --git a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml index 2bb909fd59e0..d883d060b30f 100644 --- a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml +++ b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml @@ -1,29 +1,29 @@ + + 4.0.0 org.eclipse.jetty.memcached jetty-memcached 12.0.3-SNAPSHOT - - 4.0.0 jetty-memcached-sessions Integrations :: Memcached :: Sessions + + ${project.groupId}.session + + - - org.eclipse.jetty - jetty-session - com.googlecode.xmemcached xmemcached ${xmemcached.version} + + org.eclipse.jetty + jetty-session + - - ${project.groupId}.session - - diff --git a/jetty-integrations/jetty-memcached/pom.xml b/jetty-integrations/jetty-memcached/pom.xml index 0af19eb0d916..d90540e35acc 100644 --- a/jetty-integrations/jetty-memcached/pom.xml +++ b/jetty-integrations/jetty-memcached/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-integrations 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.memcached jetty-memcached pom diff --git a/jetty-integrations/jetty-nosql/pom.xml b/jetty-integrations/jetty-nosql/pom.xml index c160d81702f8..33fdd25a7cd3 100644 --- a/jetty-integrations/jetty-nosql/pom.xml +++ b/jetty-integrations/jetty-nosql/pom.xml @@ -1,28 +1,25 @@ + + 4.0.0 org.eclipse.jetty jetty-integrations 12.0.3-SNAPSHOT - 4.0.0 jetty-nosql Integrations :: NoSQL :: Sessions ${project.groupId}.nosql - - install - - org.eclipse.jetty - jetty-session + jetty-jmx + true org.eclipse.jetty - jetty-jmx - true + jetty-session org.mongodb @@ -35,4 +32,8 @@ slf4j-api + + install + + diff --git a/jetty-integrations/pom.xml b/jetty-integrations/pom.xml index b04f3c472afd..55f3b9587510 100644 --- a/jetty-integrations/pom.xml +++ b/jetty-integrations/pom.xml @@ -1,15 +1,15 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.3-SNAPSHOT - - 4.0.0 jetty-integrations - Integrations pom + Integrations jetty-gcloud diff --git a/pom.xml b/pom.xml index 6a47fc226296..ae80e43340b1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,31 +5,151 @@ org.eclipse.jetty jetty-project 12.0.3-SNAPSHOT + pom Jetty :: Project The Eclipse Jetty Project - pom https://eclipse.dev/jetty 1995 - - - 17 - 17 - 17 - false - https://eclipse.dev/jetty/ - benchmarks - org.slf4j;version="[1.7,3.0)", org.slf4j.event;version="[1.7,3.0)", org.slf4j.helpers;version="[1.7,3.0)", org.slf4j.spi;version="[1.7,3.0)" - UTF-8 - false + + Webtide + https://webtide.com + - - true - same_thread - concurrent - fixed - 2 - false + + + Eclipse Public License - Version 2.0 + https://www.eclipse.org/legal/epl-2.0/ + + + Apache Software License - Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + + + + gregw + Greg Wilkins + gregw@webtide.com + Webtide, LLC + https://webtide.com + 10 + + + janb + Jan Bartel + janb@webtide.com + Webtide, LLC + https://webtide.com + 10 + + + jesse + Jesse McConnell + jesse.mcconnell@gmail.com + Webtide, LLC + https://webtide.com + -6 + + + joakime + Joakim Erdfelt + joakim.erdfelt@gmail.com + Webtide, LLC + https://webtide.com + -6 + + + sbordet + Simone Bordet + simone.bordet@gmail.com + Webtide, LLC + https://webtide.com + 1 + + + djencks + David Jencks + david.a.jencks@gmail.com + IBM + -8 + + + olamy + Olivier Lamy + oliver.lamy@gmail.com + Webtide, LLC + https://webtide.com + Australia/Brisbane + + + lorban + Ludovic Orban + lorban@bitronix.be + Webtide, LLC + https://webtide.com + 1 + + + + + + Jetty Developer Mailing List + https://accounts.eclipse.org/mailing-list/jetty-dev + https://www.eclipse.org/lists/jetty-dev/ + + + Jetty Users Mailing List + https://accounts.eclipse.org/mailing-list/jetty-users + https://www.eclipse.org/lists/jetty-users/ + + + Jetty Announce Mailing List + https://accounts.eclipse.org/mailing-list/jetty-announce + https://www.eclipse.org/lists/jetty-announce/ + + + + + build + + jetty-core + jetty-ee10 + jetty-ee9 + jetty-ee8 + jetty-home + jetty-integrations + tests + javadoc + documentation + + + + scm:git:https://github.com/eclipse/jetty.project.git + scm:git:git@github.com:eclipse/jetty.project.git + https://github.com/eclipse/jetty.project + + + + github + https://github.com/eclipse/jetty.project/issues + + + + + oss.sonatype.org + Jetty Staging Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + oss.sonatype.org + Jetty Snapshot Repository + https://oss.sonatype.org/content/repositories/jetty-snapshots/ + + + + 2.0.10 @@ -37,32 +157,57 @@ 1.11.3 4.5.14 4.4.16 + + + 2.2.4 + false 2.2.13 2.5.10 - 2.2.3 9.6 4.2.0 6.4.1 + 3.3.0 1.5 + 3.2.0 10.6.0 1.16.0 + 3.13.0 1.24.0 2.14.0 - 3.13.0 + 17 + + 17 + 17 2.5.2 + 1.5.0 3.4.2 + 1.0.0-v20070606 7.0.5 3.0.2 + 1.3.0 2.20.0 + 4.0.6 + 4.0.6 1.56.1 2.10.1 32.1.2-jre 7.0.0 + 1.0.10 2.2 5.3.2 + + + 11.0.14.Final 4.6.5.Final 11.0.17.Final + 1.2 + + + false + false 2.15.2 + 0.8.10 2.0.1 2.1.1 4.0.0 @@ -73,7 +218,8 @@ 5.0.0 3.1.1 2.0.0 - 2.0.0 + 2.0.0 + 2.0.1 2.0.0 3.1.0 @@ -81,36 +227,86 @@ 3.0.2 3.0.2 3.0.1 - 1.1.0.v201105071233 - 2.0 - 1.4.1.v201005082020 + false + 1.1.0.v201105071233 + + 2.0 + + 1.4.1.v201005082020 + 3.0.2.Final + 3.5.1.Final + 2.2.1.Final 2.2.1.Final 3.5.3.Final - 3.0.2.Final - 3.5.1.Final 1.1 - 1.0.7 0.18.0 1.2 + 2.7 + 1.0.7 + -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -Djava.io.tmpdir=${project.build.directory} -showversion -Xmx6g -Xms4g -Xlog:gc:stderr:time,level,tags 6.1 + true + /tmp + https://eclipse.dev/jetty/ 1.1 + ${project.build.directory}/${jettyHomeZipFileName} + jetty-home.zip 1.37 + benchmarks 5.13.0 1.1.1 2.5.0 - 5.10.0 10.0.14 + 2 + fixed + + + true + concurrent + same_thread + false + 5.10.0 2.0.3 + 4.1 + ${project.build.directory}/local-repo 2.20.0 1.4.11 - 3.2.0 10.3.6 - 3.9.4 - 1.0.1 + 3.2.0 0.13.1 + 1.0.1 + 3.9.0 + 3.1.0 + 3.6.0 + 5.1.9 + 3.3.0 + 3.3.1 + false + 3.11.0 + 3.6.0 + 3.1.1 + 3.9.4 + 3.4.1 + 3.1.0 + 3.1.0 + 3.1.1 + 3.6.0 + 3.3.0 + 3.6.0 + 3.9.0 + 3.0.1 + 3.1.0 1.9.16 + 3.3.1 + 3.5.1 + 3.3.0 + 3.1.2 3.9.0 + 3.4.0 + 2.2.3 + + 3.2.20 3.12.11 4.1.97.Final 0.9.1 @@ -118,945 +314,193 @@ 8.0.0 1.2.0 1.3.0 - - 3.18.500 - - 3.11.100 1.6.1 1.5.1 1.4.1 - 3.7.200 + + 3.11.100 1.2.0 1.0.2 1.0.1 1.5.4 + 3.7.200 1.0.2 - 1.0.0-v20070606 + + 3.18.500 + org.slf4j;version="[1.7,3.0)", org.slf4j.event;version="[1.7,3.0)", org.slf4j.helpers;version="[1.7,3.0)", org.slf4j.spi;version="[1.7,3.0)" 4.13.5 2.6.14 - 1.8.3 - 3.0.0 - 1.2 2.1.1 4.0.0 4.0.2 + 2023-06-05T23:12:49Z + UTF-8 + src/it/settings.xml 2.0.9 1.3.6 + 4.7.3.5 + false + 0 + 1.8.3 1.2.5 1.2.5 1.19.0 + 3.0.0 + 2.14.2 1.6.0.Final 2.2.2.Final 2.4.7 - - - 2.2.4 - 3.3.0 - 3.2.0 - 1.5.0 - 1.3.0 - 4.0.6 - 1.0.10 - 0.8.10 - 2.7 - 4.1 - 3.1.0 - 3.6.0 - 5.1.9 - 3.3.1 - 3.3.0 - 3.11.0 - 3.6.0 - 3.1.1 - 3.4.1 - 3.1.0 - 3.1.0 - 3.1.1 - 3.6.0 - 4.0.6 - 3.3.0 - 3.6.0 - 3.9.0 - 3.9.0 - 3.0.1 - 3.1.0 - 3.3.1 - 3.5.1 - 3.1.2 - 3.3.0 - 3.4.0 - 4.7.3.5 - 2.14.2 - - - false - false - ${project.build.directory}/local-repo - jetty-home.zip - ${project.build.directory}/${jettyHomeZipFileName} - -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -Djava.io.tmpdir=${project.build.directory} -showversion -Xmx6g -Xms4g -Xlog:gc:stderr:time,level,tags - true - /tmp - - 3.2.20 - src/it/settings.xml - 0 - - - 11.0.14.Final - false - 2023-06-05T23:12:49Z - false - - - Eclipse Public License - Version 2.0 - https://www.eclipse.org/legal/epl-2.0/ - - - Apache Software License - Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - - - - - scm:git:https://github.com/eclipse/jetty.project.git - scm:git:git@github.com:eclipse/jetty.project.git - https://github.com/eclipse/jetty.project - - - - build - jetty-core - jetty-integrations - jetty-ee10 - jetty-ee9 - jetty-ee8 - jetty-home - tests - - documentation - javadoc - - - - - - org.apache.maven.extensions - maven-build-cache-extension - ${maven-build-cache.version} - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - ban-javax-servlet-api - - enforce - - validate - - - - - javax.servlet:* - servletapi - org.eclipse.jetty.orbit:javax.servlet - *:javax.servlet - org.mortbay.jetty:servlet-api - jetty:servlet-api - jetty-servlet-api - javax.websocket - javax.el:* - javax.annotation:javax.annotation-api - - true - - - - - - enforce-java - - enforce - - validate - - - - [3.9.2,) - [ERROR] OLD MAVEN [${maven.version}] in use, Jetty ${project.version} requires Maven 3.9.2 or newer - - - [17,) - [ERROR] OLD JDK [${java.version}] in use. Jetty ${project.version} requires JDK 17 or newer - - - - - - - - - - - - - org.eclipse.jetty.toolchain - jetty-build-support - ${build-support.version} - - - - - org.apache.maven.plugins - maven-source-plugin - true - - - attach-sources - package - - jar-no-fork - - - - - - org.jacoco - jacoco-maven-plugin - - - - **/org/eclipse/jetty/ant/** - - **/org/eclipse/jetty/embedded/** - **/org/eclipse/jetty/asyncrest/** - **/org/eclipse/jetty/demo/** - - **/org/eclipse/jetty/gcloud/** - **/org/eclipse/jetty/infinispan/** - **/org/eclipse/jetty/osgi/** - **/org/eclipse/jetty/spring/** - **/org/eclipse/jetty/http/spi/** - - **/org/eclipse/jetty/tests/** - **/org/eclipse/jetty/test/** - - - - - jacoco-initialize - initialize - - prepare-agent - - - - jacoco-setup-m-invoker-p - initialize - - - invoker.mavenOpts - - - prepare-agent - - - - jacoco-site - package - - report - - - - - **/org/eclipse/jetty/** - - - - - - - org.apache.maven.plugins - maven-release-plugin - - true - false - deploy - -Peclipse-release - clean install - forked-path - - - - org.apache.maven.plugins - maven-remote-resources-plugin - - - copy-shared-resources - generate-resources - - process - - - - org.eclipse.jetty:build-resources:${project.version} - - - - - - - com.mycila - license-maven-plugin - false - - true - true - true - - - - check-java-headers - verify - - check - - -
header-template.txt
- - DOUBLESLASH_STYLE - DOUBLESLASH_STYLE - - - **/*.java - **/*.adoc - - - - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/AntWebAppContext.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/Connectors.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/ContextHandlers.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/FileMatchingConfiguration.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/LoginServices.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/SystemProperties.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/utils/ServerProxy.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/utils/TaskLog.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/AntWebXmlConfiguration.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/JettyRunTask.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/ServerProxyImpl.java - - jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/security/UnixCrypt.java - - jetty-home/src/main/resources/README.adoc - - - - - - - org.apache.felix - maven-bundle-plugin - - - process-classes - - manifest - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - set-osgi-version - validate - - parse-version - - - - - - org.eclipse.jetty.toolchain - jetty-version-maven-plugin - - - attach-version - process-resources - - attach-version-text - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven.checkstyle.plugin.version} - - jetty-checkstyle.xml - true - warning - true - - - ${project.build.sourceDirectory} - - - ${project.build.testSourceDirectory} - - - - - org.eclipse.jetty - build-resources - ${project.version} - - - com.puppycrawl.tools - checkstyle - ${checkstyle.version} - - - - - checkstyle-check - validate - - check - - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - ${maven.antrun.plugin.version} - - - org.apache.ant - ant - ${ant.version} - - - - - org.apache.maven.plugins - maven-assembly-plugin - ${maven.assembly.plugin.version} - - - org.eclipse.jetty.toolchain - jetty-assembly-descriptors - ${jetty-assembly-descriptors.version} - - - - - org.apache.maven.plugins - maven-clean-plugin - ${maven.clean.plugin.version} - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} - - ${compiler.source} - ${compiler.target} - ${compiler.release} - true - - -Xlint:exports - - -nowarn - - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven.dependency.plugin.version} - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven.deploy.plugin.version} - - 10 - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven.enforcer.plugin.version} - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven.surefire.plugin.version} - - false - - - - org.apache.maven.plugins - maven-invoker-plugin - ${maven.invoker.plugin.version} - - true - ${invoker.mergeUserSettings} - true - org.eclipse.jetty.maven.its - ${it.debug} - ${java.home} - - ${java.home} - - src/it - 300 - ${project.build.directory}/it - ${localRepoPath} - ${settingsPath} - ${skipTests} - true - - */pom.xml - - - ${localRepoPath} - - - - - org.apache.maven.plugins - maven-install-plugin - ${maven.install.plugin.version} - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.plugin.version} - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - ${project.version} - Eclipse Jetty Project - ${jetty.url} - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - - ${javadoc.verbose} - true - 17 - UTF-8 - UTF-8 - UTF-8 - -html5 - true - false - false - false - protected - true - true - com.*:org.slf4j*:org.mortbay*:*.jmh*:org.eclipse.jetty.embedded*:org.eclipse.jetty.example.asyncrest*:org.eclipse.jetty.test* - - - - org.apache.maven.plugins - maven-plugin-plugin - ${maven-plugin.plugin.version} - - - org.apache.maven.plugins - maven-release-plugin - ${maven.release.plugin.version} - - - org.apache.maven.plugins - maven-remote-resources-plugin - ${maven.remote-resources-plugin.version} - - - org.apache.maven.plugins - maven-resources-plugin - ${maven.resources.plugin.version} - - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-shade-plugin - ${maven.shade.plugin.version} - - - org.ow2.asm - asm - ${asm.version} - - - org.ow2.asm - asm-commons - ${asm.version} - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven.source.plugin.version} - - - - 2 - ${project.name} - ${bundle-symbolic-name}.source - Eclipse Jetty Project - ${parsedVersion.osgiVersion} - ${bundle-symbolic-name};version="${parsedVersion.osgiVersion}";roots:="." - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.plugin.version} - - false - ${surefire.rerunFailingTestsCount} - 3600 - - @{argLine} ${jetty.surefire.argLine} - - false - 1 - true - - alphabetical - - ${jetty.unixdomain.dir} - ${jetty.testtracker.log} - - - - en_US.UTF-8 - - - - junit.jupiter.execution.parallel.enabled=${junit.jupiter.execution.parallel.enabled} - junit.jupiter.execution.parallel.mode.default=${junit.jupiter.execution.parallel.mode.default} - junit.jupiter.execution.parallel.mode.classes.default=${junit.jupiter.execution.parallel.mode.classes.default} - junit.jupiter.execution.parallel.config.strategy=${junit.jupiter.execution.parallel.config.strategy} - junit.jupiter.execution.parallel.config.fixed.parallelism=${junit.jupiter.execution.parallel.config.fixed.parallelism} - junit.jupiter.extensions.autodetection.enabled=${junit.jupiter.extensions.autodetection.enabled} - - - - - - org.ow2.asm - asm-commons - ${asm.version} - - - - - org.apache.maven.plugins - maven-war-plugin - ${maven.war.plugin.version} - - - org.codehaus.mojo - flatten-maven-plugin - ${flatten.maven.plugin.version} - - ${project.build.directory} - flattened-pom.xml - bom - true - - remove - remove - remove - - - - - org.eclipse.jetty.toolchain - jetty-version-maven-plugin - ${jetty-version.maven.plugin.version} - - - org.jacoco - jacoco-maven-plugin - ${jacoco.maven.plugin.version} - - - com.mycila - license-maven-plugin - ${license.maven.plugin.version} - - - org.apache.felix - maven-bundle-plugin - ${maven.bundle.plugin.version} - - - jar - maven-plugin - - - ${bundle-symbolic-name} - Jetty module for ${project.name} - ${jetty.url} - Eclipse Jetty Project - . - Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others. - - ${osgi.slf4j.import.packages}, - * - - <_provider-policy>]]> - <_consumer-policy>]]> - - - - - org.apache.servicemix.tooling - depends-maven-plugin - ${depends.maven.plugin.version} - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctor.maven.plugin.version} - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj-diagram.version} - - - - html5 - - asciidoctor-diagram - - - https://eclipse.dev/jetty/javadoc/jetty-12 - ${basedir}/.. - https://github.com/eclipse/jetty.project/tree/jetty-12.0.x - https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/documentation/jetty-documentation/src/main/asciidoc - http://central.maven.org/maven2 - ${project.version} - ${maven.build.timestamp} - left - font - - - - - index - generate-resources - - process-asciidoc - - - src/main/asciidoc - index.adoc - ${project.build.directory}/html - - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${build-helper.maven.plugin.version} - - - org.codehaus.mojo - buildnumber-maven-plugin - ${buildnumber.maven.plugin.version} - - - org.codehaus.mojo - exec-maven-plugin - ${maven.exec.plugin.version} - - - org.mortbay.jetty - h2spec-maven-plugin - ${h2spec.maven.plugin.version} - - - org.codehaus.mojo - versions-maven-plugin - ${versions.maven.plugin.version} - - true - true - true - true - - - - - - - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.junit.jupiter - junit-jupiter - test - - - - - - - biz.aQute.bnd - biz.aQute.bndlib - ${bndlib.version} - - - ch.qos.logback - logback-core - ${logback.version} - - - com.google.code.findbugs - jsr305 - ${findbugs.jsr305.version} - - - com.google.errorprone - error_prone_annotations - ${google.errorprone.version} - - - com.google.code.gson - gson - ${gson.version} - - - com.google.guava - guava - ${guava.version} - - - com.google.inject - guice - ${guice.version} - - - com.googlecode.json-simple - json-simple - ${json-simple.version} - - - com.hazelcast - hazelcast - ${hazelcast.version} - - - com.openpojo - openpojo - ${openpojo.version} - - - commons-codec - commons-codec - ${commons-codec.version} - - - org.apache.commons - commons-compress - ${commons.compress.version} - - - org.apache.avro - avro - ${apache.avro.version} - - - io.grpc - grpc-core - ${grpc.version} - - - net.java.dev.jna - jna-jpms - ${jna.version} - - - net.java.dev.jna - jna - ${jna.version} - - - net.minidev - json-smart - ${json-smart.version} - - - org.apache.ant - ant - ${ant.version} - - - org.apache.ant - ant-launcher - ${ant.version} - - - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - ${spifly.version} - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - + + + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + + + org.infinispan + infinispan-bom + ${infinispan.version} + pom + import + + + org.junit + junit-bom + ${junit.version} + pom + import + + + org.ow2.asm + asm-bom + ${asm.version} + pom + import + + + org.testcontainers + testcontainers-bom + ${testcontainers.version} + pom + import + + + biz.aQute.bnd + biz.aQute.bndlib + ${bndlib.version} + + + ch.qos.logback + logback-core + ${logback.version} + + + com.google.code.findbugs + jsr305 + ${findbugs.jsr305.version} + + + com.google.code.gson + gson + ${gson.version} + + + com.google.errorprone + error_prone_annotations + ${google.errorprone.version} + + + com.google.guava + guava + ${guava.version} + + + com.google.inject + guice + ${guice.version} + + + com.googlecode.json-simple + json-simple + ${json-simple.version} + + + com.hazelcast + hazelcast + ${hazelcast.version} + + + com.openpojo + openpojo + ${openpojo.version} + + + commons-codec + commons-codec + ${commons-codec.version} + + + io.grpc + grpc-core + ${grpc.version} + + + io.netty + netty-handler + ${netty.version} + + + net.java.dev.jna + jna + ${jna.version} + + + net.java.dev.jna + jna-jpms + ${jna.version} + + + net.minidev + json-smart + ${json-smart.version} + + + org.apache.ant + ant + ${ant.version} + + + org.apache.ant + ant-launcher + ${ant.version} + + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + ${spifly.version} + + + org.apache.avro + avro + ${apache.avro.version} + + + org.apache.commons + commons-compress + ${commons.compress.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + org.apache.felix org.apache.felix.framework ${felix.version} @@ -1086,14 +530,14 @@ maven-core ${maven.deps.version} - - javax.inject - javax.inject - com.google.code.findbugs jsr305 + + javax.inject + javax.inject + @@ -1128,26 +572,15 @@ maven-settings ${maven.deps.version} - - org.apache.maven.plugin-tools - maven-plugin-annotations - ${maven.plugin-tools.version} - provided - org.apache.maven.plugin-tools maven-plugin-tools-api ${maven.plugin-tools.version} - io.netty - netty-handler - ${netty.version} - - - org.awaitility - awaitility - ${awaitility.version} + org.asciidoctor + asciidoctor-maven-plugin + ${asciidoctor.maven.plugin.version} org.asciidoctor @@ -1155,14 +588,9 @@ ${asciidoctorj.version} - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctor.maven.plugin.version} - - - org.conscrypt - conscrypt-openjdk-uber - ${conscrypt.version} + org.awaitility + awaitility + ${awaitility.version} org.codehaus.plexus @@ -1179,6 +607,16 @@ plexus-xml ${plexus-xml.version} + + org.conscrypt + conscrypt-openjdk-uber + ${conscrypt.version} + + + org.eclipse.equinox.http + servlet + ${equinox-http-servlet-version} + org.eclipse.jetty jetty-alpn-client @@ -1196,12 +634,12 @@ org.eclipse.jetty - jetty-alpn-java-server + jetty-alpn-java-client ${project.version} org.eclipse.jetty - jetty-alpn-java-client + jetty-alpn-java-server ${project.version} @@ -1236,18 +674,18 @@ zip - org.eclipse.jetty.tests - jetty-home-tester + org.eclipse.jetty + jetty-http ${project.version} org.eclipse.jetty - jetty-http + jetty-http-spi ${project.version} org.eclipse.jetty - jetty-http-spi + jetty-http-tools ${project.version} @@ -1258,8 +696,8 @@ org.eclipse.jetty jetty-infinispan-embedded - config ${project.version} + config org.eclipse.jetty @@ -1269,8 +707,8 @@ org.eclipse.jetty jetty-infinispan-remote - config ${project.version} + config org.eclipse.jetty @@ -1329,12 +767,12 @@ org.eclipse.jetty - jetty-session + jetty-server ${project.version} org.eclipse.jetty - jetty-server + jetty-session ${project.version} @@ -1374,12 +812,12 @@ org.eclipse.jetty.fcgi - jetty-fcgi-server + jetty-fcgi-proxy ${project.version} org.eclipse.jetty.fcgi - jetty-fcgi-proxy + jetty-fcgi-server ${project.version} @@ -1394,17 +832,17 @@ org.eclipse.jetty.http2 - jetty-http2-common + jetty-http2-client-transport ${project.version} org.eclipse.jetty.http2 - jetty-http2-hpack + jetty-http2-common ${project.version} org.eclipse.jetty.http2 - jetty-http2-client-transport + jetty-http2-hpack ${project.version} @@ -1419,17 +857,17 @@ org.eclipse.jetty.http3 - jetty-http3-common + jetty-http3-client-transport ${project.version} org.eclipse.jetty.http3 - jetty-http3-qpack + jetty-http3-common ${project.version} org.eclipse.jetty.http3 - jetty-http3-client-transport + jetty-http3-qpack ${project.version} @@ -1444,27 +882,27 @@ org.eclipse.jetty.osgi - jetty-osgi-alpn + jetty-httpservice ${project.version} org.eclipse.jetty.osgi - jetty-osgi-boot + jetty-osgi-alpn ${project.version} org.eclipse.jetty.osgi - jetty-osgi-boot-jsp + jetty-osgi-boot ${project.version} org.eclipse.jetty.osgi - jetty-osgi-boot-warurl + jetty-osgi-boot-jsp ${project.version} org.eclipse.jetty.osgi - jetty-httpservice + jetty-osgi-boot-warurl ${project.version} @@ -1485,12 +923,12 @@ org.eclipse.jetty.quic - jetty-quic-quiche-jna + jetty-quic-quiche-foreign-incubator ${project.version} org.eclipse.jetty.quic - jetty-quic-quiche-foreign-incubator + jetty-quic-quiche-jna ${project.version} @@ -1499,8 +937,8 @@ ${project.version} - org.eclipse.jetty - jetty-http-tools + org.eclipse.jetty.tests + jetty-home-tester ${project.version} @@ -1513,6 +951,16 @@ test-distribution-common ${project.version} + + org.eclipse.jetty.toolchain + jetty-perf-helper + ${jetty.perf-helper.version} + + + org.eclipse.jetty.toolchain + jetty-test-helper + ${jetty.test.version} + org.eclipse.jetty.websocket jetty-websocket-core-client @@ -1535,12 +983,12 @@ org.eclipse.jetty.websocket - jetty-websocket-jetty-common + jetty-websocket-jetty-client ${project.version} org.eclipse.jetty.websocket - jetty-websocket-jetty-client + jetty-websocket-jetty-common ${project.version} @@ -1548,21 +996,11 @@ jetty-websocket-jetty-server ${project.version} + - org.eclipse.jetty.toolchain - jetty-perf-helper - ${jetty.perf-helper.version} - - - org.eclipse.jetty.toolchain - jetty-test-helper - ${jetty.test.version} - - - org.eclipse.jetty.toolchain - jetty-xhtml-schemas - ${jetty.xhtml.schemas-version} - test + org.eclipse.platform + org.eclipse.osgi + ${osgi-version} org.eclipse.platform @@ -1581,72 +1019,16 @@ - - - org.eclipse.platform - org.eclipse.osgi - ${osgi-version} - org.eclipse.platform org.eclipse.osgi.util ${osgi-util-version} - - org.osgi - org.osgi.service.cm - ${osgi-service-cm-version} - - - org.osgi - org.osgi.service.component - ${osgi-service-component-version} - - - org.osgi - org.osgi.service.event - ${osgi-service-event-version} - - - org.osgi - org.osgi.util.tracker - ${osgi-util-tracker-version} - - - org.osgi - org.osgi.util.measurement - ${osgi-util-measurement-version} - test - - - org.osgi - org.osgi.util.position - ${osgi-util-position-version} - test - - - org.osgi - org.osgi.util.xml - ${osgi-util-xml-version} - test - - - org.eclipse.equinox.http - servlet - ${equinox-http-servlet-version} - org.hamcrest hamcrest ${hamcrest.version} - - org.infinispan - infinispan-bom - ${infinispan.version} - pom - import - org.infinispan.protostream protostream @@ -1657,13 +1039,6 @@ protostream-processor ${infinispan.protostream.version} - - com.fasterxml.jackson - jackson-bom - ${jackson.version} - pom - import - org.jboss.logging jboss-logging @@ -1689,18 +1064,6 @@ jboss-threads ${jboss-threads.version} - - org.wildfly.security - wildfly-elytron - ${wildfly.elytron.version} - - - org.junit - junit-bom - ${junit.version} - pom - import - org.mariadb.jdbc mariadb-java-client @@ -1718,6 +1081,11 @@ pax-exam ${pax.exam.version} + + org.ops4j.pax.exam + pax-exam-container-forked + ${pax.exam.version} + org.ops4j.pax.exam pax-exam-inject @@ -1725,13 +1093,13 @@ org.ops4j.pax.exam - pax-exam-container-forked + pax-exam-junit4 ${pax.exam.version} - org.ops4j.pax.tinybundles - tinybundles - ${tinybundles.version} + org.ops4j.pax.exam + pax-exam-link-mvn + ${pax.exam.version} org.ops4j.pax.swissbox @@ -1744,14 +1112,9 @@ ${swissbox.version} - org.ops4j.pax.exam - pax-exam-junit4 - ${pax.exam.version} - - - org.ops4j.pax.exam - pax-exam-link-mvn - ${pax.exam.version} + org.ops4j.pax.tinybundles + tinybundles + ${tinybundles.version} org.ops4j.pax.url @@ -1772,14 +1135,18 @@ org.osgi - - osgi.core - ${org.osgi.core.version} + org.osgi.service.cm + ${osgi-service-cm-version} org.osgi - osgi.annotation - ${org.osgi.annotation.version} + org.osgi.service.component + ${osgi-service-component-version} + + + org.osgi + org.osgi.service.event + ${osgi-service-event-version} org.osgi @@ -1792,11 +1159,20 @@ ${org.osgi.util.promise.version} - org.ow2.asm - asm-bom - ${asm.version} - pom - import + org.osgi + org.osgi.util.tracker + ${osgi-util-tracker-version} + + + org.osgi + osgi.annotation + ${org.osgi.annotation.version} + + + org.osgi + + osgi.core + ${org.osgi.core.version} org.slf4j @@ -1819,20 +1195,790 @@ ${slf4j.version} - org.slf4j - slf4j-simple - ${slf4j.version} + org.slf4j + slf4j-simple + ${slf4j.version} + + + org.wildfly.security + wildfly-elytron + ${wildfly.elytron.version} + + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${maven.plugin-tools.version} + provided + + + org.eclipse.jetty.toolchain + jetty-xhtml-schemas + ${jetty.xhtml.schemas-version} + test + + + org.osgi + org.osgi.util.measurement + ${osgi-util-measurement-version} + test + + + org.osgi + org.osgi.util.position + ${osgi-util-position-version} + test - org.testcontainers - testcontainers-bom - ${testcontainers.version} - pom - import + org.osgi + org.osgi.util.xml + ${osgi-util-xml-version} + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.junit.jupiter + junit-jupiter + test + + + + + + + + + com.mycila + license-maven-plugin + ${license.maven.plugin.version} + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.plugin.version} + + + jar + maven-plugin + + + ${bundle-symbolic-name} + Jetty module for ${project.name} + ${jetty.url} + Eclipse Jetty Project + . + Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others. + ${osgi.slf4j.import.packages}, + * + <_provider-policy>]]> + <_consumer-policy>]]> + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven.antrun.plugin.version} + + + org.apache.ant + ant + ${ant.version} + + + + + org.apache.maven.plugins + maven-assembly-plugin + ${maven.assembly.plugin.version} + + + org.eclipse.jetty.toolchain + jetty-assembly-descriptors + ${jetty-assembly-descriptors.version} + + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven.clean.plugin.version} + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin.version} + + ${compiler.source} + ${compiler.target} + ${compiler.release} + true + + -Xlint:exports + + -nowarn + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven.dependency.plugin.version} + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy.plugin.version} + + 10 + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven.enforcer.plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven.surefire.plugin.version} + + false + + + + org.apache.maven.plugins + maven-install-plugin + ${maven.install.plugin.version} + + + org.apache.maven.plugins + maven-invoker-plugin + ${maven.invoker.plugin.version} + + true + ${invoker.mergeUserSettings} + true + org.eclipse.jetty.maven.its + ${it.debug} + ${java.home} + + ${java.home} + + src/it + 300 + ${project.build.directory}/it + ${localRepoPath} + ${settingsPath} + ${skipTests} + true + + */pom.xml + + + ${localRepoPath} + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven.jar.plugin.version} + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + ${project.version} + Eclipse Jetty Project + ${jetty.url} + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven.javadoc.plugin.version} + + ${javadoc.verbose} + true + 17 + UTF-8 + UTF-8 + UTF-8 + -html5 + true + false + false + false + protected + true + true + com.*:org.slf4j*:org.mortbay*:*.jmh*:org.eclipse.jetty.embedded*:org.eclipse.jetty.example.asyncrest*:org.eclipse.jetty.test* + + + + org.apache.maven.plugins + maven-plugin-plugin + ${maven-plugin.plugin.version} + + + org.apache.maven.plugins + maven-release-plugin + ${maven.release.plugin.version} + + + org.apache.maven.plugins + maven-remote-resources-plugin + ${maven.remote-resources-plugin.version} + + + org.apache.maven.plugins + maven-resources-plugin + ${maven.resources.plugin.version} + + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-shade-plugin + ${maven.shade.plugin.version} + + + org.ow2.asm + asm + ${asm.version} + + + org.ow2.asm + asm-commons + ${asm.version} + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven.source.plugin.version} + + + + 2 + ${project.name} + ${bundle-symbolic-name}.source + Eclipse Jetty Project + ${parsedVersion.osgiVersion} + ${bundle-symbolic-name};version="${parsedVersion.osgiVersion}";roots:="." + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.plugin.version} + + false + ${surefire.rerunFailingTestsCount} + 3600 + @{argLine} ${jetty.surefire.argLine} + false + 1 + true + + + alphabetical + + ${jetty.unixdomain.dir} + ${jetty.testtracker.log} + + + + en_US.UTF-8 + + + junit.jupiter.execution.parallel.enabled=${junit.jupiter.execution.parallel.enabled} + junit.jupiter.execution.parallel.mode.default=${junit.jupiter.execution.parallel.mode.default} + junit.jupiter.execution.parallel.mode.classes.default=${junit.jupiter.execution.parallel.mode.classes.default} + junit.jupiter.execution.parallel.config.strategy=${junit.jupiter.execution.parallel.config.strategy} + junit.jupiter.execution.parallel.config.fixed.parallelism=${junit.jupiter.execution.parallel.config.fixed.parallelism} + junit.jupiter.extensions.autodetection.enabled=${junit.jupiter.extensions.autodetection.enabled} + + + + + org.ow2.asm + asm-commons + ${asm.version} + + + + + org.apache.maven.plugins + maven-war-plugin + ${maven.war.plugin.version} + + + org.apache.servicemix.tooling + depends-maven-plugin + ${depends.maven.plugin.version} + + + org.asciidoctor + asciidoctor-maven-plugin + ${asciidoctor.maven.plugin.version} + + html5 + + asciidoctor-diagram + + + https://eclipse.dev/jetty/javadoc/jetty-12 + ${basedir}/.. + https://github.com/eclipse/jetty.project/tree/jetty-12.0.x + https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/documentation/jetty-documentation/src/main/asciidoc + http://central.maven.org/maven2 + ${project.version} + ${maven.build.timestamp} + left + font + + + + + org.asciidoctor + asciidoctorj-diagram + ${asciidoctorj-diagram.version} + + + + + index + + process-asciidoc + + generate-resources + + src/main/asciidoc + index.adoc + ${project.build.directory}/html + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper.maven.plugin.version} + + + org.codehaus.mojo + buildnumber-maven-plugin + ${buildnumber.maven.plugin.version} + + + org.codehaus.mojo + exec-maven-plugin + ${maven.exec.plugin.version} + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten.maven.plugin.version} + + ${project.build.directory} + flattened-pom.xml + bom + true + + remove + remove + remove + + + + + org.codehaus.mojo + versions-maven-plugin + ${versions.maven.plugin.version} + + true + true + true + true + + + + org.eclipse.jetty.toolchain + jetty-version-maven-plugin + ${jetty-version.maven.plugin.version} + + + org.jacoco + jacoco-maven-plugin + ${jacoco.maven.plugin.version} + + + org.mortbay.jetty + h2spec-maven-plugin + ${h2spec.maven.plugin.version} + + + + + + com.diffplug.spotless + spotless-maven-plugin + 2.39.0 + + + + pom.xml + + + 2 + + recommended_2008_06 + + true + + + + true + + scope,groupId,artifactId + + groupId,artifactId + + groupId,artifactId + + + + true + + + + + + check + + validate + + + + + com.mycila + license-maven-plugin + false + + true + true + true + + + + check-java-headers + + check + + verify + +
header-template.txt
+ + DOUBLESLASH_STYLE + DOUBLESLASH_STYLE + + + **/*.java + **/*.adoc + + + + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/AntWebAppContext.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/Connectors.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/ContextHandlers.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/FileMatchingConfiguration.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/LoginServices.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/SystemProperties.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/utils/ServerProxy.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/utils/TaskLog.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/AntWebXmlConfiguration.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/JettyRunTask.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/ServerProxyImpl.java + + jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/security/UnixCrypt.java + + jetty-home/src/main/resources/README.adoc + + + + + + + org.apache.felix + maven-bundle-plugin + + + + manifest + + process-classes + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven.checkstyle.plugin.version} + + jetty-checkstyle.xml + true + warning + true + + + ${project.build.sourceDirectory} + + + ${project.build.testSourceDirectory} + + + + + com.puppycrawl.tools + checkstyle + ${checkstyle.version} + + + org.eclipse.jetty + build-resources + ${project.version} + + + + + checkstyle-check + + check + + validate + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + org.eclipse.jetty.toolchain + jetty-build-support + ${build-support.version} + + + + + ban-javax-servlet-api + + enforce + + validate + + + + + javax.servlet:* + servletapi + org.eclipse.jetty.orbit:javax.servlet + *:javax.servlet + org.mortbay.jetty:servlet-api + jetty:servlet-api + jetty-servlet-api + javax.websocket + javax.el:* + javax.annotation:javax.annotation-api + + true + + + + + + enforce-java + + enforce + + validate + + + + [3.9.2,) + [ERROR] OLD MAVEN [${maven.version}] in use, Jetty ${project.version} requires Maven 3.9.2 or newer + + + [17,) + [ERROR] OLD JDK [${java.version}] in use. Jetty ${project.version} requires JDK 17 or newer + + + + + + + + + + + + + org.apache.maven.plugins + maven-release-plugin + + true + false + deploy + -Peclipse-release + clean install + forked-path + + + + org.apache.maven.plugins + maven-remote-resources-plugin + + + copy-shared-resources + + process + + generate-resources + + + org.eclipse.jetty:build-resources:${project.version} + + + + + + + org.apache.maven.plugins + maven-source-plugin + true + + + attach-sources + + jar-no-fork + + package + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + set-osgi-version + + parse-version + + validate + + + + + org.eclipse.jetty.toolchain + jetty-version-maven-plugin + + + attach-version + + attach-version-text + + process-resources + + + + + org.jacoco + jacoco-maven-plugin + + + + **/org/eclipse/jetty/ant/** + + **/org/eclipse/jetty/embedded/** + **/org/eclipse/jetty/asyncrest/** + **/org/eclipse/jetty/demo/** + + **/org/eclipse/jetty/gcloud/** + **/org/eclipse/jetty/infinispan/** + **/org/eclipse/jetty/osgi/** + **/org/eclipse/jetty/spring/** + **/org/eclipse/jetty/http/spi/** + + **/org/eclipse/jetty/tests/** + **/org/eclipse/jetty/test/** + + + + + jacoco-initialize + + prepare-agent + + initialize + + + jacoco-setup-m-invoker-p + + prepare-agent + + initialize + + + invoker.mavenOpts + + + + jacoco-site + + report + + package + + + + **/org/eclipse/jetty/** + + + + + + + + + org.apache.maven.extensions + maven-build-cache-extension + ${maven-build-cache.version} + + + + unix-domain-windows @@ -1883,16 +2029,34 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + + config-assembly + + single + + package + + + config + + + + + org.apache.maven.plugins maven-resources-plugin copy-resources - process-resources copy-resources + process-resources UTF-8 false @@ -1913,24 +2077,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - config-assembly - package - - single - - - - config - - - - - @@ -1943,16 +2089,33 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + + + single + + package + + + src/main/assembly/config.xml + + + + + org.apache.maven.plugins maven-resources-plugin copy-resources - process-resources copy-resources + process-resources UTF-8 false @@ -1973,23 +2136,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - package - - single - - - - src/main/assembly/config.xml - - - - - @@ -2009,6 +2155,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + true + + true + + maven-enforcer-plugin @@ -2029,36 +2183,28 @@ - true org.apache.maven.plugins - maven-javadoc-plugin + maven-gpg-plugin + ${maven.gpg.plugin.version} - attach-javadoc-jar + sign-artifacts - jar + sign + verify - - true - org.apache.maven.plugins - maven-deploy-plugin - - true - - org.apache.maven.plugins - maven-gpg-plugin - ${maven.gpg.plugin.version} + maven-javadoc-plugin + true - sign-artifacts - verify + attach-javadoc-jar - sign + jar @@ -2068,12 +2214,12 @@ exec-maven-plugin - false validate-dot exec validate + false dot @@ -2089,17 +2235,17 @@ ci - 0 - false - - Medium + 120 + + https://repo.maven.apache.org/maven2/ Default - false + false org.eclipse.jetty.* - - https://repo.maven.apache.org/maven2/ - 120 + false + + Medium + 0 @@ -2125,18 +2271,6 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - - - package - - javadoc-no-fork - - - - com.github.spotbugs spotbugs-maven-plugin @@ -2158,6 +2292,18 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + + + javadoc-no-fork + + package + + + @@ -2171,11 +2317,11 @@ gen-versiontxt - generate-resources update-version-text tag + generate-resources true true @@ -2216,10 +2362,10 @@ root-report - validate dependency-updates-aggregate-report + validate html @@ -2280,6 +2426,15 @@ 1.4.2 + + + + false + + cbi-releases + https://repo.eclipse.org/content/repositories/cbi-releases/ + + @@ -2290,24 +2445,15 @@ sign - package sign + package - - - cbi-releases - https://repo.eclipse.org/content/repositories/cbi-releases/ - - false - - - snapshot-repositories @@ -2316,147 +2462,40 @@ - jetty-snapshots - jetty-snapshots - https://oss.sonatype.org/content/repositories/jetty-snapshots - - true - false + + true + + jetty-snapshots + jetty-snapshots + https://oss.sonatype.org/content/repositories/jetty-snapshots - oss.snapshots - OSS Snapshots - https://oss.sonatype.org/content/repositories/snapshots false true + oss.snapshots + OSS Snapshots + https://oss.sonatype.org/content/repositories/snapshots fast - true true true true true + true true - - github - https://github.com/eclipse/jetty.project/issues - - - - - Jetty Developer Mailing List - https://www.eclipse.org/lists/jetty-dev/ - https://accounts.eclipse.org/mailing-list/jetty-dev - - - Jetty Users Mailing List - https://www.eclipse.org/lists/jetty-users/ - https://accounts.eclipse.org/mailing-list/jetty-users - - - Jetty Announce Mailing List - https://www.eclipse.org/lists/jetty-announce/ - https://accounts.eclipse.org/mailing-list/jetty-announce - - - - - - gregw - Greg Wilkins - gregw@webtide.com - Webtide, LLC - https://webtide.com - 10 - - - janb - Jan Bartel - janb@webtide.com - Webtide, LLC - https://webtide.com - 10 - - - jesse - Jesse McConnell - jesse.mcconnell@gmail.com - Webtide, LLC - https://webtide.com - -6 - - - joakime - Joakim Erdfelt - joakim.erdfelt@gmail.com - Webtide, LLC - https://webtide.com - -6 - - - sbordet - Simone Bordet - simone.bordet@gmail.com - Webtide, LLC - https://webtide.com - 1 - - - djencks - David Jencks - david.a.jencks@gmail.com - IBM - -8 - - - olamy - Olivier Lamy - oliver.lamy@gmail.com - Webtide, LLC - https://webtide.com - Australia/Brisbane - - - lorban - Ludovic Orban - lorban@bitronix.be - Webtide, LLC - https://webtide.com - 1 - - - - - Webtide - https://webtide.com - - - - - oss.sonatype.org - Jetty Staging Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - oss.sonatype.org - Jetty Snapshot Repository - https://oss.sonatype.org/content/repositories/jetty-snapshots/ - - - diff --git a/tests/jetty-home-tester/pom.xml b/tests/jetty-home-tester/pom.xml index 35bdcf1e272a..116f7934dcac 100644 --- a/tests/jetty-home-tester/pom.xml +++ b/tests/jetty-home-tester/pom.xml @@ -1,14 +1,15 @@ + + + 4.0.0 org.eclipse.jetty.tests tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-home-tester - Tests :: Home Tester jar + Tests :: Home Tester ${project.groupId}.hometester @@ -16,8 +17,9 @@ - org.slf4j - slf4j-api + jakarta.inject + jakarta.inject-api + 1.0.5 org.apache.maven @@ -28,20 +30,6 @@ org.apache.maven maven-resolver-provider - - jakarta.inject - jakarta.inject-api - 1.0.5 - - - org.apache.maven.resolver - maven-resolver-util - ${maven.resolver.version} - - - org.awaitility - awaitility - org.apache.maven.resolver maven-resolver-api @@ -49,12 +37,7 @@ org.apache.maven.resolver - maven-resolver-spi - ${maven.resolver.version} - - - org.apache.maven.resolver - maven-resolver-supplier + maven-resolver-connector-basic ${maven.resolver.version} @@ -71,7 +54,12 @@ org.apache.maven.resolver - maven-resolver-connector-basic + maven-resolver-spi + ${maven.resolver.version} + + + org.apache.maven.resolver + maven-resolver-supplier ${maven.resolver.version} @@ -85,15 +73,28 @@ ${maven.resolver.version} - org.junit.jupiter - junit-jupiter - compile + org.apache.maven.resolver + maven-resolver-util + ${maven.resolver.version} + + + org.awaitility + awaitility org.eclipse.jetty.toolchain jetty-test-helper compile + + org.junit.jupiter + junit-jupiter + compile + + + org.slf4j + slf4j-api + diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index f05747b00c70..3018962be1aa 100644 --- a/tests/jetty-jmh/pom.xml +++ b/tests/jetty-jmh/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.tests tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-jmh Tests :: JMH JMH Tests @@ -15,7 +16,67 @@ true + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty.toolchain + jetty-test-helper + + + org.openjdk.jmh + jmh-core + ${jmh.version} + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh.version} + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + + + + Jetty Jmh Support Classes + + + + + + org.apache.felix @@ -30,10 +91,10 @@ maven-shade-plugin - package shade + package ${jmhjar.name} true @@ -58,65 +119,5 @@ - - - - org.apache.maven.plugins - maven-jar-plugin - - - - - - - Jetty Jmh Support Classes - - - - - - - - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-http - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.openjdk.jmh - jmh-core - ${jmh.version} - - - org.openjdk.jmh - jmh-generator-annprocess - ${jmh.version} - - diff --git a/tests/jetty-test-session-common/pom.xml b/tests/jetty-test-session-common/pom.xml index cbfb60586b9c..98ac8692c182 100644 --- a/tests/jetty-test-session-common/pom.xml +++ b/tests/jetty-test-session-common/pom.xml @@ -1,14 +1,15 @@ + + + 4.0.0 org.eclipse.jetty.tests tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-test-session-common - Tests :: Session Test Tools jar + Tests :: Session Test Tools ${project.groupId}.session.test.tools @@ -16,78 +17,71 @@ - org.slf4j - slf4j-api - - - org.junit.jupiter - junit-jupiter + com.hazelcast + hazelcast compile + true - org.testcontainers - testcontainers + org.eclipse.jetty + jetty-hazelcast compile + true + + + com.hazelcast + hazelcast + + - org.testcontainers - junit-jupiter + org.eclipse.jetty + jetty-infinispan-common compile - - - org.testcontainers - mongodb true - compile org.eclipse.jetty jetty-nosql - true compile + true - org.mongodb - mongo-java-driver - ${mongodb.version} + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager compile + true org.eclipse.jetty.memcached jetty-memcached-sessions - true compile + true org.eclipse.jetty.toolchain jetty-test-helper - true compile + true org.hibernate hibernate-search-engine 5.10.7.Final - true compile - - - org.slf4j - jul-to-slf4j true - compile - org.eclipse.jetty - jetty-infinispan-common - true + org.infinispan + infinispan-client-hotrod compile + true org.infinispan infinispan-core - true compile + true org.wildfly.common @@ -96,39 +90,46 @@ - org.infinispan - infinispan-client-hotrod - true + org.junit.jupiter + junit-jupiter compile - org.eclipse.jetty - jetty-hazelcast - true + org.mongodb + mongo-java-driver + ${mongodb.version} compile - - - com.hazelcast - hazelcast - - - com.hazelcast - hazelcast - true + org.slf4j + jul-to-slf4j compile + true + + + org.slf4j + slf4j-api org.testcontainers gcloud + compile true + + + org.testcontainers + junit-jupiter compile - org.eclipse.jetty.gcloud - jetty-gcloud-session-manager + org.testcontainers + mongodb + compile true + + + org.testcontainers + testcontainers compile diff --git a/tests/pom.xml b/tests/pom.xml index 6ba3a4ff033b..2fcc6a904a4d 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -8,21 +8,21 @@ org.eclipse.jetty.tests tests - Tests pom - - true - true - true - true - + Tests jetty-home-tester jetty-jmh + jetty-test-session-common test-distribution test-integration - jetty-test-session-common + + true + true + true + true + diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 158412b237fb..3ddff1e54f08 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -1,14 +1,21 @@ + + + 4.0.0 org.eclipse.jetty.tests tests 12.0.3-SNAPSHOT - - 4.0.0 test-distribution - Tests :: Distribution pom + Tests :: Distribution + + + test-distribution-common + test-ee10-distribution + test-ee9-distribution + -1 @@ -16,49 +23,21 @@ INFO - - test-distribution-common - test-ee9-distribution - test-ee10-distribution - - - - org.eclipse.jetty.tests - jetty-home-tester - test - jakarta.inject jakarta.inject-api 1.0.5 - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.tests - test-distribution-common - ${project.version} - - - org.eclipse.jetty.tests - test-distribution-common - ${project.version} - test-jar - test - org.apache.maven.resolver - maven-resolver-util + maven-resolver-api ${maven.resolver.version} org.apache.maven.resolver - maven-resolver-api + maven-resolver-connector-basic ${maven.resolver.version} @@ -79,19 +58,41 @@ org.apache.maven.resolver - maven-resolver-connector-basic + maven-resolver-transport-file ${maven.resolver.version} org.apache.maven.resolver - maven-resolver-transport-file + maven-resolver-transport-http ${maven.resolver.version} org.apache.maven.resolver - maven-resolver-transport-http + maven-resolver-util ${maven.resolver.version} + + org.eclipse.jetty.tests + test-distribution-common + ${project.version} + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.tests + jetty-home-tester + test + + + org.eclipse.jetty.tests + test-distribution-common + ${project.version} + test-jar + test + diff --git a/tests/test-distribution/test-distribution-common/pom.xml b/tests/test-distribution/test-distribution-common/pom.xml index 0f126c1e46fc..2dcf49d3c5a2 100644 --- a/tests/test-distribution/test-distribution-common/pom.xml +++ b/tests/test-distribution/test-distribution-common/pom.xml @@ -1,22 +1,59 @@ + + + 4.0.0 org.eclipse.jetty.tests test-distribution 12.0.3-SNAPSHOT - - 4.0.0 test-distribution-common - Tests :: Distribution :: Common jar + Tests :: Distribution :: Common - - 2 ${project.groupId}.tests.distribution.common + + 2 + + org.apache.maven + maven-artifact + + + org.apache.maven + maven-resolver-provider + + + org.apache.maven.resolver + maven-resolver-api + + + org.apache.maven.resolver + maven-resolver-connector-basic + + + org.apache.maven.resolver + maven-resolver-impl + + + org.apache.maven.resolver + maven-resolver-spi + + + org.apache.maven.resolver + maven-resolver-transport-file + + + org.apache.maven.resolver + maven-resolver-transport-http + + + org.apache.maven.resolver + maven-resolver-util + org.codehaus.plexus plexus-xml @@ -27,59 +64,57 @@ - - org.eclipse.jetty.tests - jetty-home-tester - ${project.version} - compile - org.eclipse.jetty jetty-util - org.slf4j - slf4j-api - - - org.apache.maven - maven-artifact + org.eclipse.jetty.ee10 + jetty-ee10-test-badinit-webapp + ${project.version} + war - org.apache.maven - maven-resolver-provider + org.eclipse.jetty.ee9 + jetty-ee9-test-badinit-webapp + ${project.version} + war - org.apache.maven.resolver - maven-resolver-util + org.eclipse.jetty.tests + jetty-home-tester + ${project.version} + compile - org.apache.maven.resolver - maven-resolver-api + org.eclipse.jetty.toolchain + jetty-test-helper - org.apache.maven.resolver - maven-resolver-impl + org.eclipse.jetty.websocket + jetty-websocket-core-client - org.apache.maven.resolver - maven-resolver-spi + org.junit.jupiter + junit-jupiter - org.apache.maven.resolver - maven-resolver-connector-basic + org.slf4j + slf4j-api - org.apache.maven.resolver - maven-resolver-transport-file + org.eclipse.jetty + jetty-client + test - org.apache.maven.resolver - maven-resolver-transport-http + org.eclipse.jetty + jetty-infinispan-common + test org.eclipse.jetty - jetty-util-ajax + jetty-infinispan-remote-query test @@ -90,7 +125,7 @@ org.eclipse.jetty - jetty-client + jetty-util-ajax test @@ -114,40 +149,23 @@ test - org.eclipse.jetty - jetty-infinispan-common - test - - - org.eclipse.jetty - jetty-infinispan-remote-query + org.mariadb.jdbc + mariadb-java-client test - - org.eclipse.jetty.websocket - jetty-websocket-core-client - - - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.junit.jupiter - junit-jupiter - org.testcontainers - testcontainers + gcloud test org.testcontainers - mariadb + junit-jupiter test org.testcontainers - gcloud + mariadb test @@ -157,42 +175,25 @@ org.testcontainers - junit-jupiter - test - - - org.mariadb.jdbc - mariadb-java-client + testcontainers test - - org.eclipse.jetty.ee9 - jetty-ee9-test-badinit-webapp - ${project.version} - war - - - org.eclipse.jetty.ee10 - jetty-ee10-test-badinit-webapp - ${project.version} - war - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.plugin.version} - - - - test-jar - - - - + org.apache.maven.plugins + maven-jar-plugin + ${maven.jar.plugin.version} + + + + test-jar + + + + diff --git a/tests/test-distribution/test-ee10-distribution/pom.xml b/tests/test-distribution/test-ee10-distribution/pom.xml index c680c06e05f2..a4c96fecbacc 100644 --- a/tests/test-distribution/test-ee10-distribution/pom.xml +++ b/tests/test-distribution/test-ee10-distribution/pom.xml @@ -1,14 +1,15 @@ + + + 4.0.0 org.eclipse.jetty.tests test-distribution 12.0.3-SNAPSHOT - - 4.0.0 test-ee10-distribution - Tests :: Distribution :: EE10 jar + Tests :: Distribution :: EE10 ${project.groupId}.ee10.distribution @@ -19,13 +20,13 @@ - - - - - - - + + + + + + + @@ -35,45 +36,39 @@ test-distribution-common - org.eclipse.jetty.tests - test-distribution-common - test-jar - test + org.eclipse.jetty.toolchain + jetty-test-helper + + + org.junit.jupiter + junit-jupiter org.slf4j slf4j-api - org.eclipse.jetty - jetty-slf4j-impl - ${project.version} + jetty-client test org.eclipse.jetty - jetty-client + jetty-openid + ${project.version} test + - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.junit.jupiter - junit-jupiter - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty + jetty-slf4j-impl ${project.version} test - org.eclipse.jetty - jetty-openid + org.eclipse.jetty.ee10 + jetty-ee10-servlet ${project.version} test @@ -84,6 +79,12 @@ war test + + org.eclipse.jetty.tests + test-distribution-common + test-jar + test + diff --git a/tests/test-distribution/test-ee9-distribution/pom.xml b/tests/test-distribution/test-ee9-distribution/pom.xml index fc8782340246..675e7f49c042 100644 --- a/tests/test-distribution/test-ee9-distribution/pom.xml +++ b/tests/test-distribution/test-ee9-distribution/pom.xml @@ -1,31 +1,32 @@ + + + 4.0.0 org.eclipse.jetty.tests test-distribution 12.0.3-SNAPSHOT - - 4.0.0 test-ee9-distribution - Tests :: Distribution :: EE9 jar + Tests :: Distribution :: EE9 ${project.groupId}.ee9.distribution - + - - - - - - - + + + + + + + @@ -35,10 +36,12 @@ test-distribution-common - org.eclipse.jetty.tests - test-distribution-common - test-jar - test + org.eclipse.jetty.toolchain + jetty-test-helper + + + org.junit.jupiter + junit-jupiter org.slf4j @@ -46,32 +49,24 @@ org.eclipse.jetty - jetty-slf4j-impl - ${project.version} + jetty-client test org.eclipse.jetty - jetty-client + jetty-slf4j-impl + ${project.version} test - - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.junit.jupiter - junit-jupiter - org.eclipse.jetty.ee9 - jetty-ee9-servlet + jetty-ee9-openid ${project.version} test org.eclipse.jetty.ee9 - jetty-ee9-openid + jetty-ee9-servlet ${project.version} test @@ -82,6 +77,12 @@ war test + + org.eclipse.jetty.tests + test-distribution-common + test-jar + test + diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 43e0c2986296..c03572783a49 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.tests tests 12.0.3-SNAPSHOT - 4.0.0 test-integration jar Tests :: Integration @@ -16,11 +16,11 @@ org.eclipse.jetty - jetty-server + jetty-client org.eclipse.jetty - jetty-client + jetty-server org.slf4j