13565 Commits

Author SHA1 Message Date
Joakim Erdfelt
7328742ae5 Fixes #1038 - ${WAR} should be favored over other attributes, like ${jetty.base} 2016-10-26 10:23:58 -07:00
Greg Wilkins
714d29db76 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-26 20:39:29 +11:00
Greg Wilkins
7f7021315d fixed bad revert 2016-10-26 20:39:04 +11:00
Greg Wilkins
f4e6162b98 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-26 20:32:18 +11:00
Greg Wilkins
812272c658 Revert "Adding jdk9 profile"
This reverts commit 1151964d74fe7637854af525479279997740f50b.
2016-10-26 20:31:42 +11:00
Simone Bordet
8421a9b200 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-10-26 11:13:03 +02:00
Simone Bordet
338e924a5d Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-10-26 11:10:19 +02:00
Simone Bordet
4cc5178944 Updated ALPN version for JDK 8u111 and 8u112. 2016-10-26 11:03:43 +02:00
Jan Bartel
9befe3a411 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-26 16:33:57 +11:00
Jan Bartel
917c7440b6 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-26 16:33:24 +11:00
Jan Bartel
355f93ae7d Issue #1032
Add test dir
2016-10-26 16:28:07 +11:00
Jan Bartel
4776b4c877 Issue #1032 2016-10-26 15:51:57 +11:00
Greg Wilkins
53853df3bb Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-26 11:20:50 +11:00
Greg Wilkins
81e2bfd0c7 Improve HttpField preencoding #1031 2016-10-26 11:19:47 +11:00
Joakim Erdfelt
1151964d74 Adding jdk9 profile 2016-10-25 15:15:46 -07:00
Simone Bordet
b741b454af Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-10-25 15:45:56 +02:00
Simone Bordet
33eb768d69 Fixes #1029 - Restore Request.setHttpVersion().
Also cleaned up the asymmetry in MetaData between the setter
(setHttpVersion()) and the getter (getVersion()).
2016-10-25 15:45:29 +02:00
Joakim Erdfelt
4a95db948e Merge pull request #1025 from WalkerWatch/issues/logging
Issue #644 Additional updates to logging docs.
2016-10-24 10:00:43 -07:00
WalkerWatch
7432db90c5 Merge branch 'jetty-9.4.x' into issues/logging 2016-10-24 12:45:39 -04:00
WalkerWatch
7d4b46cef4 Issue #644 Additional documentation for updated logging modules.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-10-23 11:57:05 -04:00
WalkerWatch
1e76c99442 Issue #644 Additional documentation for updated logging modules. (#1021)
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-10-22 11:07:31 +11:00
Greg Wilkins
726fcd814c fixed simple-impl naming #1023 2016-10-22 10:56:50 +11:00
Greg Wilkins
9569ff64c9 removed unnecessary dependency #1020 2016-10-22 10:34:14 +11:00
Joakim Erdfelt
48791aceb2 Updating to version 9.4.0-SNAPSHOT 2016-10-21 13:57:01 -07:00
Joakim Erdfelt
5c2821fdee Updating to version 9.4.0.RC1 jetty-9.4.0.RC1 2016-10-21 12:48:53 -07:00
Jan Bartel
d2a98206df Issue #1018
Remove deprecated Util class
2016-10-21 16:38:47 +11:00
Jan Bartel
34f0015aa9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-21 16:37:13 +11:00
Jan Bartel
638045764e Issue #1018 2016-10-21 16:32:45 +11:00
Joakim Erdfelt
458aebbd01 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-10-20 15:11:40 -07:00
Joakim Erdfelt
76992139f8 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-10-20 15:11:25 -07:00
Joakim Erdfelt
3bfc914889 More attempts at jacoco exclusions 2016-10-20 14:14:50 -07:00
Joakim Erdfelt
2d650512bf Skipping jacoco collection on build/test/support/integration modules 2016-10-20 12:48:32 -07:00
Joakim Erdfelt
a733d2768c Setting jacoco jenkins publisher to report only on org.eclipse.jetty.* 2016-10-20 12:39:47 -07:00
Joakim Erdfelt
bb0ac62328 Correcting for Jenkinsfile "stage" syntax warning
The Warning Message:

   "Using the 'stage' step without a block argument is deprecated"
2016-10-20 11:29:24 -07:00
Joakim Erdfelt
b8127399d7 Tweaking jacoco includes/excludes in pom.xml 2016-10-20 11:28:26 -07:00
Joakim Erdfelt
09abf0b4bd Revert "Correcting Jenkinsfile warning"
This reverts commit d4abbb049969b33e24292f4d2add434eed068ff2.
2016-10-20 11:09:24 -07:00
Joakim Erdfelt
d4abbb0499 Correcting Jenkinsfile warning
+ Using the 'stage' step without a block argument is deprecated
2016-10-20 10:03:18 -07:00
Joakim Erdfelt
ac78631e4c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-10-20 09:57:49 -07:00
Joakim Erdfelt
6ded652dae Tweaking jacoco includes/excludes 2016-10-20 09:31:00 -07:00
Joakim Erdfelt
fccffdb526 Merge branch 'release-9.3.13' into jetty-9.3.x 2016-10-20 09:25:57 -07:00
Greg Wilkins
0bb5730d7a cleanup infinispan module #1013 2016-10-20 23:59:22 +11:00
Greg Wilkins
e1c72c26dc fixed javadoc #984 2016-10-20 23:58:30 +11:00
Vladimir Bukhtoyarov
bbce9df664 Enhancement for detection of insufficient threads (#1010)
* Issue #586 Enhancement for detection of insufficient threads

Do not count acceptors and selectors at server level if connector uses own dedicated thread pool

Signed-off-by: vladimir.bukhtoyarov <jsecoder@mail.ru>
2016-10-20 12:11:23 +02:00
Greg Wilkins
97470c4736 Overlay directories for modules #1013
Implemented overlay directories for modules.
Implemented by extending the basehome initializer to be able to handle
directory to directory copies, with a default of jetty.base if no location
is specified.
2016-10-20 17:44:39 +11:00
Jan Bartel
6ff5a3a7e9 Issue #1017 2016-10-20 12:38:05 +11:00
Greg Wilkins
b08fa971a5 Improve logging modules and listing #984
Remove support for JETTY_LOGS
2016-10-20 11:02:06 +11:00
Greg Wilkins
d7b781574d Improve logging modules and listing #984
All logging modules log to stderr
2016-10-20 10:57:56 +11:00
Greg Wilkins
f9be11bcc2 Improve logging modules and listing #984
cleanup logging config
2016-10-20 10:57:56 +11:00
Greg Wilkins
1706c6d9ed Improve logging modules and listing #984
Do not support JCL as a logging mechanism.  Only support jcl-slf4j binding
2016-10-20 10:57:56 +11:00
Joakim Erdfelt
167f6c8d23 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-10-19 16:17:25 -07:00