From 2e67a26dd88091536695a4bc6797d32764fa533b Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Fri, 15 Feb 2019 17:33:29 +0100
Subject: [PATCH 1/2] Issue #3343 - Add an API/tools to be able to test Jetty
 Distribution.

Fixed concurrency issue while reading the console logs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
---
 .../eclipse/jetty/tests/distribution/DistributionTester.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/DistributionTester.java b/tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/DistributionTester.java
index 79a0d206210..0661ca6f7db 100644
--- a/tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/DistributionTester.java
+++ b/tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/DistributionTester.java
@@ -35,6 +35,8 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
@@ -376,7 +378,7 @@ public class DistributionTester
     {
         private final Process process;
         private final List<ConsoleStreamer> consoleStreamers = new ArrayList<>();
-        private final List<String> logs = new ArrayList<>();
+        private final Queue<String> logs = new ConcurrentLinkedQueue<>();
 
         private Run(Process process)
         {

From 8973f01dc4935339743715898ab9dc9e894da5b5 Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Mon, 18 Feb 2019 17:28:23 +1000
Subject: [PATCH 2/2] ensure we use a random for this integration test

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 .../src/it/javax-annotation-api/pom.xml       |  1 +
 .../javax-annotation-api/src/config/jetty.xml | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 jetty-maven-plugin/src/it/javax-annotation-api/src/config/jetty.xml

diff --git a/jetty-maven-plugin/src/it/javax-annotation-api/pom.xml b/jetty-maven-plugin/src/it/javax-annotation-api/pom.xml
index 6b7888878ca..cce36f8e5ee 100644
--- a/jetty-maven-plugin/src/it/javax-annotation-api/pom.xml
+++ b/jetty-maven-plugin/src/it/javax-annotation-api/pom.xml
@@ -81,6 +81,7 @@
                 </systemProperty>
               </systemProperties>
               <nonBlocking>true</nonBlocking>
+              <jettyXml>${basedir}/src/config/jetty.xml</jettyXml>
             </configuration>
           </execution>
         </executions>
diff --git a/jetty-maven-plugin/src/it/javax-annotation-api/src/config/jetty.xml b/jetty-maven-plugin/src/it/javax-annotation-api/src/config/jetty.xml
new file mode 100644
index 00000000000..4fb92bbea50
--- /dev/null
+++ b/jetty-maven-plugin/src/it/javax-annotation-api/src/config/jetty.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+  <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
+    <Set name="secureScheme">https</Set>
+    <Set name="securePort"><Property name="jetty.secure.port" default="8443" /></Set>
+    <Set name="outputBufferSize">32768</Set>
+    <Set name="requestHeaderSize">8192</Set>
+    <Set name="responseHeaderSize">8192</Set>
+    <Set name="headerCacheSize">4096</Set>
+  </New>
+
+  <Call name="addConnector">
+    <Arg>
+      <New class="org.eclipse.jetty.server.ServerConnector">
+        <Arg name="server"><Ref refid="Server" /></Arg>
+        <Arg name="factories">
+          <Array type="org.eclipse.jetty.server.ConnectionFactory">
+            <Item>
+              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                <Arg name="config"><Ref refid="httpConfig" /></Arg>
+              </New>
+            </Item>
+          </Array>
+        </Arg>
+        <Call name="addLifeCycleListener">
+          <Arg>
+            <New class="org.eclipse.jetty.maven.plugin.ServerConnectorListener">
+              <Set name="fileName"><Property name="jetty.port.file" default="port.txt"/></Set>
+            </New>
+          </Arg>
+        </Call>
+        <Set name="host"><Property name="jetty.host" /></Set>
+        <Set name="port"><Property name="jetty.port" default="0" />0</Set>
+        <Set name="idleTimeout">30000</Set>
+      </New>
+    </Arg>
+  </Call>
+</Configure>