Commit Graph

25998 Commits

Author SHA1 Message Date
Olivier Lamy cebf97375f
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-12-28 16:45:05 +10:00
dependabot[bot] ae7ff8de71
Bump org.eclipse.osgi.services from 3.11.0 to 3.11.100
Bumps [org.eclipse.osgi.services](https://github.com/eclipse-equinox/equinox) from 3.11.0 to 3.11.100.
- [Release notes](https://github.com/eclipse-equinox/equinox/releases)
- [Commits](https://github.com/eclipse-equinox/equinox/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi.services
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-28 06:41:43 +00:00
dependabot[bot] a6437020ea
Merge pull request #9102 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.aries.spifly-org.apache.aries.spifly.dynamic.bundle-1.3.6 2022-12-28 06:40:41 +00:00
dependabot[bot] 4a7e9c4db5
Merge pull request #9098 from eclipse/dependabot/maven/jetty-10.0.x/org.eclipse.platform-org.eclipse.osgi-3.18.200 2022-12-28 06:40:17 +00:00
dependabot[bot] ce3a3bee38
Bump httpclient from 4.5.13 to 4.5.14
Bumps httpclient from 4.5.13 to 4.5.14.

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents:httpclient
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-28 04:38:09 +00:00
dependabot[bot] 112c5fa217
Bump org.apache.aries.spifly.dynamic.bundle from 1.3.5 to 1.3.6
Bumps org.apache.aries.spifly.dynamic.bundle from 1.3.5 to 1.3.6.

---
updated-dependencies:
- dependency-name: org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-28 04:37:54 +00:00
dependabot[bot] 1303944f86
Bump org.eclipse.osgi from 3.18.100 to 3.18.200
Bumps [org.eclipse.osgi](https://github.com/eclipse-equinox/equinox) from 3.18.100 to 3.18.200.
- [Release notes](https://github.com/eclipse-equinox/equinox/releases)
- [Commits](https://github.com/eclipse-equinox/equinox/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-28 04:36:03 +00:00
dependabot[bot] 7a8586421e
Bump protostream from 4.5.0.Final to 4.6.0.Final
Bumps [protostream](https://github.com/infinispan/protostream) from 4.5.0.Final to 4.6.0.Final.
- [Release notes](https://github.com/infinispan/protostream/releases)
- [Commits](https://github.com/infinispan/protostream/compare/4.5.0.Final...4.6.0.Final)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-28 04:35:30 +00:00
Olivier Lamy 7eb662b9cd
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-12-28 14:06:37 +10:00
Olivier Lamy b55dc0b519
use asm bom (#9092) 2022-12-28 10:39:33 +10:00
Olivier Lamy 0cfc5bd353
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-12-26 09:30:03 +10:00
Eddú Meléndez Gonzales d5a3d8e1f4
Improve DatastoreEmulatorContainer usage (#9081)
* Improve DatastoreEmulatorContainer usage

Update to testcontainers 1.17.6 and take advantage of
`DatastoreEmulatorContainer#withFlags()`
2022-12-26 09:27:27 +10:00
Joakim Erdfelt 6f9c3367fc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-20 12:54:17 -06:00
Joakim Erdfelt b01bcdc4bd
Improve `IncludeExcludeSet` testing (#9071)
* Improve IncludeExcludeSet testing

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-12-20 11:43:07 -06:00
Greg Wilkins f9ba12b07f Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-20 11:17:29 +11:00
Greg Wilkins 4916377686
PathMappings optimizations (#9055)
* Avoid iterations if only ServletPathSpec instances
* Avoid tests for empty mappings.
* Better reset implementation
* More test coverage
2022-12-20 11:08:40 +11:00
Olivier Lamy 99b1b1e240
jetty 10.0.x fix jdk19 build upgrading and re enable m-invoker-p which now supports jdk19 (#9023)
* use m-invoker-p 3.4.0

Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-12-20 08:37:57 +10:00
Jan Bartel 5c0974e758 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-19 09:27:20 +11:00
Jan Bartel aa40193d67
Jetty 10.0.x add plugin overlay test (#9045)
* Add overlay test for jetty-maven-plugin 

Signed-off-by: Jan Bartel <janb@webtide.com>
2022-12-19 09:17:09 +11:00
Greg Wilkins 7e1c42c0e5 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-17 09:45:40 +11:00
Greg Wilkins d24a521930
Serialize onCompleteFailure for #9059 (#9062)
Serialize onCompleteFailure for #9059

* Fixed case where process() throws an exception.
   Before, exiting the processing loop would always skip to invoke onCompleteFailure(), causing the callback to not be completed.
   Now we fall through and possibly invoke onCompleteFailure() if it was not already invoked.

* Updated javadocs.

* Code cleanups.

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-17 09:43:07 +11:00
Joakim Erdfelt b1095d6605
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-10 11:44:17 -06:00
Joakim Erdfelt 7c8f883610
Merge pull request #9032 from eclipse/release-11.0.13
Merge Release 11.0.13
2022-12-09 18:40:51 -06:00
Joakim Erdfelt 6e82e70edf
Merge pull request #9031 from eclipse/release-10.0.13
Merge Release 10.0.13
2022-12-09 18:40:43 -06:00
Joakim Erdfelt 260245c012
Updating to version 11.0.14-SNAPSHOT 2022-12-07 15:04:55 -06:00
Joakim Erdfelt a04bd1ccf8
Updating to version 11.0.13 2022-12-07 14:46:29 -06:00
Joakim Erdfelt 54c4c03244
Updating to version 10.0.14-SNAPSHOT 2022-12-07 14:33:17 -06:00
Joakim Erdfelt 1c2636ea05
Updating to version 10.0.13 2022-12-07 14:12:50 -06:00
Simone Bordet 0e99ae0c8a
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-07 19:16:18 +01:00
Joakim Erdfelt 355eebecc4 Update tycho-p2 from 2.7.5 to 3.0.1
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-12-07 19:15:39 +01:00
Joakim Erdfelt 754bbddf8a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-07 09:54:18 -06:00
Joakim Erdfelt 7e1de8b1e2
Issue #8973 - Rework KeyStoreScanner handling for symlink related changes (#9014)
* Issue #8973 - Rework KeyStoreScanner handling for symlink related changes

+ Removed changes from #8786 and #8787
+ More test cases
+ revert jetty.sslContext.reload.followLinks boolean
+ Scanner should follow its own linkOptions setting
+ remove bad documentation in module-ssl-reload.adoc

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
2022-12-07 09:24:19 -06:00
Simone Bordet 6f398cecb2
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-07 16:21:09 +01:00
Simone Bordet 2538a91201
Fixes flaky FCGI test HttpClientTest.testPOSTWithContentTracksProgress().
The content must be consumed by the server, otherwise:
* the server Handler exits
* the implementation tries to consume the content on its way to complete
* the request content cannot be consumed, so the connection is closed
* the server closing the connection causes an EOFException on the client

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-07 16:20:22 +01:00
Joakim Erdfelt 6b8e23e0dc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-07 08:17:53 -06:00
Joakim Erdfelt 3d3c95462a
Fixing OSGi bundle + tycho-p2 build failures (#9017)
* Fixing errors/warnings from maven-bundle-plugin
* avoid issues with eclipse ranges
* Fixing version of p2.core
* revert bach tycho eclipse plugin to last working version 2.7.5

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Olivier Lamy <olamy@apache.org>
2022-12-07 07:51:59 -06:00
Joakim Erdfelt d6b88e2bc4
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-06 14:32:36 -06:00
Joakim Erdfelt e923123a32
Merge pull request #9011 from eclipse/fix/jetty-10-9009-flaky-StreamCloseTest
Fixes #9009 - Flaky test StreamCloseTest.testRequestDataClosedRespons…
2022-12-06 10:29:10 -06:00
Joakim Erdfelt 5b20fccf6f
Merge pull request #9010 from eclipse/fix/jetty-10-websocket-inputstream-read
Fixes #9006 - WebSocket MessageInputStream.read() returns signed byte
2022-12-06 10:02:21 -06:00
Joakim Erdfelt 486b51ec18
Merge pull request #9008 from eclipse/fix/jetty-10-9005-flaky-ConnectionPoolTest
Fixes #9005 - Flaky test ConnectionPoolTest.testConcurrentRequestsAllBlockedOnServer
2022-12-06 09:30:20 -06:00
Simone Bordet 7c757689a2
Fixes #9009 - Flaky test StreamCloseTest.testRequestDataClosedResponseDataClosedClosesStream.
Regression introduced by #8678.
Now using awaitility to wait for the stream count to go to zero.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-06 15:48:36 +01:00
Simone Bordet a546027db8
Fixes #9006 - WebSocket MessageInputStream.read() returns signed byte
Now properly coverting to `int`.
Added test.

Also fixed MultiPartInputStreamParser.Base64InputStream for the same issue.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-06 15:29:05 +01:00
Joakim Erdfelt ccdf6fb983
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-06 08:01:11 -06:00
Simone Bordet f122e75dd6
Reduced test load and increased timeout to avoid flakyness in Jenkins.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-06 14:29:51 +01:00
Joakim Erdfelt 390abcccf2
Merge pull request #9004 from eclipse/fix/jetty-10.0.x/jetty-home-cleanup
Excluding javadoc jar from jetty-home
2022-12-06 07:08:35 -06:00
Joakim Erdfelt 72f8fef392
Excluding javadoc jar from jetty-home 2022-12-05 15:47:43 -06:00
Joakim Erdfelt 5c8d7ad013
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-05 13:47:54 -06:00
Joakim Erdfelt 41c0fae44f
Merge pull request #9001 from eclipse/jetty-10.0.x-jdk-19-disable-maven-its
skip m-invoker-p for jdk 19
2022-12-05 13:47:23 -06:00
Olivier Lamy 694bfc40d8 skip m-invoker-p for jdk 19
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-12-05 16:28:43 +10:00
Simone Bordet 87c52707ef
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-01 21:45:53 +01:00