68a9498092
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 11:51:55 -05:00
1683df2da6
Putting new JMH test in correct place (fix from last merge)
2019-06-10 10:04:30 -05:00
826d68e80a
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-10 11:41:47 +02:00
e179851ccf
Merge pull request #3752 from eclipse/jetty-9.4.x-3751-dtd-consistent-use
...
Issue #3751 - Use Modern DTD/FPI consistently
2019-06-10 11:30:02 +02:00
5346980dbb
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-10 11:29:25 +02:00
450d7f42b2
Issue #3748 - Adding distribution tests for AsyncListenerServlet
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-07 12:15:29 -05:00
246e36289d
Issue #3748 - Adding testcase for AsyncListener with @Resource
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-07 12:14:13 -05:00
63109108a8
Issue #3751 - Use Modern DTD/FPI consistently
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-07 07:21:59 -05:00
a510ed31cb
Issue #3713 - Emit warning when invoking deprecated method in Jetty XML.
...
Fixed references to deprecated methods WebAppContext.prependServerClass(),
WebAppContext.addServerClass() and WebAppContext.addSystemClass().
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-07 09:22:31 +02:00
bf53925cfb
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-06 17:58:49 +02:00
8f4cdf1c83
upgrade log4j2 version and fix log4j2.xml provided sample ( #3721 )
...
* upgrade log4j2 version and fix log4j2.xml provided sample, add disruptor if users wants to use async logging
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-06 20:44:41 +10:00
03baa6bc9b
Issue #3733 do not destroyForcibly on close otherwise child processes are not killed via shutdownHook ( #3742 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-06 20:43:41 +10:00
043521ce26
Cleanup webappconfiguration ( #3703 )
...
* Cleanup webappconfiguration
* formatting fix
* cleanup examples and OSGi
* disable classloader test until 9.4.19 is released with #3726 is fixed
* cleanup from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-05 11:53:56 +02:00
2ba4cb2924
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-03 17:31:50 +02:00
301934cc68
Issue #3719 clean up modules ( #3720 )
...
* Issue #3719 clean up modules
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-03 11:11:18 +02:00
3208af6c1c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-06-03 10:29:36 +02:00
dec10044e0
Jetty 9.4.x 3722 session destroy listeners ( #3723 )
...
* Issue #3722 Use webapp classloader for HttpSessionListener.sessionDestroyed calls
2019-06-03 10:27:38 +02:00
a3e28578f1
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-05-30 14:43:52 +02:00
eb837293ad
Replaced usage of deprecated "replacement" with "location".
...
Code cleanup & formatting.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-30 14:39:28 +02:00
294450908d
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-05-29 17:41:35 +02:00
68fa24e463
fix bad merge
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-23 16:31:02 +10:00
d377db5d26
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-05-23 14:18:39 +10:00
d37038496e
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-22 23:21:02 +02:00
2256c532be
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-22 10:30:25 +02:00
e8f11d3c7e
Added small performance improvements
...
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-22 08:27:53 +02:00
b0bc9c9200
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-05-17 16:47:45 +02:00
665b1929e0
Small minor performance improvements
...
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-15 20:17:33 +02:00
c578798370
Fixes #3197 - Use jetty specific websocket API jar.
...
Introduced jetty-javax-websocket-api artifact with proper
OSGi manifest entries and JPMS Automatic-Module-Name.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-10 19:33:12 +02:00
a305660c54
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-server/src/main/config/etc/jetty-ssl-context.xml
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2019-05-07 13:54:27 -05:00
7e7920a969
Merge pull request #3622 from eclipse/jetty-9.4.x_use_local_repo_dist_test
...
force using local repo to download module dependencies
2019-05-07 11:46:43 -07:00
8a4f4d390c
Issue #3620 - Applying changes from review
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-03 10:13:25 -05:00
13c9d24f08
force using local repo to download module dependencies
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-03 19:03:20 +10:00
2fa8a0a943
Issue #3620 - Fixing unixsocket distribution test
...
+ Giving download more time to complete
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-02 19:30:19 -05:00
78a71b71cc
Issue #3620 - Exit Server.start() if LifeCycle.start() fails
...
+ DeploymentManager will hang onto errors encountered and report them
en-masse if on it's own doStart().
+ Added jetty-deploy test cases.
+ Added test-distribution test case.
+ Updated test-distribution to allow this kind of test case.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-02 18:51:06 -05:00
52bb963186
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# aggregates/jetty-all-compact3/pom.xml
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
# jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java
# jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-infinispan/infinispan-remote-query/src/test/java/org/eclipse/jetty/server/session/infinispan/RemoteQueryManagerTest.java
# jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CrossOriginFilterTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipDefaultTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipTester.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/HeaderFilterTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/PutFilterTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceCollectionTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderManySmallTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
# jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java
# jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
# jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServerFactoryTest.java
# jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
# pom.xml
# tests/jetty-http-tools/src/main/java/org/eclipse/jetty/http/tools/matchers/HttpFieldsMatchers.java
# tests/test-http-client-transport/pom.xml
# tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java
# tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTesterTest.java
2019-05-01 15:02:31 -05:00
41ab9baf8c
Standardizing on hamcrest Matchers (not CoreMatchers from junit4)
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 14:39:57 -05:00
df716e1b23
Migrating away from junit5 deprecated isIn() to is(in())
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 12:33:28 -05:00
2b93a4e7ea
Updating jetty-test-helper + junit5 + hamcrest
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 12:23:55 -05:00
734be56938
Updating to version 9.4.19-SNAPSHOT
2019-04-29 16:27:23 -05:00
e1bc35120a
Updating to version 9.4.18.v20190429
2019-04-29 15:40:33 -05:00
f28bfa9377
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-04-29 13:21:59 +02:00
ab174d1015
Issue #3597 Fix session persistence classloading for deep structures ( #3602 )
...
* Issue #3597 Fix session persistence classloading for deep structures with system classes.
2019-04-29 12:05:34 +02:00
29b960551f
Merge branch `release-9.4.17` into `jetty-9.4.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-bom/pom.xml
2019-04-25 09:15:42 -05:00
3b29d2ccda
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-04-23 19:31:53 +10:00
2d23cb0ecf
ignore the correct one
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 19:31:13 +10:00
c428fc1b62
weird only this annotations
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 15:48:52 +10:00
4f38e9f488
oops missed annotations
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 14:12:21 +10:00
0b6c27e276
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-04-23 13:01:42 +10:00
6395e7f25a
ignore test which cannot work with hazelcast tests
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 12:40:45 +10:00
05bb111580
Updating to version 9.4.18-SNAPSHOT
2019-04-18 15:59:49 -05:00
Joakim Erdfelt
Simone Bordet
Olivier Lamy
Greg Wilkins
Jan Bartel
Michael Hausegger