Jan Bartel
4ec2a154fc
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-19 15:17:46 +11:00
Jan Bartel
3793f974d5
Issue #1909
2017-10-19 15:08:02 +11: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
7d9645cb11
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-18 12:26:40 +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
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
37c51710b0
Issue #1213
2017-10-18 10:05:59 +11:00
Jan Bartel
6b51caa2af
Fix osgi servlet api schemas.
2017-10-06 11:00:56 +11:00
Jan Bartel
d52cba0d44
Issue #1868
...
Fix osgi tests.
2017-10-06 09:37:41 +11:00
Jan Bartel
e9d813552b
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-05 17:37:11 +11:00
Jan Bartel
0282232ca4
Issue #1868
2017-10-05 17:12:21 +11:00
Jan Bartel
562ab9eb80
Fix TestJettyOSGiWithAnnotations test.
2017-09-26 16:04:19 +10:00
Greg Wilkins
1b7ebf5599
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-23 00:22:57 +10:00
Jan Bartel
d808094e82
Issue #1829
2017-09-19 14:32:34 +10:00
Joakim Erdfelt
eee41174f2
Merge branch 'release-9.4.7' into jetty-9.4.x
2017-09-18 14:06:44 -07:00
Joakim Erdfelt
d9865a02ba
Updating to version 9.4.8-SNAPSHOT
2017-09-14 08:44:27 -07:00
Joakim Erdfelt
80fb788d0c
Updating to version 9.4.7.v20170914
2017-09-14 07:35:18 -07:00
Jan Bartel
7ad415b9b8
Issue #1819
2017-09-14 16:07:00 +10:00
Simone Bordet
b7c4e1c7dc
Issue #487 - JDK 9 build compatibility.
...
Made sure that when compiling with JDK 9 we actually use a JDK 8 runtime.
Updated the Maven Compiler Plugin to latest version, with support for
JDK 9 --release command line.
Removed unnecessary Maven Compiler Plugin declarations in POMs.
2017-08-16 12:37:44 +02:00
Greg Wilkins
39cb278577
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-10 13:22:54 +10:00
Jan Bartel
67d93f9f74
Issue #1724
2017-08-10 13:05:50 +10:00
Joakim Erdfelt
1311052b15
Cleaning up state of branch to match the original jetty-9.4.x
...
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
2017-08-08 09:47:04 -07:00
Joakim Erdfelt
585f126b48
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x-clean
2017-08-08 09:24:41 -07:00
Jan Bartel
7c4f7b13f7
Issue #1682
2017-08-08 09:15:35 -07:00
Jan Bartel
77d96ff36d
Issue ##1597
...
Make osgi import of javax.mail optional
2017-08-08 09:13:18 -07:00
Joakim Erdfelt
3fdbcffbbd
Updating to version 9.2.23-SNAPSHOT
2017-08-08 09:12:55 -07:00
Joakim Erdfelt
a7bcac6d75
Updating to version 9.3.20.v20170531
2017-08-08 09:07:35 -07:00
Joakim Erdfelt
11a544d6ac
Updating to version 9.3.22-SNAPSHOT
2017-08-01 11:26:37 -07:00
Joakim Erdfelt
bb1d69ca52
Updating to version 9.3.21.M0
2017-08-01 10:47:04 -07:00
Simone Bordet
f7302a13b4
Merged branch 'jetty-9.4.x' into 'master'.
2017-08-01 11:21:41 +02:00
Jan Bartel
8661a73a3f
Issue #1682
2017-07-28 11:55:57 +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
79cafb37a0
Issue #1676 Removed deprecated module jetty-continuations
2017-07-18 15:42:14 +02:00
Joakim Erdfelt
2e8f9fc748
Revert "Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch"
...
This reverts commit 38c112764d
.
2017-07-12 11:28:32 -07:00
Joakim Erdfelt
38c112764d
Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch
2017-06-28 16:42:37 -07:00
Joakim Erdfelt
76ace004b6
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-09 09:17:43 -07:00
Joakim Erdfelt
5ee1c7a533
Merge branch 'release-9.4.6' into jetty-9.4.x
2017-06-07 10:01:11 -07:00
Jan Bartel
4204061bd4
Issue ##1597
...
Make osgi import of javax.mail optional
2017-06-07 11:59:53 +02:00
Joakim Erdfelt
6a3c40e935
Updating to version 9.4.7-SNAPSHOT
2017-05-31 17:26:34 -07:00
Joakim Erdfelt
8ba0f2d95d
Updating to version 9.4.6.v20170531
2017-05-31 16:22:52 -07:00
Joakim Erdfelt
429380d36a
Updating to version 9.3.21-SNAPSHOT
2017-05-31 16:10:04 -07:00
Joakim Erdfelt
0f3b1cbe36
Updating to version 9.3.20.v20170531
2017-05-31 15:24:57 -07:00
Greg Wilkins
32bc9292a2
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-31 11:56:47 +02:00
Christoph Dreis
e9f398cf41
Deprecate ConcurrentHashSet ( #1570 )
...
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2017-05-30 21:46:11 +02:00
Simone Bordet
94c9fc548c
Merged branch 'jetty-9.4.x' into 'master'.
2017-05-18 21:12:50 +02:00