Commit Graph

14006 Commits

Author SHA1 Message Date
Jan Bartel f6f649c8da Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-27 16:16:44 +11:00
Jan Bartel 90e4d162c8 Issue #907 2016-10-27 16:15:44 +11:00
Jan Bartel 1939a16fe8 Issue #1032
Fix nolog classifier
2016-10-27 11:10:03 +11:00
Joakim Erdfelt a250719979 Merge branch 'jetty-9.4.x' 2016-10-26 16:57:50 -07:00
Joakim Erdfelt 1075fc2df1 Fixing bad merge in apache-jsp/pom.xml 2016-10-26 16:57:24 -07:00
Joakim Erdfelt 9f66b552cd Merge branch 'jetty-9.4.x' 2016-10-26 16:42:59 -07:00
Joakim Erdfelt 55c6514a2e Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-10-26 16:42:42 -07:00
Jan Bartel dadb86c831 Issue #1032
Make apache-jsp jar artifact without META-INF/services juli log
2016-10-27 10:37:35 +11:00
Joakim Erdfelt 7256d75e9c Issue #1038 - fixes for MS Windows 2016-10-26 16:09:12 -07:00
Joakim Erdfelt ca5e075ba0 Issue #1038 - treating ${WAR} as a URI always, not a Path
+ Still needs testing on MS Windows
2016-10-26 15:30:34 -07:00
Joakim Erdfelt ebc8983721 Issue #1038 - correcting "file:" and double "//" behavior 2016-10-26 14:25:20 -07:00
Joakim Erdfelt 1864b8f00b Merge pull request #1040 from WalkerWatch/issues/upgrading
Updates for upgrading guide.
2016-10-26 12:28:40 -07:00
WalkerWatch 2552f2300b Updates for upgrading guide.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-10-26 15:16:17 -04:00
Joakim Erdfelt 92aeea2d35 Merge branch 'jetty-9.4.x' 2016-10-26 12:08:02 -07:00
Joakim Erdfelt de1a973321 Test case throws declaration fix for Jetty 9.4+ 2016-10-26 12:07:49 -07:00
Joakim Erdfelt 5681abac5f Merge branch 'jetty-9.4.x' 2016-10-26 11:43:14 -07:00
Joakim Erdfelt a7ac269027 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-10-26 11:42:49 -07:00
Joakim Erdfelt 41cd3bd090 Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-10-26 10:31:45 -07:00
Joakim Erdfelt c4a8e684c8 Fixes #1039 - AttributeNormalizer should not track null paths 2016-10-26 10:31:12 -07:00
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 e6bca1f41a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-26 20:41:02 +11: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 ad7c3e0a7c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-26 20:34:20 +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 1151964d74.
2016-10-26 20:31:42 +11:00
Simone Bordet cc4d046b85 Merged branch 'jetty-9.4.x' into 'master'. 2016-10-26 11:13:30 +02: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 45cded0896 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-26 16:34:49 +11: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 32fc5dfb9f Merged branch 'jetty-9.4.x' into 'master'. 2016-10-25 15:46:34 +02: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 2016-10-21 12:48:53 -07:00
Jan Bartel a39e62179a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-21 16:39:26 +11:00