Commit Graph

27538 Commits

Author SHA1 Message Date
Joakim Erdfelt 4563f7a90e
Merge pull request #9439 from eclipse/fix/10.0.x/dependabot-rollup
Dependency Rollup (and fixes) for `jetty-10.0.x`
2023-02-26 07:03:13 -06:00
Joakim Erdfelt e68c7139dd
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.apache.kerby-kerb-simplekdc-2.0.3' into fix/10.0.x/dependabot-rollup
# Conflicts:
#	pom.xml
2023-02-24 15:46:06 -06:00
Joakim Erdfelt c612897314
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.apache.logging.log4j-log4j-api-2.20.0' into fix/10.0.x/dependabot-rollup 2023-02-24 15:45:39 -06:00
Joakim Erdfelt 32fa528e12
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-assembly-plugin-3.5.0' into fix/10.0.x/dependabot-rollup 2023-02-24 15:45:36 -06:00
Joakim Erdfelt d60c1dae36
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.eclipse.tycho-tycho-p2-repository-plugin-3.0.3' into fix/10.0.x/dependabot-rollup 2023-02-24 15:45:34 -06:00
Joakim Erdfelt 594299b58d
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.infinispan.protostream-protostream-4.6.1.Final' into fix/10.0.x/dependabot-rollup 2023-02-24 15:45:31 -06:00
Joakim Erdfelt a0a8ca24e2
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.wildfly.security-wildfly-elytron-2.1.0.Final' into fix/10.0.x/dependabot-rollup 2023-02-24 15:45:25 -06:00
Joakim Erdfelt e3d5304305
Merge pull request #9420 from eclipse/dependabot/maven/jetty-11.0.x/org.apache.maven.plugins-maven-assembly-plugin-3.5.0
Bump maven-assembly-plugin from 3.4.2 to 3.5.0
2023-02-24 09:15:12 -06:00
dependabot[bot] a224ff0b7b
Bump tycho-p2-repository-plugin from 3.0.2 to 3.0.3
Bumps tycho-p2-repository-plugin from 3.0.2 to 3.0.3.

---
updated-dependencies:
- dependency-name: org.eclipse.tycho:tycho-p2-repository-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-24 00:55:03 +00:00
dependabot[bot] 699400d1da
Bump kerb-simplekdc from 2.0.2 to 2.0.3
Bumps kerb-simplekdc from 2.0.2 to 2.0.3.

---
updated-dependencies:
- dependency-name: org.apache.kerby:kerb-simplekdc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-24 00:51:12 +00:00
dependabot[bot] 152d97b1d7
Bump maven-assembly-plugin from 3.4.2 to 3.5.0
Bumps [maven-assembly-plugin](https://github.com/apache/maven-assembly-plugin) from 3.4.2 to 3.5.0.
- [Release notes](https://github.com/apache/maven-assembly-plugin/releases)
- [Commits](https://github.com/apache/maven-assembly-plugin/compare/maven-assembly-plugin-3.4.2...maven-assembly-plugin-3.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-24 00:50:09 +00:00
dependabot[bot] 17fd9e60a6
Bump protostream from 4.6.0.Final to 4.6.1.Final
Bumps [protostream](https://github.com/infinispan/protostream) from 4.6.0.Final to 4.6.1.Final.
- [Release notes](https://github.com/infinispan/protostream/releases)
- [Commits](https://github.com/infinispan/protostream/compare/4.6.0.Final...4.6.1.Final)

---
updated-dependencies:
- dependency-name: org.infinispan.protostream:protostream
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-24 00:48:30 +00:00
dependabot[bot] bc08cfce55
Bump log4j-api from 2.19.0 to 2.20.0
Bumps [log4j-api](https://github.com/apache/logging-log4j2) from 2.19.0 to 2.20.0.
- [Release notes](https://github.com/apache/logging-log4j2/releases)
- [Changelog](https://github.com/apache/logging-log4j2/blob/release-2.x/CHANGELOG.adoc)
- [Commits](https://github.com/apache/logging-log4j2/compare/rel/2.19.0...rel/2.20.0)

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-24 00:44:52 +00:00
dependabot[bot] f4c85f7de0
Bump wildfly-elytron from 2.0.0.Final to 2.1.0.Final
Bumps [wildfly-elytron](https://github.com/wildfly-security/wildfly-elytron) from 2.0.0.Final to 2.1.0.Final.
- [Release notes](https://github.com/wildfly-security/wildfly-elytron/releases)
- [Commits](https://github.com/wildfly-security/wildfly-elytron/compare/2.0.0.Final...2.1.0.Final)

---
updated-dependencies:
- dependency-name: org.wildfly.security:wildfly-elytron
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-24 00:43:16 +00:00
dependabot[bot] c739e3228b
Bump maven.resolver.version from 1.9.4 to 1.9.5
Bumps `maven.resolver.version` from 1.9.4 to 1.9.5.

Updates `maven-resolver-api` from 1.9.4 to 1.9.5
- [Release notes](https://github.com/apache/maven-resolver/releases)
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.4...maven-resolver-1.9.5)

Updates `maven-resolver-util` from 1.9.4 to 1.9.5
- [Release notes](https://github.com/apache/maven-resolver/releases)
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.4...maven-resolver-1.9.5)

Updates `maven-resolver-spi` from 1.9.4 to 1.9.5
- [Release notes](https://github.com/apache/maven-resolver/releases)
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.4...maven-resolver-1.9.5)

Updates `maven-resolver-impl` from 1.9.4 to 1.9.5
- [Release notes](https://github.com/apache/maven-resolver/releases)
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.4...maven-resolver-1.9.5)

Updates `maven-resolver-connector-basic` from 1.9.4 to 1.9.5
- [Release notes](https://github.com/apache/maven-resolver/releases)
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.4...maven-resolver-1.9.5)

Updates `maven-resolver-transport-file` from 1.9.4 to 1.9.5
- [Release notes](https://github.com/apache/maven-resolver/releases)
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.4...maven-resolver-1.9.5)

Updates `maven-resolver-transport-http` from 1.9.4 to 1.9.5
- [Release notes](https://github.com/apache/maven-resolver/releases)
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.4...maven-resolver-1.9.5)

---
updated-dependencies:
- dependency-name: org.apache.maven.resolver:maven-resolver-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-util
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-spi
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-impl
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-connector-basic
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-transport-file
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-transport-http
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-24 00:39:56 +00:00
dependabot[bot] 61c8592abe
Bump maven-assembly-plugin from 3.4.2 to 3.5.0
Bumps [maven-assembly-plugin](https://github.com/apache/maven-assembly-plugin) from 3.4.2 to 3.5.0.
- [Release notes](https://github.com/apache/maven-assembly-plugin/releases)
- [Commits](https://github.com/apache/maven-assembly-plugin/compare/maven-assembly-plugin-3.4.2...maven-assembly-plugin-3.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-24 00:36:36 +00:00
Jan Bartel 3a5a91aff2 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-02-24 11:16:43 +11:00
Jan Bartel e358f793ca Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-02-24 11:15:17 +11:00
Jan Bartel de3adc861d
Update version limits for dependencies (#9406) 2023-02-24 11:14:12 +11:00
Greg Wilkins 6c114b00db
Improve CookieCompliance testing (#9399)
Improved handling of CookieCompliance.from method
Added tests for request and response cookie handling
Use from in jetty.xml

Signed-off-by: gregw <gregw@webtide.com>
2023-02-23 20:35:51 +11:00
gregw 791c6a7991 Disabled the HugeResourceTest 2023-02-23 15:48:49 +11:00
Jan Bartel 63e201dafe Give longer timeout for CI 2023-02-23 13:19:28 +11:00
Jan Bartel 4e97a59671
Issue #9403 sendError(404) not setError(404) for DefaultServlet (#9404) 2023-02-22 17:24:57 +11:00
Jan Bartel 3f24cc4f0a Fix bad merges from jetty-11 2023-02-22 16:45:07 +11:00
Jan Bartel ed04e19282 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-02-22 16:18:07 +11:00
Olivier Lamy 5e1f579f72 revert upgrade from 3aaa65c45a
Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-02-22 15:10:24 +10:00
Jan Bartel 135f14f0d0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-02-22 15:35:57 +11:00
Jan Bartel b7075161d0 Fix osgi dependencies for update to org.eclipse.osgi.services. 2023-02-22 15:21:22 +11:00
Jan Bartel bee5cca86a Add ignore .checkstyle 2023-02-22 15:20:43 +11:00
gregw 20f5126a50 fix style
Signed-off-by: gregw <gregw@webtide.com>
2023-02-21 22:51:07 +11:00
gregw af8bd97f55 Fixed Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
# Conflicts:
#	jetty-core/jetty-http/src/test/java/org/eclipse/jetty/http/RFC6265CookieParserLenientTest.java
#	jetty-core/jetty-http/src/test/java/org/eclipse/jetty/http/RFC6265CookieParserTest.java
#	jetty-core/jetty-server/src/main/config/etc/jetty.xml
#	jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ServerHttpCookieTest.java
#	jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/Cookies.java
#	jetty-http/src/main/java/org/eclipse/jetty/http/HttpCookie.java
#	pom.xml
2023-02-21 22:17:21 +11:00
gregw e7d3181e7b fixing merge
Signed-off-by: gregw <gregw@webtide.com>
2023-02-21 22:09:51 +11:00
gregw b720d65f4f Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-02-21 22:01:31 +11:00
gregw 96de11fec8 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
Signed-off-by: gregw <gregw@webtide.com>
2023-02-21 21:38:12 +11:00
Greg Wilkins 4d146412c8
Fix #9334 Cookie Compliance (#9402)
Fix incorrect change to RFC6265 to not support dollars in cookie names.

Signed-off-by: gregw <gregw@webtide.com>
2023-02-21 21:31:43 +11:00
gregw 3bdd75f682 Set server on default handler
Fixes #9398 and #9322
2023-02-20 19:22:11 +11:00
Lachlan fb7b5d42ce
Merge pull request #9395 from eclipse/jetty-12.0.x-9182-JakartaWebSocketServetContainer
Issue #9182 - make JakartaWSSCI.initialize() and JakartaWebSocketServerContainer public
2023-02-17 22:50:07 +11:00
Lachlan Roberts d6ff799588 Issue #9182 - make JakartaWSSCI.initialize() and JakartaWebSocketServerContainer public
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-02-17 18:02:49 +11:00
Lachlan 81046650ab
Merge pull request #9356 from eclipse/jetty-12.0.x-websocket-JPMS
cleanup of websocket to fix JPMS warnings
2023-02-17 15:30:54 +11:00
Lachlan Roberts 41d550047f ensure the WebSocketConnection is set on the WebSocketCoreSession
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-02-17 14:05:48 +11:00
Lachlan Roberts 05fb8127d9 remove osgi internal imports for websocket-core
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-02-17 11:41:03 +11:00
Lachlan Roberts 229b300f22 rename WebSocketUtil to WebSocketUtils
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-02-17 11:37:01 +11:00
Lachlan Roberts eb493f1b9d make WebSocketCoreSession public & other fixes
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-02-17 11:33:02 +11:00
Simone Bordet a8737cd170
Javadocs for Response and Context. (#9388)
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
2023-02-17 10:47:16 +11:00
Simone Bordet d21f38798e
Moved implementation methods ensure*() from the Response interface (#9390)
to ResponseUtils to avoid cluttering the main Response interface.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-17 08:50:46 +11:00
Jan Bartel ea042776bd
Reinstate ee9 jetty runner. (#9383) 2023-02-17 08:34:14 +11:00
gregw af78d13030 Fix #9387 2023-02-17 08:11:55 +11:00
Greg Wilkins 0ca6295cbc
Rename process to handle (#9385)
Renamed Request.Processor to Request.Handler
Renamed Handler.process to Handler.handle
Renamed Rule.Processor to Rule.Handler.
Renamed accordingly methods and variable.
Updated comments accordingly.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-16 18:21:12 +01:00
dependabot[bot] a6b1de5599 Bump maven-deploy-plugin from 3.0.0 to 3.1.0
Bumps [maven-deploy-plugin](https://github.com/apache/maven-deploy-plugin) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/apache/maven-deploy-plugin/releases)
- [Commits](https://github.com/apache/maven-deploy-plugin/compare/maven-deploy-plugin-3.0.0...maven-deploy-plugin-3.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-16 13:44:13 +10:00
dependabot[bot] cbe98faef6 Bump asciidoctorj-diagram from 2.2.3 to 2.2.4
Bumps [asciidoctorj-diagram](https://github.com/asciidoctor/asciidoctorj-diagram) from 2.2.3 to 2.2.4.
- [Release notes](https://github.com/asciidoctor/asciidoctorj-diagram/releases)
- [Commits](https://github.com/asciidoctor/asciidoctorj-diagram/compare/v2.2.3...v2.2.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-16 13:44:10 +10:00