Commit Graph

26857 Commits

Author SHA1 Message Date
Lachlan Roberts 1e0ef57bb4 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-03 19:28:55 +11:00
Lachlan Roberts 3b7ea99780 set type of arg in jetty-ssl-context-reload.xml
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-03 19:26:00 +11:00
Lachlan Roberts 8607e3ef15 changes to ssl-reload module & documentation from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-03 18:54:53 +11:00
Lachlan Roberts 7bb3fcae03 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-HttpContent-Caching-Refactor 2022-11-03 18:13:02 +11:00
Lachlan Roberts d94abe3f3f fix javadoc in ValidatingCachingContentFactory
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-03 18:10:39 +11:00
Lachlan Roberts 4ad42e3cdb add getBytesOccupied method to HttpContent
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-03 18:00:03 +11:00
Lachlan Roberts c0bb0272f7 fix release in CachingHttpContentFactory and always use ByteBufferPool
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-03 17:38:22 +11:00
Joakim Erdfelt b37ce63588
Issue #8779 - CompactPathRule should not drop query section from modified URI (#8780)
* Issue #8779 - CompactPathRule should not drop query section from modified URI

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-02 16:38:50 -05:00
Simone Bordet e2b00bd4e0
Improved non-blocking algorithm of AdaptiveExecutionStrategy.
Now only starting one pending producer also in case of CAS failures.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-02 11:19:08 +01:00
Lachlan Roberts ac2d54aa17 do not cache notFound entries in TryPathsHandlerTests ResourceHandler
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-02 17:54:16 +11:00
Lachlan Roberts 6facedba75 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-HttpContent-Caching-Refactor 2022-11-02 17:28:42 +11:00
Lachlan Roberts e28a528165 changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-02 17:21:44 +11:00
Olivier Lamy 05e5a99352
jetty 10.0.x use default container (#8813)
* do not switch container and use default one only
2022-11-02 16:13:34 +10:00
Olivier Lamy 55a6cdad9d
add back dependabot for 9.4.x branch and force timezone to try get this done on weekend (#8820)
Signed-off-by: Olivier Lamy <olamy@apache.org>

Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-11-02 14:56:13 +10:00
Joakim Erdfelt 86c0d5b3e5
Disable flaky test (#8816) 2022-11-02 14:55:53 +10:00
Greg Wilkins deb4f3a8e8 Suppress stack in expected warning 2022-11-02 14:42:28 +11:00
Greg Wilkins 8e699866ef Suppress stack in expected warning 2022-11-02 14:37:35 +11:00
Greg Wilkins 7e88b8234c
Experiment with lock free AdaptiveExecutionStrategy (#8762)
Removed the lock from the AdaptiveExecutionStrategy in favour of a BiInteger.
2022-11-02 08:16:24 +11:00
Joakim Erdfelt 861e1e635c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-01 15:00:51 -05:00
dependabot[bot] 59c1cfa327
Bump logback-core from 1.4.1 to 1.4.4 (#8798)
Bumps [logback-core](https://github.com/qos-ch/logback) from 1.4.1 to 1.4.4.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.4.1...v_1.4.4)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-01 12:44:51 -05:00
Olivier Lamy 4e32557616
use default container (#8812)
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-11-01 22:07:49 +10:00
dependabot[bot] d9d35cb42e
Merge pull request #8799 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.commons-commons-compress-1.22 2022-11-01 11:24:55 +00:00
Olivier Lamy a6cbb1933a
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-11-01 20:37:38 +10:00
dependabot[bot] 0a1e6a6be4
Merge pull request #8804 from eclipse/dependabot/maven/jetty-10.0.x/org.codehaus.plexus-plexus-utils-3.5.0 2022-11-01 08:46:38 +00:00
dependabot[bot] edd5a0ac12
Merge pull request #8794 from eclipse/dependabot/maven/jetty-10.0.x/asm.version-9.4 2022-11-01 08:44:58 +00:00
Greg Wilkins 976ab3df8d
ResourceCollection should not have a path (#8711)
ResourceCollection should not have a path
Nor name, nor filename unless all resources agree on it.
revert combine and related methods to return Resource and not explicitly a ResourceCollection, as if there is only 1, then a collection is not needed
cleanup ResourceCollection creation. Avoid sanity checks on resolved resources.
2022-11-01 15:54:50 +11:00
dependabot[bot] 95ce84bd4a
Bump plexus-utils from 3.4.2 to 3.5.0
Bumps [plexus-utils](https://github.com/codehaus-plexus/plexus-utils) from 3.4.2 to 3.5.0.
- [Release notes](https://github.com/codehaus-plexus/plexus-utils/releases)
- [Commits](https://github.com/codehaus-plexus/plexus-utils/compare/plexus-utils-3.4.2...plexus-utils-3.5.0)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-utils
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-01 02:15:11 +00:00
dependabot[bot] 82624a8ae5
Bump commons-compress from 1.21 to 1.22
Bumps commons-compress from 1.21 to 1.22.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-01 02:13:04 +00:00
dependabot[bot] 4d0718f11c
Bump asm.version from 9.3 to 9.4
Bumps `asm.version` from 9.3 to 9.4.

Updates `asm-commons` from 9.3 to 9.4

Updates `asm` from 9.3 to 9.4

Updates `asm-analysis` from 9.3 to 9.4

Updates `asm-tree` from 9.3 to 9.4

Updates `asm-util` from 9.3 to 9.4

---
updated-dependencies:
- dependency-name: org.ow2.asm:asm-commons
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.ow2.asm:asm
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.ow2.asm:asm-analysis
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.ow2.asm:asm-tree
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.ow2.asm:asm-util
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-01 02:08:16 +00:00
Lachlan Roberts a4185bf5ac restore deleted methods in SessionAuthentication
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-01 12:05:53 +11:00
Lachlan Roberts c60f38f387 Issue #8330 - fix persistence of sessions in OpenID
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-01 12:01:24 +11:00
Lachlan Roberts 41d4a3263c add test to replicate issue with OpenId Session serialization
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-01 12:01:23 +11:00
Greg Wilkins 4225054b62 Improve comments 2022-11-01 11:16:57 +11:00
Joakim Erdfelt 47d2b062f0
Jetty 12 - Fix demo-ee10 `LikeJettyXml` (and testcase) (#8771)
* Remove DebugBinding config (doesn't exist anymore)

* Make LikeJettyXml work (and test)
2022-10-31 11:57:05 -05:00
Greg Wilkins 336bba04c5 Re-introduced JMH tests
Added stream vs iterator
2022-10-31 15:15:40 +11:00
Lachlan Roberts 4d15593d63 Issue #8786 - add configuration for KeyStoreScanner to not resolve aliases
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-31 14:39:32 +11:00
Olivier Lamy 0a666ac2a2
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-10-29 10:24:04 +10:00
Joakim Erdfelt e014ba1775
limit build history to last 60 builds (#8776) (#8778)
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-10-29 10:07:55 +10:00
Joakim Erdfelt dee5d14130
Jetty 12 - Alternate `TryPathsHandler` based on `Request.Processor` existence (#8781)
Now using TryPathsHandler with a PathMappingsHandler.
Introduced original[Path|Query]Attribute.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-28 17:06:52 +02:00
Simone Bordet 3e9bebd05a
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-28 16:20:17 +02:00
Simone Bordet 115107f5ec
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-28 16:19:31 +02:00
Simone Bordet f94599bf11
Merge pull request #8784 from eclipse/jetty-10.0.x-localhost-resolves-many-addresses
Fixed tests that fail when localhost resolves to more than one address.
2022-10-28 16:18:34 +02:00
Simone Bordet 35af8e5c71
Fixed tests that fail when localhost resolves to more than one address.
On Windows, Mac, OpenSolaris (verified) and probably Docker (did not verify, but likely),
DNS resolution of "localhost" yields [127.0.0.1, ::1], while on Linux only [127.0.0.1].

HttpClient will try the first address, and in case of failure will try the second address.
For those tests that want to explicitly fail the connection attempt, we don't want them to
try the second address, which likely yields test failures because of unexpected results
(for example, a different exception type).

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-28 13:33:28 +02:00
Olivier Lamy b39d1144ec
limit build history to 60
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-10-28 06:07:25 +10:00
Simone Bordet 72d2724906
Fixed build with Java 17+.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-27 11:40:37 +02:00
Simone Bordet 6ca9c4f878
Fixed test case.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-27 10:46:40 +02:00
Lachlan Roberts af19607f1c use name annotation for EvictingCachingContentFactory constructors
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-26 11:26:06 +11:00
Joakim Erdfelt 508e0a4484
fixing compilation 2022-10-25 15:32:58 -05:00
Joakim Erdfelt 9bbac09a11
Fixing version reference for node-16 - see https://github.com/stCarolas/setup-maven/issues/30 2022-10-25 13:30:50 -05:00
Joakim Erdfelt 97b61292ab
Bump stCarolas/setup-maven to version 4.5 2022-10-25 12:01:37 -05:00