Jan Bartel
606e74f3e2
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-19 09:23:02 +11:00
Jan Bartel
87067748d3
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2017-10-19 09:19:49 +11:00
Jan Bartel
264aa61a2b
Issue #1892
2017-10-19 09:19:06 +11:00
WalkerWatch
0a9104eea1
Merge branch 'jetty-9.4.x'
2017-10-18 16:39:17 -04:00
WalkerWatch
79b9aba3c8
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-10-18 16:38:51 -04:00
WalkerWatch
9947a497a6
Fixed war name
2017-10-18 16:38:20 -04:00
WalkerWatch
97f82370fa
Merge branch 'jetty-9.4.x'
2017-10-18 16:29:33 -04:00
WalkerWatch
38eb91e42f
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-10-18 16:29:00 -04:00
WalkerWatch
9356bd557b
Fixing link discrepancy
2017-10-18 16:28:17 -04:00
Simone Bordet
39b9f2ca95
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-18 10:55:02 +02:00
Simone Bordet
f8ce63c125
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-10-18 10:53:16 +02:00
Simone Bordet
55d461ae17
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-10-18 10:50:40 +02:00
Simone Bordet
a74ad00b77
Update ALPN support for Java 8u151 and 8u152.
2017-10-18 10:44:18 +02:00
Jan Bartel
92dbf5b7b6
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-18 17:23:43 +11:00
Jan Bartel
d5769c21a9
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-10-18 17:16:19 +11:00
Jan Bartel
da813488fb
Issue #1213
...
Ensure use asm5 for osgi tests
2017-10-18 17:07:00 +11:00
Greg Wilkins
978fe59957
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-18 15:38:50 +11:00
Greg Wilkins
1dab620fe4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-10-18 15:38:05 +11:00
Greg Wilkins
8ea8295a4c
javadoc
2017-10-18 15:37:41 +11:00
Jan Bartel
1a69841600
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-18 12:46:49 +11:00
Jan Bartel
7517e7fdd9
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-10-18 12:44:52 +11:00
Jan Bartel
84ffdf1447
Issue #1213
...
Update annotation parser for asm 6 support.
2017-10-18 12:42:10 +11:00
Greg Wilkins
7d9645cb11
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-18 12:26:40 +11:00
Greg Wilkins
fa1f103da7
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-10-18 12:26:07 +11:00
Greg Wilkins
aa212df4b1
Use java platform not version
2017-10-18 12:24:53 +11:00
Greg Wilkins
c12ba01014
Issue #1797 use platform for MR jars
2017-10-18 12:24:26 +11:00
Greg Wilkins
44a1f1e1a6
Issue #1797 use platform for MR jars
2017-10-18 12:19:33 +11:00
Jan Bartel
6a921b1180
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-18 11:44:07 +11:00
Jan Bartel
d2acd1acae
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-10-18 11:24:28 +11:00
Jan Bartel
3cffbdf6be
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-10-18 11:24:04 +11:00
Jan Bartel
87a3fd147b
Issue #1213
...
Exclude module-info.class from jetty-runner
2017-10-18 11:22:58 +11:00
Jan Bartel
37c51710b0
Issue #1213
2017-10-18 10:05:59 +11:00
Greg Wilkins
0552553e71
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-17 17:16:13 +11:00
Greg Wilkins
3dbb426a32
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-10-17 17:15:31 +11:00
Greg Wilkins
dd0eaa0f1f
Issue #1901 Backport some java9 support to 9.3
2017-10-17 17:14:18 +11:00
Greg Wilkins
a9e98a5a7e
Issue #1901 Backport some java9 support to 9.3
2017-10-17 17:08:50 +11:00
Greg Wilkins
22f95ad847
Issue #1901 Backport some java9 support to 9.3
2017-10-17 17:01:21 +11:00
Jan Bartel
050d593056
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-17 16:45:31 +11:00
Greg Wilkins
8bcf10395d
Fix #1814 Java Version utility
2017-10-17 15:25:25 +11:00
Greg Wilkins
6b7bbbe66a
Issue #1797 Multi Release Jar javadoc
2017-10-17 15:09:19 +11:00
Greg Wilkins
5de895af88
Issue #1797
...
Converted jetty-util to be a multi release jar
Added org/eclipse/jetty/util/MultiReleaseJarFile as botha java8 and java9 version
deprecated jarScanner
updated AnnotationParser to use MultiReleaseJarFile
2017-10-17 15:06:09 +11:00
Jan Bartel
e00182323b
Issue #1692
2017-10-17 14:43:41 +11:00
Joakim Erdfelt
1295dc372d
Issue #1797 - Safety checks for Java 9 and Multi-Release JARs during bytecode scanning
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2017-10-17 14:43:14 +11:00
Jan Bartel
15a08f2095
Issue #1900
2017-10-17 14:31:11 +11:00
Greg Wilkins
1b7cfbbf2c
Test #1898
2017-10-17 14:13:51 +11:00
Greg Wilkins
0f8bf0a64f
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-10-17 14:08:36 +11:00
Greg Wilkins
52baec434b
Test #1898
2017-10-17 14:04:53 +11:00
Simone Bordet
b1cb393060
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-17 00:10:17 +02:00
Simone Bordet
08a43cd0a2
Issue #1807 - HttpChannel events.
...
Added "dispatchFailure" event, and renamed "request[Before|After]Dispatch"
events to just "[before|after]Dispatch".
2017-10-17 00:09:45 +02:00
Simone Bordet
0ba9c56f85
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-16 18:24:27 +02:00