Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
olivier lamy 2021-02-01 10:14:41 +10:00
parent ed77b06165 5b97d91f59
commit 82195e2c5a
16 changed files with 99 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
documentation/jetty-asciidoctor-extensions/pom.xml
View File

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

96
documentation/jetty-documentation/pom.xml
View File

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

2
documentation/jetty-documentation/src/main/asciidoc/operations-guide/.asciidoctorconfig
View File

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

2
documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/chapter.adoc
View File

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

0
documentation/jetty-asciidoctor-extensions/src/main/java/org/eclipse/jetty/docs/programming/ComponentDocs.java → documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/ComponentDocs.java
View File

0
documentation/jetty-asciidoctor-extensions/src/main/java/org/eclipse/jetty/docs/programming/HTTP2Docs.java → documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/HTTP2Docs.java
View File

0
documentation/jetty-asciidoctor-extensions/src/main/java/org/eclipse/jetty/docs/programming/JMXDocs.java → documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/JMXDocs.java
View File

0
documentation/jetty-asciidoctor-extensions/src/main/java/org/eclipse/jetty/docs/programming/SelectorManagerDocs.java → documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/SelectorManagerDocs.java
View File

0
documentation/jetty-asciidoctor-extensions/src/main/java/org/eclipse/jetty/docs/programming/client/ClientConnectorDocs.java → documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/ClientConnectorDocs.java
View File

0
documentation/jetty-asciidoctor-extensions/src/main/java/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java → documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java
View File

0
documentation/jetty-asciidoctor-extensions/src/main/java/org/eclipse/jetty/docs/programming/client/http2/HTTP2ClientDocs.java → documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/http2/HTTP2ClientDocs.java
View File

0
documentation/jetty-asciidoctor-extensions/src/main/java/org/eclipse/jetty/docs/programming/server/ServerDocs.java → documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/ServerDocs.java
View File

0
documentation/jetty-asciidoctor-extensions/src/main/java/org/eclipse/jetty/docs/programming/server/http/HTTPServerDocs.java → documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/http/HTTPServerDocs.java
View File

0
documentation/jetty-asciidoctor-extensions/src/main/java/org/eclipse/jetty/docs/programming/server/http2/HTTP2ServerDocs.java → documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/http2/HTTP2ServerDocs.java
View File

0
documentation/jetty-asciidoctor-extensions/src/main/java/org/eclipse/jetty/docs/programming/server/session/SessionDocs.java → documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/session/SessionDocs.java
View File

7
pom.xml
View File

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