be2b431ba6
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-11-08 13:08:01 +01:00
a9878863aa
Improved Conscrypt documentation for the programming guide.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-11-08 13:04:04 +01:00
a51ddd0187
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2023-11-06 06:50:25 +10:00
07ffea793a
Bump org.infinispan:infinispan-bom from 11.0.17.Final to 11.0.18.Final ( #10724 )
...
Bumps [org.infinispan:infinispan-bom](https://github.com/infinispan/infinispan ) from 11.0.17.Final to 11.0.18.Final.
- [Release notes](https://github.com/infinispan/infinispan/releases )
- [Changelog](https://github.com/infinispan/infinispan/blob/main/Jenkinsfile-release )
- [Commits](https://github.com/infinispan/infinispan/compare/11.0.17.Final...11.0.18.Final )
---
updated-dependencies:
- dependency-name: org.infinispan:infinispan-bom
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-11-06 06:49:32 +10:00
8364b7a2f6
Bump apacheds.version from 2.0.0.AM26 to 2.0.0.AM27 ( #10836 )
...
* Bump apacheds.version from 2.0.0.AM26 to 2.0.0.AM27
Bumps `apacheds.version` from 2.0.0.AM26 to 2.0.0.AM27.
Updates `org.apache.directory.server:apacheds-test-framework` from 2.0.0.AM26 to 2.0.0.AM27
- [Commits](https://github.com/apache/directory-server/compare/2.0.0.AM26...2.0.0.AM27 )
Updates `org.apache.directory.server:apacheds-server-integ` from 2.0.0.AM26 to 2.0.0.AM27
- [Commits](https://github.com/apache/directory-server/compare/2.0.0.AM26...2.0.0.AM27 )
Updates `org.apache.directory.server:apacheds-core-integ` from 2.0.0.AM26 to 2.0.0.AM27
- [Commits](https://github.com/apache/directory-server/compare/2.0.0.AM26...2.0.0.AM27 )
---
updated-dependencies:
- dependency-name: org.apache.directory.server:apacheds-test-framework
dependency-type: direct:development
update-type: version-update:semver-patch
- dependency-name: org.apache.directory.server:apacheds-server-integ
dependency-type: direct:development
update-type: version-update:semver-patch
- dependency-name: org.apache.directory.server:apacheds-core-integ
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* get this work
Signed-off-by: Olivier Lamy <olamy@apache.org>
---------
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Olivier Lamy <olamy@apache.org>
2023-11-05 21:48:29 +01:00
318fc9d87f
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2023-11-01 20:34:45 +10:00
14d976a538
Merge pull request #10842 from jetty/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-checkstyle-plugin-3.3.1
2023-11-01 10:33:57 +00:00
fe4ebc0485
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2023-11-01 18:45:51 +10:00
0d8ee3ed46
Bump org.apache.maven.plugins:maven-checkstyle-plugin
...
Bumps [org.apache.maven.plugins:maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin ) from 3.3.0 to 3.3.1.
- [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.3.0...maven-checkstyle-plugin-3.3.1 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-01 08:11:25 +00:00
e9ae8e876f
Merge pull request #10837 from jetty/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-plugin-plugin-3.10.1
2023-11-01 08:10:10 +00:00
ae6a92e0a7
Merge pull request #10839 from jetty/dependabot/maven/jetty-10.0.x/maven.surefire.plugin.version-3.2.1
2023-11-01 08:09:46 +00:00
571547234c
Merge pull request #10841 from jetty/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-dependency-plugin-3.6.1
2023-11-01 06:20:42 +00:00
c9abd41fee
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2023-11-01 15:12:55 +10:00
d0a7718107
Bump maven.surefire.plugin.version from 3.1.2 to 3.2.1
...
Bumps `maven.surefire.plugin.version` from 3.1.2 to 3.2.1.
Updates `org.apache.maven.plugins:maven-failsafe-plugin` from 3.1.2 to 3.2.1
- [Release notes](https://github.com/apache/maven-surefire/releases )
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.1.2...surefire-3.2.1 )
Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.1.2 to 3.2.1
- [Release notes](https://github.com/apache/maven-surefire/releases )
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.1.2...surefire-3.2.1 )
Updates `org.apache.maven.surefire:surefire-junit47` from 3.1.2 to 3.2.1
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.apache.maven.surefire:surefire-junit47
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-01 04:42:54 +00:00
49c102b3a9
Merge pull request #10843 from jetty/dependabot/maven/jetty-10.0.x/commons-io-commons-io-2.15.0
2023-11-01 04:30:47 +00:00
3f6e31b6b1
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2023-11-01 14:19:00 +10:00
9a7ca3b092
Bump org.apache.maven.plugins:maven-plugin-plugin from 3.9.0 to 3.10.1
...
Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools ) from 3.9.0 to 3.10.1.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases )
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.9.0...maven-plugin-tools-3.10.1 )
---
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>
2023-11-01 04:16:05 +00:00
7d557110cf
Merge pull request #10840 from jetty/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-clean-plugin-3.3.2
2023-11-01 04:15:07 +00:00
9f85a8aa81
Merge pull request #10838 from jetty/dependabot/maven/jetty-10.0.x/maven.plugin-tools.version-3.10.1
2023-11-01 04:14:46 +00:00
498f784a4a
Merge pull request #10835 from jetty/dependabot/maven/jetty-10.0.x/org.apache.logging.log4j-log4j-api-2.21.1
2023-11-01 03:25:04 +00:00
317e7a2c2a
Bump commons-io:commons-io from 2.14.0 to 2.15.0
...
Bumps commons-io:commons-io from 2.14.0 to 2.15.0.
---
updated-dependencies:
- dependency-name: commons-io:commons-io
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-01 01:01:37 +00:00
718d6bc57e
Bump org.apache.maven.plugins:maven-dependency-plugin
...
Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin ) from 3.6.0 to 3.6.1.
- [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.6.0...maven-dependency-plugin-3.6.1 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-01 00:59:49 +00:00
7b5cc00ffd
Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.1 to 3.3.2
...
Bumps [org.apache.maven.plugins:maven-clean-plugin](https://github.com/apache/maven-clean-plugin ) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/apache/maven-clean-plugin/releases )
- [Commits](https://github.com/apache/maven-clean-plugin/compare/maven-clean-plugin-3.3.1...maven-clean-plugin-3.3.2 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-clean-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-01 00:58:36 +00:00
0f578ebf3f
Bump maven.plugin-tools.version from 3.9.0 to 3.10.1
...
Bumps `maven.plugin-tools.version` from 3.9.0 to 3.10.1.
Updates `org.apache.maven.plugin-tools:maven-plugin-annotations` from 3.9.0 to 3.10.1
- [Release notes](https://github.com/apache/maven-plugin-tools/releases )
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.9.0...maven-plugin-tools-3.10.1 )
Updates `org.apache.maven.plugin-tools:maven-plugin-tools-api` from 3.9.0 to 3.10.1
- [Release notes](https://github.com/apache/maven-plugin-tools/releases )
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.9.0...maven-plugin-tools-3.10.1 )
---
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>
2023-11-01 00:56:50 +00:00
3246178e8c
Bump org.apache.logging.log4j:log4j-api from 2.20.0 to 2.21.1
...
Bumps org.apache.logging.log4j:log4j-api from 2.20.0 to 2.21.1.
---
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-11-01 00:55:18 +00:00
1f819bf4c8
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2023-10-31 17:50:24 +10:00
398054a813
Fixes #10812 - Correct awaitility dependency scope ( #10813 )
2023-10-31 17:48:56 +10:00
5f4bd4b626
Merge from jetty-10.0.x to jetty-11.0.x
2023-10-30 14:47:19 -05:00
ff2012e126
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2023-10-30 14:44:33 -05:00
1e2b356b80
Updating to version 11.0.19-SNAPSHOT
2023-10-26 21:24:54 -05:00
5a9a771a9f
Updating to version 11.0.18
2023-10-26 21:14:03 -05:00
c50aa2f61b
Updating to version 10.0.19-SNAPSHOT
2023-10-26 21:10:08 -05:00
8545fd9bf4
Updating to version 10.0.18
2023-10-26 20:59:27 -05:00
2fbfe75986
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-26 16:55:05 +02:00
95804f6d19
Merge pull request #10795 from jetty/fix/jetty-10-10786-tls-handshake-scheduler-leak
...
Fixes #10786 - TLS handshake failures leak HttpConnection.RequestTime…
2023-10-26 16:52:23 +02:00
fa166d09c5
Fixes #10786 - TLS handshake failures leak HttpConnection.RequestTimeouts tasks
...
Moved the call to destroy the CyclicTimeouts to a close() call that is always called.
Fixed NPE in ManagedSelector.getTotalKeys().
Fixed exception handling to avoid infinite recursion in SslConnection.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-26 16:49:52 +02:00
e068b5de54
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2023-10-25 22:33:33 -05:00
e98c0ae05d
Merge pull request #10791 from jetty/fix/10.0.x/jetty-sh-updates
...
Updates to jetty.sh and testing to reduce failures
2023-10-25 22:31:29 -05:00
31b5518fe3
Updates to jetty.sh and testing to reduce failures
...
Backport of #10790 to Jetty 10.
+ Making sure /etc/default/jetty is populated correctly in the user_change mode
+ Removing warnings from jetty startup about --start-log-file=... being unrecognized
+ Adding unique jetty10 identifier to docker image names (helps to keep different jetty versions apart when manually testing)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-10-25 20:20:50 -05:00
9a8daf71ca
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2023-10-25 11:14:55 -05:00
92f62a10f9
Improve and test `jetty.sh` behaviors ( #10753 )
...
* Issue #10696 - Addressing start-stop-daemon behaviors in jetty.sh
* disable internal pid-file management of start-stop-daemon
* IssueDo not test for file system permissions if user is root, or process will switch to JETTY_USER
* Fixing bad UID / JETTY_USER condition
* Avoid FS test with setuid use as well
* Fixing stop behavior
* Adding jetty.sh docker testing
---------
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>
2023-10-25 09:32:15 -05:00
0701286722
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2023-10-25 10:14:06 +02:00
8b5deea657
#10519 do not close the flusher to avoid an ISE when iterating it during idle timeout
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-10-25 10:12:20 +02:00
a8a8c8b9eb
#10519 check if the stream is still in a usable state when quiche_conn_stream_send returns QUICHE_ERR_DONE
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-10-25 10:12:20 +02:00
caf46b0b0b
#10519 ignore IllegalStateException thrown by flusher when closing
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-10-25 10:12:20 +02:00
20b1fc8c10
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2023-10-25 16:32:49 +11:00
6e7fafaf85
Merge pull request #10755 from jetty/jetty-10.0.x-pushCacheFilter
...
deprecate PushCacheFilter
2023-10-25 16:32:32 +11:00
b97f158a2d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2023-10-25 16:28:53 +11:00
8587cc9bef
More PushCacheFilter deprecation cleanup
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-10-24 09:34:48 -05:00
36d3377c23
remove usage of PushCacheFilter from demo-jetty-webapp
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-10-24 11:15:28 +11:00
Simone Bordet
Olivier Lamy
dependabot[bot]
Chad Wilson
Joakim Erdfelt
Ludovic Orban
Lachlan Roberts