Merge branch 'jetty-10.0.x' into jetty-11.0.x

2020-08-12 14:46:24 +08:00 · 2020-08-12 14:46:24 +08:00 · a1946e8512
parent f6d960b41a 2522857a5a
commit a1946e8512
1 changed files with 4 additions and 1 deletions
--- a/jetty-client/src/test/java/org/eclipse/jetty/client/util/InputStreamContentTest.java
+++ b/jetty-client/src/test/java/org/eclipse/jetty/client/util/InputStreamContentTest.java
@ -89,7 +89,10 @@ public class InputStreamContentTest
            server.stop();
    }

-    private static List<BiConsumer<Request, InputStream>> content()
+    /**
+     * need public access to avoid jpms issue
+     */
+    public static List<BiConsumer<Request, InputStream>> content()
    {
        return List.of(
            (request, stream) -> request.body(new InputStreamRequestContent(stream)),