Commit Graph

25918 Commits

Author SHA1 Message Date
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
Joakim Erdfelt 894a2ee4d9
Fix Jenkins build to not use `-Peclipse-release` (#8996)
Jenkins doesn't have gpg (the executable) or the keyring anyway.
2022-12-01 21:45:16 +01:00
Simone Bordet e80db52306
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-01 17:57:23 +01:00
Joakim Erdfelt be5ed905ee
Jetty 10 - Fix OpenJDK 19 related build issues (#8995)
* Add JDK 19 build to Jenkinsfile
* Fix Javadoc on OpenJDK 19

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-12-01 17:56:34 +01:00
Joakim Erdfelt dddb846afc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-01 10:32:50 -06:00
Joakim Erdfelt 1d9f2dff43
Merge pull request #8988 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-dependency-plugin-3.4.0
Bump maven-dependency-plugin from 3.3.0 to 3.4.0
2022-12-01 10:32:10 -06:00
Joakim Erdfelt 67d0ddbf7d
Merge pull request #8985 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.httpcomponents-httpcore-4.4.16
Bump httpcore from 4.4.15 to 4.4.16
2022-12-01 10:32:02 -06:00
dependabot[bot] 1589058065
Bump maven-dependency-plugin from 3.3.0 to 3.4.0
Bumps [maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/apache/maven-dependency-plugin/releases)
- [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.3.0...maven-dependency-plugin-3.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-01 00:08:00 +00:00
dependabot[bot] 5999b0e4bc
Bump httpcore from 4.4.15 to 4.4.16
Bumps httpcore from 4.4.15 to 4.4.16.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-01 00:02:25 +00:00
Olivier Lamy 838728201f
force inject javax.inject
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-11-30 13:21:01 +10:00
Olivier Lamy b50e35a63c
force back to javax.inject as needed by new version of maven-resolver
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-11-30 12:08:12 +10:00
Simone Bordet 26af094f08
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-29 18:46:41 +01:00
Simone Bordet 410e9db837
Issue #8895 - delete javadoc sources (#8977)
* Issue #8895 - delete javadoc sources

Delete java source files used to generate javadocs,
so that IDEs do not report duplicate sources.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-29 18:46:02 +01:00
Olivier Lamy b961ba77cc
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-11-29 21:36:10 +10:00
dependabot[bot] 86117a14fb
Merge pull request #8944 from eclipse/dependabot/maven/jetty-10.0.x/maven.resolver.version-1.9.2 2022-11-29 11:34:58 +00:00
Olivier Lamy c1e570d40e
java inject looks to be needed now
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-11-29 19:03:01 +10:00
Olivier Lamy b78f8dcaa1
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-11-29 17:58:16 +10:00
dependabot[bot] d9bb35f90b
Merge pull request #8947 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-plugin-plugin-3.7.0 2022-11-29 06:33:24 +00:00
dependabot[bot] 42ce90436b
Bump maven-plugin-plugin from 3.6.4 to 3.7.0
Bumps [maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.6.4 to 3.7.0.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.6.4...maven-plugin-tools-3.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-29 00:43:55 +00:00
Olivier Lamy 884096d4c3
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-11-29 10:33:31 +10:00
dependabot[bot] 2a0d4a398d
Merge pull request #8954 from eclipse/dependabot/maven/jetty-10.0.x/maven.plugin-tools.version-3.7.0 2022-11-29 00:32:07 +00:00
dependabot[bot] 3023aff389
Merge pull request #8956 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-install-plugin-3.1.0 2022-11-29 00:31:06 +00:00
dependabot[bot] 3a46c98639
Merge pull request #8962 from eclipse/dependabot/maven/jetty-10.0.x/jmh.version-1.36 2022-11-29 00:30:46 +00:00
dependabot[bot] ae930217e7
Merge pull request #8952 from eclipse/dependabot/maven/jetty-10.0.x/com.github.jnr-jnr-constants-0.10.4 2022-11-29 00:30:22 +00:00
dependabot[bot] 3cd4940fa2
Bump jmh.version from 1.35 to 1.36
Bumps `jmh.version` from 1.35 to 1.36.

Updates `jmh-core` from 1.35 to 1.36
- [Release notes](https://github.com/openjdk/jmh/releases)
- [Commits](https://github.com/openjdk/jmh/compare/1.35...1.36)

Updates `jmh-generator-annprocess` from 1.35 to 1.36
- [Release notes](https://github.com/openjdk/jmh/releases)
- [Commits](https://github.com/openjdk/jmh/compare/1.35...1.36)

---
updated-dependencies:
- dependency-name: org.openjdk.jmh:jmh-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.openjdk.jmh:jmh-generator-annprocess
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-28 18:23:38 +00:00
dependabot[bot] 0276495ae9
Bump maven-install-plugin from 3.0.1 to 3.1.0
Bumps [maven-install-plugin](https://github.com/apache/maven-install-plugin) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/apache/maven-install-plugin/releases)
- [Commits](https://github.com/apache/maven-install-plugin/compare/maven-install-plugin-3.0.1...maven-install-plugin-3.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-28 18:21:00 +00:00
dependabot[bot] 121283ffa4
Bump maven.plugin-tools.version from 3.6.4 to 3.7.0
Bumps `maven.plugin-tools.version` from 3.6.4 to 3.7.0.

Updates `maven-plugin-annotations` from 3.6.4 to 3.7.0
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.6.4...maven-plugin-tools-3.7.0)

Updates `maven-plugin-tools-api` from 3.6.4 to 3.7.0
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.6.4...maven-plugin-tools-3.7.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-tools-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-28 18:20:36 +00:00
dependabot[bot] f2dda056f3
Bump jnr-constants from 0.10.3 to 0.10.4
Bumps [jnr-constants](https://github.com/jnr/jnr-constants) from 0.10.3 to 0.10.4.
- [Release notes](https://github.com/jnr/jnr-constants/releases)
- [Commits](https://github.com/jnr/jnr-constants/compare/jnr-constants-0.10.3...jnr-constants-0.10.4)

---
updated-dependencies:
- dependency-name: com.github.jnr:jnr-constants
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-28 18:20:22 +00:00
dependabot[bot] 6774e4c474
Bump maven.resolver.version from 1.8.2 to 1.9.2
Bumps `maven.resolver.version` from 1.8.2 to 1.9.2.

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

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

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

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

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

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

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

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-28 18:18:42 +00:00
Joakim Erdfelt 0493f9d660
Reverting logback downgrade 2022-11-28 12:11:58 -06:00
Joakim Erdfelt c561284518
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-28 12:10:59 -06:00