Merge pull request #2281 from joakime/issue-2278-dist-test-dep

Issue #2278 - making distribution pom not require tests
This commit is contained in:
Joakim Erdfelt 2018-03-15 04:45:16 -05:00 committed by GitHub
commit 3f17f7853f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 0 deletions

View File

@ -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>

View File

@ -1770,6 +1770,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>
@ -1780,6 +1783,7 @@
</snapshots>
</repository>
</repositories>
-->
<distributionManagement>
<repository>

View File

@ -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>