Commit Graph

24 Commits

Author SHA1 Message Date
Joakim Erdfelt 3f0f57cefc Updating to version 11.0.2-SNAPSHOT 2021-02-19 16:20:48 -06:00
Joakim Erdfelt e98092c179 Updating to version 11.0.1 2021-02-19 16:02:24 -06:00
Simone Bordet c7d942fefa Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-19 18:39:53 +01:00
Simone Bordet d425c9722c Improvements to the Jetty documentation.
Restructured the programming guide.
Added collapsible TOC.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-19 18:37:12 +01:00
Simone Bordet a495539f53 Improvements to the Jetty documentation.
Added the custom module section.
Shortened titles to better fit the TOC.
Enlarged content from 62.5em to 80em.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-19 16:50:37 +01:00
Simone Bordet 19319766ce Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-17 17:55:16 +01:00
Simone Bordet 322d1018a7 Improvements to the Jetty documentation.
Documented the Jetty modules.

Improved the TOC javascript, as it was not working if the link had sub-elements.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-17 15:58:36 +01:00
Joakim Erdfelt 01fb5769f4
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-15 14:18:34 -06:00
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
Jan Bartel d6d648316a
Issue #5941 Use Glassfish JSTL impl (#5942)
* Issue #5941 Use Glassfish JSTL impl

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-02-10 22:21:22 +01:00
Simone Bordet e4baac75ad Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-10 11:32:15 +01: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
Jan Bartel ec143aa0c5 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-09 09:55:50 +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
olivier lamy 82195e2c5a Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-02-01 10:14:41 +10: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 eca4fbcd98 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-01-29 12:50:50 +10: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
olivier lamy 8d776fc589 fix version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-01-29 12:48:54 +10:00
olivier lamy 453f4e91e8 fix servlet api artifactId
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-01-29 12:43:14 +10:00
Joakim Erdfelt 62b10a01f0
Fixing version fallout from last merge. 2021-01-28 16:16:00 -06:00
Joakim Erdfelt a6804ed207
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-01-28 16:10:23 -06: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