Issue #5401 - Moving jetty-http-tools top level project.

+ Ensures that it will be deployed.
+ Adding to generated (aggregate-like) javadoc as well.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

javadoc/pom.xml

@@ -250,6 +250,18 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http-tools</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http-spi</artifactId>

tests/jetty-http-tools/pom.xml → jetty-http-tools/pom.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <groupId>org.eclipse.jetty.tests</groupId>
-    <artifactId>tests-parent</artifactId>
+    <groupId>org.eclipse.jetty</groupId>
+    <artifactId>jetty-project</artifactId>
     <version>10.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-http-tools</artifactId>
-  <name>Jetty Tests :: HTTP Utilities</name>
+  <name>Jetty :: HTTP Testing Utilities</name>
 
   <dependencies>
     <dependency>
@@ -19,6 +19,9 @@
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest</artifactId>
+      <version>${hamcrest.version}</version>
+      <scope>compile</scope>
+      <optional>true</optional>
     </dependency>
   </dependencies>
 </project>

jetty-http-tools/src/main/java/module-info.java

@@ -0,0 +1,27 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under
+// the terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0
+//
+// This Source Code may also be made available under the following
+// Secondary Licenses when the conditions for such availability set
+// forth in the Eclipse Public License, v. 2.0 are satisfied:
+// the Apache License v2.0 which is available at
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+module org.eclipse.jetty.http.tools
+{
+    exports org.eclipse.jetty.http.tools;
+    exports org.eclipse.jetty.http.tools.matchers;
+
+    requires transitive org.eclipse.jetty.http;
+    // Optional - only required if you use hamcrest too.
+    requires static org.hamcrest;
+}

pom.xml

@@ -99,6 +99,7 @@
     <module>jetty-jmx</module>
     <module>jetty-io</module>
     <module>jetty-http</module>
+    <module>jetty-http-tools</module>
     <module>jetty-http2</module>
     <module>jetty-server</module>
     <module>jetty-xml</module>

tests/pom.xml

@@ -59,7 +59,6 @@
   </build>
   <modules>
     <module>jetty-jmh</module>
-    <module>jetty-http-tools</module>
     <module>test-webapps</module>
     <module>test-sessions</module>
     <module>test-loginservice</module>