From 3c393da3f91ab10d2f6614dce2d2b72542d9336b Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 5 Mar 2018 15:02:00 -0600
Subject: [PATCH] Issue #2278 - making distribution pom not require tests

- Speculative fix to ensure that the users of the jetty-distribution
  do not require the test artifacts to utilize the tarball / zip files
- Also disabled the snapshot repository as it causes false success
- Adding now unreferenced dependency

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 jetty-distribution/pom.xml     | 9 +++++++++
 pom.xml                        | 4 ++++
 tests/test-integration/pom.xml | 5 +++++
 3 files changed, 18 insertions(+)

diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 8c92a955625..32a051f13e7 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -398,29 +398,37 @@
   </build>
 
   <dependencies>
+    <!-- For users of jetty-distribution via maven, none of the following
+         dependencies should be mandatory to function.
+         These only exist to make the reactor sane during the build
+         of jetty-distribution itself -->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-home</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>test-jetty-webapp</artifactId>
       <type>war</type>
       <version>${project.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>test-proxy-webapp</artifactId>
       <type>war</type>
       <version>${project.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.example-async-rest</groupId>
       <artifactId>example-async-rest-webapp</artifactId>
       <version>${project.version}</version>
       <type>war</type>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -428,6 +436,7 @@
       <version>${project.version}</version>
       <classifier>html</classifier>
       <type>zip</type>
+      <optional>true</optional>
     </dependency>
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 5907756de04..0ea022736b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1766,6 +1766,9 @@
     <url>https://webtide.com</url>
   </organization>
 
+  <!-- SNAPSHOT Repository is only for temporary usage.
+       This configuration should not be checked in, as it
+       can result in bad success on CI.
   <repositories>
     <repository>
       <id>jetty-snapshots</id>
@@ -1776,6 +1779,7 @@
       </snapshots>
     </repository>
   </repositories>
+   -->
 
   <distributionManagement>
     <repository>
diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index edb785ca3cb..6e5cc58e119 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -118,6 +118,11 @@
       <artifactId>apache-jsp</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.http2</groupId>
+      <artifactId>http2-server</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.tests</groupId>
       <artifactId>test-webapp-rfc2616</artifactId>