Commit Graph

154 Commits

Author SHA1 Message Date
Jan Bartel 514ce5f07a Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-26 08:57:47 +11:00
Simone Bordet 2ad0a2cd02
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-25 17:21:46 +01:00
Simone Bordet d1e0a7f612 Do not hard fail the documentation if Java < 19.
Require Java 19 to build the release.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-25 17:21:01 +01:00
Joakim Erdfelt be16b1640b
Only allow skipping of asciidoc, not assembly 2022-11-17 19:43:05 -06:00
Joakim Erdfelt a13ae1a60f
Can't skip docs with skipTests 2022-11-17 19:34:20 -06:00
Olivier Lamy 6b1611592d
merge back release branch to bump version to 11.0.13-SNAPSHOT (#8594)
* Updating to version 11.0.12

* Updating to version 11.0.13-SNAPSHOT

* add release jetty-9.4.49.v20220914 and 10.0.12 in VERSION.TXT
2022-09-16 19:50:26 +10:00
Olivier Lamy dbd07146ec
merge back release branch to bump version to 10.0.13-SNAPSHOT (#8593)
* Updating to version 10.0.12

* Updating to version 10.0.13-SNAPSHOT

* VERSION.TXT =+ content of jetty-9.4.49.v20220914 release

* remove strange line and reorder
2022-09-16 19:50:12 +10:00
Simone Bordet 122b095260
Jetty 12 module renaming - jetty-http3.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 09:33:31 +02:00
Simone Bordet 7d264e6024
Jetty 12 module renaming - jetty-http2.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 09:33:31 +02:00
Simone Bordet 11c3642892
Jetty 12 module renaming - jetty-fcgi.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 09:33:31 +02:00
Simone Bordet e4de4fd189
Re-enabled the documentation module. (#8326)
Re-enabled the documentation module.

Now using ee10 rather than ee9.
Updated sources to reference ee10 implementation classes.
Now -DskipTests will compile the documentation classes but not build the documentation, saving time when building.

Much more work to do to update the documentation for Jetty 12.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-07-22 13:41:09 +02:00
Greg Wilkins 235f34c2e2 Added core demo 2022-07-14 21:54:50 +10:00
Joakim Erdfelt eddff4d2ee
Merge Release 11.0.11 back into `jetty-11.0.x` (#8193)
* Updating to version 11.0.11

* Updating to version 11.0.12-SNAPSHOT
2022-06-22 16:24:57 -05:00
Joakim Erdfelt 64d12e2a5a
Merge Release 10.0.11 back into `jetty-10.0.x` branch (#8194)
* Updating to version 10.0.11

* Updating to version 10.0.12-SNAPSHOT
2022-06-22 16:24:48 -05:00
Joakim Erdfelt 8149350c10
Merge Release 11.0.10 back into `jetty-11.0.x` (#8181)
* Updating to version 11.0.11-SNAPSHOT
2022-06-21 14:45:00 +02:00
Joakim Erdfelt c2bc103cb9
Merge Release 10.0.10 back into `jetty-10.0.x` (#8180)
* Updating to version 10.0.11-SNAPSHOT
2022-06-21 14:41:41 +02:00
Simone Bordet cbeeb67e93
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-06-01 15:18:53 +02:00
Simone Bordet 0571be5cee
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-06-01 12:59:58 +02:00
Joakim Erdfelt 40ba7bae6e
Fixing upper bounds issue
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-05-31 14:18:04 -05:00
Greg Wilkins 04acdb72f0 Jetty-12 Restructure
Copied over non ee10 components from the hackathon branch

Co-authored-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Ludovic Orban <lorban@webtide.com>
Co-authored-by: Olivier Lamy <olamy@webtide.com>
Co-authored-by: Simone Bordet <sbordet@webtide.com>
2022-05-03 15:50:54 +02:00
Joakim Erdfelt 16420f0181
Set version to `10.0.10-SNAPSHOT` (#7823)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-04-03 20:33:44 +10:00
Joakim Erdfelt f079949a35
Merge Release 10.0.9 (#7821)
* Updating to version 10.0.9

* Updating to version 10.0.10
2022-04-02 08:43:44 -05:00
Joakim Erdfelt 9548ab0cc9 Updating to version 11.0.10-SNAPSHOT 2022-03-30 13:06:46 -05:00
Joakim Erdfelt 243a48a658 Updating to version 11.0.9 2022-03-30 12:43:51 -05:00
Simone Bordet 4e02be57fd
Updating to version 11.0.9-SNAPSHOT 2022-02-07 12:42:04 +01:00
Simone Bordet 79cc9cf90e
Updating to version 11.0.8 2022-02-07 12:10:09 +01:00
Simone Bordet a4fda96f49
Updating to version 10.0.9-SNAPSHOT 2022-02-07 12:02:02 +01:00
Simone Bordet 716c7afd8e
Updating to version 10.0.8 2022-02-07 11:34:12 +01:00
Simone Bordet 8cf35998fe
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-01-12 17:12:47 +01:00
Simone Bordet 51123c7cd1
Fixes #7369 - Document CustomRequestLog
Added documentation to the programming guide.
Removed related old documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-01-12 17:12:01 +01:00
Simone Bordet 2de20c3520
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-12-20 10:00:26 +01:00
Simone Bordet 10c2ffb996 Issue #6728 - QUIC and HTTP/3
Documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-12-20 09:33:38 +01:00
Joakim Erdfelt b67ffd3d2d Updating to version 11.0.8-SNAPSHOT 2021-10-06 15:16:07 -05:00
Joakim Erdfelt 389a358772 Updating to version 11.0.7 2021-10-06 14:58:52 -05:00
Joakim Erdfelt cfc67f86d2 Updating to version 10.0.8-SNAPSHOT 2021-10-06 14:51:32 -05:00
Joakim Erdfelt da8a4553af Updating to version 10.0.7 2021-10-06 14:32:37 -05:00
Olivier Lamy 4011f1e71e
merge jetty-10.0.x (#6945) 2021-09-30 20:41:49 +10:00
Olivier Lamy 51d44a3401
use dependencyManagement for internal dependencies (#6940)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-09-30 16:57:19 +10:00
Joakim Erdfelt 85c7250d1a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-09-22 17:10:49 -05:00
Joakim Erdfelt 8dd62838f7
Initial cleanup / reorg of dependencies
+ All plugins and dependencies are alphabetized now
+ All plugins and dependency versions have properties now

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-09-22 09:54:52 -05:00
Simone Bordet 38a5d41117
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-09-15 21:06:15 +02:00
Simone Bordet 4793092f9d
Fixes #5229 - WebSocket documentation. (#6623)
Added WebSocket server-side documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-09-15 19:42:27 +02:00
Joakim Erdfelt 245036eba5
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-09-13 18:22:52 -05:00
Joakim Erdfelt e629e1c26e
Merge pull request #6797 from eclipse/jetty-10.0.x-version-rollup
Rollup of version changes for 10.0.x
2021-09-13 18:20:27 -05:00
Olivier Lamy d90c7152d5 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-09-14 06:21:42 +10:00
dependabot[bot] b44dde6098
Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0 (#6755)
* Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0

Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.0.0-M3 to 3.0.0.
- [Release notes](https://github.com/apache/maven-enforcer/releases)
- [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.0.0-M3...enforcer-3.0.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-enforcer-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix some upper bound issues and exclude more javax

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

* fix upperbound dependencies issue with enforcer plugin upgrade

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

* exclude this wrong which makes enforcer plugin fail and btw it's not used

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

* fix last enforcer upperbound issues

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-09-14 06:10:48 +10:00
Joakim Erdfelt ef1b29c48f
Bump httpcore to 4.4.14
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-09-13 11:42:14 -05:00
dependabot[bot] afad04a4d8
Bump asciidoctorj-diagram from 2.0.5 to 2.2.1 (#6779)
Bumps [asciidoctorj-diagram](https://github.com/asciidoctor/asciidoctorj-diagram) from 2.0.5 to 2.2.1.
- [Release notes](https://github.com/asciidoctor/asciidoctorj-diagram/releases)
- [Commits](https://github.com/asciidoctor/asciidoctorj-diagram/compare/v2.0.5...v2.2.1)

---
updated-dependencies:
- dependency-name: org.asciidoctor:asciidoctorj-diagram
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-13 10:22:09 -05:00
Simone Bordet 832b7a0be0
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-08-05 10:18:39 +02:00
Simone Bordet 49a08450c2
Fixes #6043 - Reimplement UnixSocket support based on Java 16. (#6522)
Fixes #6043 - Reimplement UnixSocket support based on Java 16.

* Introduced new module "jetty-server-unixdomain".
It uses reflection to access the Java 16 Unix-Domain classes to keep compatibility with the other modules and the build.
* Added Jetty module with only HTTP/1.1 support for now (requires review of the modules to reuse them with various connectors).
* Updated documentation to mention UnixDomainServerConnector.
* Updated client libraries to support Unix-Domain.
* Updated PROXY protocol implementation to support Unix-Domain.
* Replaced unix.socket.tmp with better named jetty.unixdomain.dir property.
Defaulted jetty.unixdomain.dir property to system property user.home under Windows.
Simplified code that runs Unix-Domain tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-08-05 10:04:37 +02:00
Simone Bordet 587c75068c Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-07-16 18:13:41 +02:00
Simone Bordet f240d7ac42 Updated plugin to redact the Jetty version.
This allows to generate the documentation for a version different than the POM's.

Updated Asciidoctor attributes, removing the unused ones and converting them
all to kebab-case (lower case separated by dash), as Asciidoctor requires them
to be lowercase.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-07-16 17:11:13 +02:00
Joakim Erdfelt 102caac3fe Updating to version 11.0.7-SNAPSHOT 2021-06-29 11:40:18 -05:00
Joakim Erdfelt 6946943289 Updating to version 11.0.6 2021-06-29 11:15:33 -05:00
Joakim Erdfelt c245a70893 Updating to version 10.0.7-SNAPSHOT 2021-06-29 10:51:22 -05:00
Joakim Erdfelt 37e7731b4b Updating to version 10.0.6 2021-06-29 10:27:56 -05:00
Joakim Erdfelt 89d2ea0192 Updating to version 11.0.6-SNAPSHOT 2021-06-11 10:12:15 -05:00
Joakim Erdfelt 50df216262 Updating to version 11.0.5 2021-06-11 09:52:40 -05:00
Joakim Erdfelt 9d2d1e29b7 Updating to version 10.0.6-SNAPSHOT 2021-06-11 09:42:42 -05:00
Joakim Erdfelt dc21b2d73c Updating to version 10.0.5 2021-06-11 09:18:00 -05:00
Joakim Erdfelt 063e8c80d5 Updating to version 11.0.5-SNAPSHOT 2021-06-04 13:53:06 -05:00
Joakim Erdfelt 5bcdeb52ae Updating to version 11.0.4 2021-06-04 13:35:11 -05:00
Joakim Erdfelt 987066aac1 Updating to version 10.0.5-SNAPSHOT 2021-06-04 13:28:47 -05:00
Joakim Erdfelt 5523480c54 Updating to version 10.0.4 2021-06-04 13:09:44 -05:00
Simone Bordet a83bff553c Updated POM versions to 11.0.4-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-21 17:16:21 +02:00
Simone Bordet 9ace21992e Updated POM versions to 10.0.4-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-21 17:07:46 +02:00
Simone Bordet 560733b5ac Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-27 11:08:37 +02:00
Simone Bordet 8b10f3ebd5 Documented WebSocketClient.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-27 11:04:42 +02:00
Joakim Erdfelt d51f724a40
Fixing build 2021-04-16 08:54:06 -05:00
Chris Walker 12eabd856c Updating POM for documentation
Signed-off-by: Chris Walker <chris@webtide.com>
2021-04-15 18:30:47 -05:00
Chris Walker f5074cde23 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-04-15 18:29:05 -05:00
Chris Walker d825299da4
Fixing documentation pom values (#6181) 2021-04-15 18:19:50 -05:00
Chris Walker d30281be7e
Fixing JDURL per #6110 2021-03-29 09:57:11 -05:00
Chris Walker b0e825fe1a
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-03-29 09:56:10 -05:00
Chris Walker 722f4ec2e3
Fix JDURL. Resolves #6110 2021-03-29 09:52:58 -05:00
Olivier Lamy 3ee2ba7172 Updating to version 11.0.3-SNAPSHOT 2021-03-26 06:58:38 +00:00
Olivier Lamy 14ed9a5264 Updating to version 11.0.2 2021-03-26 06:41:47 +00:00
Olivier Lamy a0796d1055 Updating to version 10.0.3-SNAPSHOT 2021-03-26 06:31:31 +00:00
olivier lamy 61b5e1a8af revert back to 11.0.2-SNAPSHOT
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-03-26 16:15:49 +10:00
Olivier Lamy 7bd207b309 Updating to version 10.0.2 2021-03-26 06:13:42 +00:00
Olivier Lamy d27363fa55 back to 10.0.2-SNAPSHOT
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-03-26 06:10:47 +00:00
Jesse McConnell e1f2f8c989
Updating to version 11.0.3-SNAPSHOT 2021-03-25 11:14:04 -05:00
Jesse McConnell 0a126e2e21
Updating to version 11.0.2 2021-03-25 10:58:33 -05:00
Jesse McConnell 7a9e01ac56
Updating to version 10.0.3-SNAPSHOT 2021-03-25 10:38:15 -05:00
Jesse McConnell aac6bfbd48
Updating to version 10.0.2 2021-03-25 10:21:44 -05:00
Simone Bordet 6fca106160 Reverted version to 10.0.2-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 16:02:45 +01:00
Olivier Lamy 3d0574d64c Updating to version 10.0.3-SNAPSHOT 2021-03-25 04:10:39 +00:00
Olivier Lamy ab235ad687 Updating to version 10.0.2 2021-03-25 03:57:25 +00:00
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
Joakim Erdfelt 8ed8dc62e3 Updating to version 10.0.2-SNAPSHOT 2021-02-19 13:06:42 -06:00
Joakim Erdfelt d0bfd9145d Updating to version 10.0.1 2021-02-19 12:43:50 -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 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 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
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