Commit Graph

15371 Commits

Author SHA1 Message Date
Simone Bordet 552b7c3e0e Merged branch 'jetty-9.4.x' into 'master'. 2017-07-24 11:19:04 +02:00
Simone Bordet 4b0003f086 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-07-24 11:13:32 +02:00
Simone Bordet 6782a6fafd Fixed location of ALPN files for JDK 8u141. 2017-07-24 10:50:48 +02:00
Simone Bordet 7b84df341f JavaDoc clarification. 2017-07-24 10:45:13 +02:00
Simone Bordet a0026fd9d2 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-07-24 10:44:39 +02:00
Simone Bordet 3f94a5d132 Fixes #1685 - Update ALPN support for Java 8u141. 2017-07-24 10:08:10 +02:00
Joakim Erdfelt 232477b6ad Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-07-20 11:23:08 -07:00
Joakim Erdfelt a2a0360269 Fixed #1679 - moving JMX specific behavior to jmx.DeploymentManagerMBean 2017-07-20 11:22:54 -07:00
Jan Bartel a4bc251bb0 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-20 16:16:56 +02:00
Jan Bartel 4b27499bbc Issue #1681
(cherry picked from commit 0d99bde0c1e740493b6dfab772b3c4933c1e7d75)
2017-07-20 16:15:03 +02:00
Greg Wilkins 3bcbed7120 Fixed #1551 Moved CookieCutter to jetty-http 2017-07-20 15:08:11 +02:00
Jan Bartel 580310f523 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-20 13:27:03 +02:00
Jan Bartel 41938b2310 Issue #1623
Ensure restarts recreate classpath.
2017-07-20 13:24:46 +02:00
Jan Bartel 5e04d8160b Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-20 13:14:51 +02:00
Jan Bartel fd6b3f198c Merge pull request #1680 from olamy/bugfix/maven_plugin_fix_master
Bugfix/maven plugin fix master
2017-07-20 10:18:18 +02:00
olivier lamy 1b5b59cca3 some cleanup per Jan review
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-07-20 14:10:42 +10:00
Joakim Erdfelt b838a236bf Fixed #1679 - making DeploymentManager usable in JMX without error 2017-07-19 15:29:31 -07:00
Joakim Erdfelt 300bde1535 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-07-19 14:51:47 -07:00
Joakim Erdfelt 568ba61c76 Fixing module [name] warning 2017-07-19 14:51:41 -07:00
Joakim Erdfelt 06e5ed6560 Merge remote-tracking branch 'origin/issue-1642' into jetty-9.4.x 2017-07-19 10:36:42 -07:00
Joakim Erdfelt 2bcdf29cb3 Merge remote-tracking branch 'remotes/origin/issue-1642' into jetty-9.4.x 2017-07-19 10:33:20 -07:00
Greg Wilkins 7065196400 Issue #1676 remove deprecated properties from XML 2017-07-19 16:29:13 +02:00
Greg Wilkins 1b1b250947 Fix #1551 Moved CookieCutter to jetty-http 2017-07-19 16:19:46 +02:00
olivier lamy c78ba059c0 simplify code, add more details in junit failure #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-07-19 21:50:37 +10:00
Greg Wilkins 2443ca34f3 Issue #1676 remove deprecated methods from WebAppContext 2017-07-19 11:49:27 +02:00
Greg Wilkins f1146856ac Issue #1676 remove deprecated methods on HttpFields 2017-07-19 10:45:21 +02:00
Greg Wilkins 5a05e953b9 Issue #1676 remove deprecated methods on HttpFields 2017-07-19 10:16:36 +02:00
Greg Wilkins d14c53ed30 Issue #1676 remove deprecated HttpParser STRICT system property 2017-07-19 10:09:01 +02:00
Greg Wilkins a53222cc72 Issue #1676 remove deprecated SelectChannelEndPoint 2017-07-19 09:47:26 +02:00
Greg Wilkins 0acd68e0a4 Issue #1676 complete removal of completions 2017-07-19 09:42:58 +02:00
Greg Wilkins 134dfd318d Issue #1676 removed deprecated FileResource 2017-07-18 20:12:53 +02:00
Greg Wilkins 34b25ff385 Issue #1676 removed deprecated PathMap 2017-07-18 19:59:07 +02:00
Greg Wilkins 3a4da94e1a Issue #1676 removed deprecated IPAddressMap and IPAccessHandler. Created module inetaccess.mod 2017-07-18 16:48:02 +02:00
Greg Wilkins 79cafb37a0 Issue #1676 Removed deprecated module jetty-continuations 2017-07-18 15:42:14 +02:00
Greg Wilkins 748d582994 Issue #1615 Moved test keystore and passwords to test-keystore module 2017-07-18 14:57:59 +02:00
Greg Wilkins 1956087277 update to latest servlet API behaviour 2017-07-18 13:11:53 +02:00
Greg Wilkins f4f6d834e7 fixed merge 2017-07-18 12:51:37 +02:00
Greg Wilkins b358c06974 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-18 12:46:44 +02:00
Jan Bartel 650bc4bf89 Issue #1675 2017-07-18 09:44:58 +02:00
Joakim Erdfelt 273dcc4131 Improving output seen during websocket-tests to squelch known stacktraces produced by testcase 2017-07-17 14:18:17 -07:00
Joakim Erdfelt 068a1f9e40 Removing Test/Testing related commits from VERSION.txt 2017-07-17 14:17:40 -07:00
Greg Wilkins 36abb7e295 Fix #1672 Proxy tests HttpTester.from usage 2017-07-17 15:24:33 +02:00
Greg Wilkins 6b095d823d Issue #1671 asymmetric trailer usage on MetaData.Request 2017-07-17 11:37:03 +02:00
WalkerWatch f80ff4f544 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-07-14 12:16:40 -04:00
WalkerWatch 9063b359d4 Restoring SSL dump info 2017-07-14 12:16:00 -04:00
WalkerWatch c0d87fd0c2 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
# Conflicts:
#	jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc
2017-07-14 12:07:51 -04:00
WalkerWatch 629e41526e Updates to SSL documentation. Resolves #1667 2017-07-14 11:17:51 -04:00
Greg Wilkins 28cfb3f495 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-07-14 07:27:06 +02:00
Joakim Erdfelt f4d019def4 Fixing websocket tests to use new Jetty 10.x webapp configuration style 2017-07-13 09:38:10 -07:00
Greg Wilkins cadf8cb16f fixed merge 2017-07-13 16:51:24 +02:00