Commit Graph

7 Commits

Author SHA1 Message Date
Joakim Erdfelt d6ec96fe1b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-15 14:18:08 -06:00
Simone Bordet 29d48b0de5 Improvements to the Jetty documentation.
Documented the Jetty start mechanism.

Reorganized the documentation to look better on the TOC.

Improved JettyIncludeExtension to support replacements, deletions and callouts.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-10 11:27:30 +01:00
Simone Bordet 4c67b886a4 Merged branch 'jetty-10.0.x-more_docs' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-03 19:46:54 +01:00
Simone Bordet 2f766632b3 Fixes #5924 - Javadoc build triggers maven error
Fixed javadoc generation error.
Apparently, this is caused by a doxia dependency of asciidoctor-maven-plugin
that transitively pulls in Apache HttpClient, but at an older version
that causes this error:

Exception in thread “main” java.lang.NoSuchMethodError: ‘org.apache.http.HttpHost org.apache.http.client.utils.URIUtils.extractHost(java.net.URI)’

Adding Apache HttpClient as an explicit dependency of the asciidoctor-maven-plugin
works around the issue.

Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-01 00:32:24 +01:00
Simone Bordet f4323a3e3f Improvements to the Jetty documentation.
Moved documentation examples back into jetty-documentation module.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-01 00:24:13 +01:00
olivier lamy f80792f377 version from pom interpolation and fix mvn central url
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-01-29 12:50:23 +10:00
Joakim Erdfelt 618bff71e2
Issue #5924 - Reorganized jetty-documentation
* New top level /documentation/
  Which is a parent pom
* Existing /jetty-documentation/ moved to new
  /documentation/jetty-documentation/ location
* New /documentation/jetty-asciidoctor-extensions/ project
  Created from the java code in the old
  /jetty-documentation/src/main/ tree
* Referencing new jetty-asciidoctor-extensions project
  in asciidoc plugin on /documentation/jetty-documentation/pom.xml
* All projects in /documentation/ are now on
  org.eclipse.jetty.documentation groupId

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-28 10:49:21 -06:00