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

jetty · Feb 1, 2021 · 82195e2 · 82195e2
2 parents ed77b06 + 5b97d91
commit 82195e2
Show file tree

Hide file tree

Showing 16 changed files with 99 additions and 88 deletions.
diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml
@@ -21,85 +21,5 @@
       <artifactId>test-distribution</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-jakarta-servlet-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-alpn-server</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-client</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-jmx</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-rewrite</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlets</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util-ajax</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.fcgi</groupId>
-      <artifactId>fcgi-client</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.http2</groupId>
-      <artifactId>http2-http-client-transport</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-slf4j-impl</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.memcached</groupId>
-      <artifactId>jetty-memcached-sessions</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-nosql</artifactId>
-      <version>${project.version}</version>
-    </dependency>
   </dependencies>
 </project>
diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-documentation</artifactId>
   <name>Jetty :: Documentation</name>
-  <packaging>pom</packaging>
+  <packaging>jar</packaging>
 
   <build>
     <plugins>
@@ -27,6 +27,16 @@
             <artifactId>jetty-asciidoctor-extensions</artifactId>
             <version>${project.version}</version>
           </dependency>
+          <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.13</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+          </dependency>
         </dependencies>
         <configuration>
           <backend>html5</backend>
@@ -35,7 +45,7 @@
           </requires>
           <attributes>
             <MAVENREPOSITORY>${settings.localRepository}</MAVENREPOSITORY>
-            <PROJECTDIR>${project.basedir}/..</PROJECTDIR>
+            <PROJECTDIR>${project.basedir}/../..</PROJECTDIR>
             <JDURL>http://www.eclipse.org/jetty/javadoc/${project.version}</JDURL>
             <JXURL>http://download.eclipse.org/jetty/stable-9/xref</JXURL>
             <SRCDIR>${basedir}/..</SRCDIR>
@@ -132,4 +142,86 @@
       </plugin>
     </plugins>
   </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-jakarta-servlet-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-alpn-server</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jmx</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-rewrite</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlets</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util-ajax</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.fcgi</groupId>
+      <artifactId>fcgi-client</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.http2</groupId>
+      <artifactId>http2-http-client-transport</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-slf4j-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.memcached</groupId>
+      <artifactId>jetty-memcached-sessions</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-nosql</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/.asciidoctorconfig b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/.asciidoctorconfig
@@ -1,3 +1,3 @@
 // Asciidoctor IDE configuration file.
 // See https://github.com/asciidoctor/asciidoctor-intellij-plugin/wiki/Support-project-specific-configurations
-:JETTY_HOME: ../../../../../../jetty-home/target/jetty-home
+:JETTY_HOME: ../../../../../../../jetty-home/target/jetty-home
diff --git a/...ation/jetty-documentation/src/main/asciidoc/operations-guide/begin/chapter.adoc b/...ation/jetty-documentation/src/main/asciidoc/operations-guide/begin/chapter.adoc
@@ -16,7 +16,7 @@
 
 This section will get you started with Eclipse Jetty.
 
-include::../../../../../../jetty-home/src/main/resources/README.adoc[tags=quick]
+include::../../../../../../../jetty-home/src/main/resources/README.adoc[tags=quick]
 
 The following sections will guide you in details about downloading, installing and starting Jetty, as well as deploying your web applications to Jetty.
 

diff --git a/...jetty/docs/programming/ComponentDocs.java → ...jetty/docs/programming/ComponentDocs.java b/...jetty/docs/programming/ComponentDocs.java → ...jetty/docs/programming/ComponentDocs.java
diff --git a/...pse/jetty/docs/programming/HTTP2Docs.java → ...pse/jetty/docs/programming/HTTP2Docs.java b/...pse/jetty/docs/programming/HTTP2Docs.java → ...pse/jetty/docs/programming/HTTP2Docs.java
diff --git a/...lipse/jetty/docs/programming/JMXDocs.java → ...lipse/jetty/docs/programming/JMXDocs.java b/...lipse/jetty/docs/programming/JMXDocs.java → ...lipse/jetty/docs/programming/JMXDocs.java
diff --git a/...docs/programming/SelectorManagerDocs.java → ...docs/programming/SelectorManagerDocs.java b/...docs/programming/SelectorManagerDocs.java → ...docs/programming/SelectorManagerDocs.java
diff --git a/...ogramming/client/ClientConnectorDocs.java → ...ogramming/client/ClientConnectorDocs.java b/...ogramming/client/ClientConnectorDocs.java → ...ogramming/client/ClientConnectorDocs.java
diff --git a/...ogramming/client/http/HTTPClientDocs.java → ...ogramming/client/http/HTTPClientDocs.java b/...ogramming/client/http/HTTPClientDocs.java → ...ogramming/client/http/HTTPClientDocs.java
diff --git a/...ramming/client/http2/HTTP2ClientDocs.java → ...ramming/client/http2/HTTP2ClientDocs.java b/...ramming/client/http2/HTTP2ClientDocs.java → ...ramming/client/http2/HTTP2ClientDocs.java
diff --git a/...y/docs/programming/server/ServerDocs.java → ...y/docs/programming/server/ServerDocs.java b/...y/docs/programming/server/ServerDocs.java → ...y/docs/programming/server/ServerDocs.java
diff --git a/...ogramming/server/http/HTTPServerDocs.java → ...ogramming/server/http/HTTPServerDocs.java b/...ogramming/server/http/HTTPServerDocs.java → ...ogramming/server/http/HTTPServerDocs.java
diff --git a/...ramming/server/http2/HTTP2ServerDocs.java → ...ramming/server/http2/HTTP2ServerDocs.java b/...ramming/server/http2/HTTP2ServerDocs.java → ...ramming/server/http2/HTTP2ServerDocs.java
diff --git a/...ogramming/server/session/SessionDocs.java → ...ogramming/server/session/SessionDocs.java b/...ogramming/server/session/SessionDocs.java → ...ogramming/server/session/SessionDocs.java
diff --git a/pom.xml b/pom.xml
@@ -628,6 +628,9 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
           <version>${maven.resources.plugin.version}</version>
+          <configuration>
+            <propertiesEncoding>${project.build.sourceEncoding}</propertiesEncoding>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1359,11 +1362,9 @@
     </profile>
     <profile>
       <id>eclipse-release</id>
-      <!-- Disabled Temporarily: see Issue #5942
       <modules>
         <module>javadoc</module>
       </modules>
-      -->
       <build>
         <plugins>
           <plugin>
@@ -1436,11 +1437,9 @@
         <spotbugs.skip>false</spotbugs.skip>
         <spotbugs.onlyAnalyze>org.eclipse.jetty.*</spotbugs.onlyAnalyze>
       </properties>
-      <!-- Disabled Temporarily: see Issue #5942
       <modules>
         <module>javadoc</module>
       </modules>
-      -->
       <build>
         <pluginManagement>
           <plugins>