25966a7108
update version to 11.0.0-SNAPSHOT
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-04 20:50:57 +11:00
6f19040094
fix merge
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-03 21:05:49 +10:00
77a54c21a1
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-03-03 20:53:26 +10:00
3a8b45d20c
Issue #4619 align derby version ( #4626 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-03 10:20:27 +10:00
9ef7790e45
Merge pull request #4624 from eclipse/jetty-9.4.x-4123-OpenId_Docs
...
Issue #4123 - add documentation for OpenID to 9.4.x
2020-03-03 10:40:49 +11:00
cfacaca26d
Docs for OpenID ( #4610 )
...
Co-authored-by: Lachlan <lachlan@webtide.com>
2020-03-02 10:56:19 +11:00
af18fb35ad
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'
2020-03-02 10:27:41 +11:00
b014e2faca
Merge pull request #4597 from eclipse/jetty-9.4.x-847-WSasyncWriteTimeout
...
Issue #847 - deprecate asyncWriteTimeout in the jetty websocket API
2020-03-02 10:19:01 +11:00
6151fc0c36
Merge pull request #4615 from eclipse/jetty-10.0.x-4598-InetAccessHandler
...
Issue #4598 - rework InetAccessHandler to use path mappings
2020-03-01 18:43:32 +11:00
95ecb4a3e8
Issue #4598 - Changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-29 16:14:20 +11:00
7e181085d3
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-02-29 09:06:40 +10:00
c29d966162
Issue #4616 hazelcast upgrade 3.12.6 ( #4617 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-02-29 09:01:14 +10:00
b7ab2794fd
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all-compact3/pom.xml
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/pom.xml
# build-resources/pom.xml
# examples/async-rest/async-rest-jar/pom.xml
# examples/async-rest/async-rest-webapp/pom.xml
# examples/async-rest/pom.xml
# examples/embedded/pom.xml
# examples/pom.xml
# jetty-alpn/jetty-alpn-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
# jetty-alpn/jetty-alpn-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/pom.xml
# jetty-cdi/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-documentation/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-home/pom.xml
# jetty-home/src/main/resources/etc/jetty-setuid.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-common/pom.xml
# jetty-http2/http2-hpack/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-http2/pom.xml
# jetty-infinispan/infinispan-common/pom.xml
# jetty-infinispan/infinispan-embedded-query/pom.xml
# jetty-infinispan/infinispan-embedded/pom.xml
# jetty-infinispan/infinispan-remote-query/pom.xml
# jetty-infinispan/infinispan-remote/pom.xml
# jetty-infinispan/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmh/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-memcached/jetty-memcached-sessions/pom.xml
# jetty-memcached/pom.xml
# jetty-nosql/pom.xml
# jetty-openid/pom.xml
# jetty-osgi/jetty-osgi-alpn/pom.xml
# jetty-osgi/jetty-osgi-boot-jsp/pom.xml
# jetty-osgi/jetty-osgi-boot-warurl/pom.xml
# jetty-osgi/jetty-osgi-boot/pom.xml
# jetty-osgi/jetty-osgi-httpservice/pom.xml
# jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-fragment/pom.xml
# jetty-osgi/test-jetty-osgi-server/pom.xml
# jetty-osgi/test-jetty-osgi-webapp/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-plus/pom.xml
# jetty-proxy/pom.xml
# jetty-quickstart/pom.xml
# jetty-rewrite/pom.xml
# jetty-runner/pom.xml
# jetty-security/pom.xml
# jetty-server/pom.xml
# jetty-servlet/pom.xml
# jetty-servlets/pom.xml
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-unixsocket/pom.xml
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-webapp/pom.xml
# jetty-websocket/javax-websocket-client-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/jetty-websocket-tests/pom.xml
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-servlet/pom.xml
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-distribution/pom.xml
# tests/test-http-client-transport/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-hazelcast-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-sessions/pom.xml
# tests/test-sessions/test-mongodb-sessions/pom.xml
# tests/test-sessions/test-sessions-common/pom.xml
# tests/test-webapps/pom.xml
# tests/test-webapps/test-cdi-common-webapp/pom.xml
# tests/test-webapps/test-felix-webapp/pom.xml
# tests/test-webapps/test-http2-webapp/pom.xml
# tests/test-webapps/test-jaas-webapp/pom.xml
# tests/test-webapps/test-jetty-webapp/pom.xml
# tests/test-webapps/test-jndi-webapp/pom.xml
# tests/test-webapps/test-mock-resources/pom.xml
# tests/test-webapps/test-owb-cdi-webapp/pom.xml
# tests/test-webapps/test-proxy-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/pom.xml
# tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
# tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
# tests/test-webapps/test-simple-webapp/pom.xml
# tests/test-webapps/test-webapp-rfc2616/pom.xml
# tests/test-webapps/test-weld-cdi-webapp/pom.xml
2020-02-28 09:29:30 -06:00
8aabb52557
Updating to version 9.4.28-SNAPSHOT
2020-02-27 13:03:44 -06:00
a304fd9f35
Updating to version 9.4.27.v20200227
2020-02-27 12:21:57 -06:00
5b7472f616
Fixing setuid.mod to use specific version of jar
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-27 12:04:29 -06:00
95f20ddfeb
Use updated setuid with clearSupplementalGroups ( #4609 )
...
* Use updated setuid with clearSupplementalGroups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* remove version from setuid.mod
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-27 18:56:16 +01:00
a2a75e8ecc
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-02-27 13:31:18 +01:00
75893dac9c
Fixes #4612 - ReservedThreadExecutor hangs when the last reserved thread idles out.
...
Explicitly removing the idled out thread from the stack,
rather than calling tryExecute().
Side benefit is that we are now removing idled out threads
that are least recently used.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-27 13:26:53 +01:00
ccd6c845e5
Merge remote-tracking branch 'origin/jetty-9.4.x-4598-InetAccessHandler' into jetty-10.0.x-4598-InetAccessHandler
2020-02-27 19:34:16 +11:00
2edc4920fd
Issue #4598 - fix InetAccessHandlerTest expectations to fit new behavior
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-27 18:29:29 +11:00
3c551e960c
Issue #4598 - rework InetAccessHandler to use only one IncludeExcludeSet
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-27 15:41:35 +11:00
da9ec6fd34
Docs for OpenID ( #4610 )
...
Co-authored-by: Lachlan <lachlan@webtide.com>
2020-02-26 21:27:45 -06:00
99a541f051
Fixing checkstyle violations
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-26 13:16:32 -06:00
2faec44dfb
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-02-26 16:40:35 +01:00
65a22e5e80
Fix NPE in HouseKeeper.stopScavenging ( #4604 )
...
* Fix NPE in HouseKeeper.stopScavenging
Signed-off-by: Hirotaka Ikoma <hikoma@gmail.com>
2020-02-26 16:38:50 +01:00
5ba9411e5c
cleanup after merge
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-26 14:37:00 +01:00
277ce5f3a5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-02-26 14:36:22 +01:00
18f8752ad0
Merge pull request #4607 from eclipse/jetty-9.4.x-4606-DateCache-formatNow
...
Issue #4606 - fixing formatTick use of `now`
2020-02-26 07:23:34 -06:00
d082e54301
Issue #4606 - fixing formatTick use of `now`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-26 07:01:53 -06:00
353dc9bf08
Issue #4550 XmlConfiguration argument matching ( #4599 )
...
* Issue #4550 XmlConfiguration argument matching
Improve argument matching by:
+ rejecting obviously non matches (with allowance for unboxing)
+ sorting methods so that derived arguments are tried before more generic (eg String before Object)
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4550 XmlConfiguration argument matching
Improve argument matching by:
+ can unbox from any Number to any Number
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4550
Do not check the assignability of the arguments. Instead rely on the order of the methods.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4550
unbox test no longer required
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4550
Simplified test
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4550
Cleanup comparator
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4550
Cleanup comparator
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-25 16:19:37 +01:00
9bb6840658
Fixes #4577 IPAccessHandler in context ( #4580 )
...
* Fixes #4577 IPAccessHandler in context
Fixes and tests #4577 IPAccessHandler in context by using target instead of pathInfo for path matching.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Tests #4577 IPAccessHandler target
Updates from review.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4577 IpAccessHandler NPE
Match on full URI path rather than target.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-25 08:46:02 +01:00
bb7e48043d
Issue #4598 - Add URI mapping to InetAccessHandler
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-25 14:58:48 +11:00
03359ec089
Tests #4594 ContextListener removed ( #4595 )
...
Remove ContextListeners from the destroy list when removed.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-22 10:43:36 +01:00
7ce14a419f
Merged branch 'm0mus-issue_4540' into 'jetty-10.0.x'.
2020-02-21 09:38:23 +01:00
b0975aaba0
Fixes #4540 - ProxyConnectionFactory should not ignore TLVs.
...
Generified the API to expose TLVs, so that they are all exposed,
not only the custom TLV types in the 0xE0-0xEF range.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-21 09:37:12 +01:00
411624c419
Merge branch 'issue_4540' of https://github.com/m0mus/jetty.project into m0mus-issue_4540
2020-02-21 08:45:21 +01:00
b138ce55bb
Issue #847 - deprecate asyncWriteTimeout in the jetty websocket api
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-21 14:58:19 +11:00
75574f0b88
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-20 17:24:28 -06:00
9325a5bc16
Merge pull request #4596 from eclipse/jetty-9.4.x-4567-log-throwable-lastarg
...
Issue #4567 - Backport of StdErrLog 10.0.x for Throwable behavior change
2020-02-20 17:21:55 -06:00
0e536407a9
Issue #4567 - Backport of StdErrLog 10.0.x for Throwable behavior change
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-20 13:45:40 -06:00
e894da5b21
Fixing noinspection warning
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-20 13:42:53 -06:00
8594fd371e
Removing @SuppressWarnings
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-20 13:39:01 -06:00
d453333a48
Issue #4567 - Backport of StdErrLog 10.0.x for Throwable behavior change
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-20 12:57:49 -06:00
e8d0be4073
Merge pull request #4570 from eclipse/jetty-10.0.x-4567-StdErrLog-throwable
...
Issue #4567 - StdErrLog cleanup and final Arg Throwable support
2020-02-20 12:46:43 -06:00
4ec8826873
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4567-StdErrLog-throwable
2020-02-20 11:53:07 -06:00
9683142c1e
Fixing merge issue
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-20 11:42:28 -06:00
3c6c9112de
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4567-StdErrLog-throwable
2020-02-20 11:16:19 -06:00
16230e6e1c
Issue #4567 - Applying fixes from PR #4570 review
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-20 10:31:59 -06:00
d83e1c93ef
Fixed copyright header after merge.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-20 12:23:18 +01:00
Lachlan Roberts
olivier lamy
Chris Walker
Joakim Erdfelt
Greg Wilkins
Simone Bordet
Jan Bartel
Hirotaka Ikoma