From 3d3c95462a7344a56e677b452e074783b040271e Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 7 Dec 2022 07:51:59 -0600 Subject: [PATCH 1/2] Fixing OSGi bundle + tycho-p2 build failures (#9017) * Fixing errors/warnings from maven-bundle-plugin * avoid issues with eclipse ranges * Fixing version of p2.core * revert bach tycho eclipse plugin to last working version 2.7.5 Signed-off-by: Joakim Erdfelt Signed-off-by: Olivier Lamy Co-authored-by: Olivier Lamy --- documentation/jetty-asciidoctor-extensions/pom.xml | 4 ++++ documentation/jetty-documentation/pom.xml | 4 ++++ jetty-p2/pom.xml | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml index 627ebdf93ba..ac1116f07ae 100644 --- a/documentation/jetty-asciidoctor-extensions/pom.xml +++ b/documentation/jetty-asciidoctor-extensions/pom.xml @@ -11,6 +11,10 @@ Jetty :: Documentation :: AsciiDoctor Extensions jar + + ${project.groupId}.asciidoctor.extensions + + org.asciidoctor diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index a356ebbfdb6..1f55d207081 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -11,6 +11,10 @@ Jetty :: Documentation jar + + ${project.groupId} + + diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml index 5d763dbaa63..fc042253ca8 100644 --- a/jetty-p2/pom.xml +++ b/jetty-p2/pom.xml @@ -12,7 +12,7 @@ Generates a (maven based) P2 Updatesite pom - 3.0.0 + 2.7.5 From 2538a91201ac85e3b184c329bfc7987a152b3636 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Wed, 7 Dec 2022 16:20:22 +0100 Subject: [PATCH 2/2] Fixes flaky FCGI test HttpClientTest.testPOSTWithContentTracksProgress(). The content must be consumed by the server, otherwise: * the server Handler exits * the implementation tries to consume the content on its way to complete * the request content cannot be consumed, so the connection is closed * the server closing the connection causes an EOFException on the client Signed-off-by: Simone Bordet --- .../org/eclipse/jetty/fcgi/server/HttpClientTest.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java index 442ccba3831..b5ddc0ecea9 100644 --- a/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java +++ b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java @@ -14,6 +14,7 @@ package org.eclipse.jetty.fcgi.server; import java.io.IOException; +import java.io.OutputStream; import java.net.URI; import java.net.URLEncoder; import java.nio.ByteBuffer; @@ -351,7 +352,15 @@ public class HttpClientTest extends AbstractHttpClientServerTest @Test public void testPOSTWithContentTracksProgress() throws Exception { - start(new EmptyServerHandler()); + start(new AbstractHandler() + { + @Override + public void handle(String target, org.eclipse.jetty.server.Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + baseRequest.setHandled(true); + IO.copy(baseRequest.getInputStream(), OutputStream.nullOutputStream()); + } + }); AtomicInteger progress = new AtomicInteger(); ContentResponse response = client.POST(scheme + "://localhost:" + connector.getLocalPort())