228 Commits

Author SHA1 Message Date
Joakim Erdfelt
1f2ed754f3 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-02-15 11:35:44 -07:00
Joakim Erdfelt
0cd8d21bfd Issue #1331 - replacing with ${jetty.base.uri} form 2017-02-15 11:34:47 -07:00
Jan Bartel
011c9171ba Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-02-08 16:53:50 +11:00
Jan Bartel
0520af0dc3 Issue #1300
Remove debug logging
2017-02-08 09:51:17 +11:00
Jan Bartel
7bc0ae57ca Issue #1300 2017-02-08 09:24:28 +11:00
Joakim Erdfelt
c5c7be2bc5 Merge branch 'jetty-9.4.x' 2017-02-02 16:23:13 -07:00
Jan Bartel
6a03404658 Issue #1298
Generate files header.
2017-02-02 18:30:19 +11:00
Jan Bartel
2652b81fb1 Issue #1298 2017-02-02 18:14:23 +11:00
Greg Wilkins
0386589793 prototype files generation 2017-02-02 16:52:25 +11:00
Jesse McConnell
d0c33ebe8b Updating to version 9.4.2-SNAPSHOT 2017-01-20 10:49:06 -06:00
Jesse McConnell
556ecbcdcf Updating to version 9.4.1.v20170120 2017-01-20 09:47:53 -06:00
Jesse McConnell
66b43ecda8 Updating to version 9.3.17-SNAPSHOT 2017-01-20 09:33:43 -06:00
Jesse McConnell
df03355d00 Updating to version 9.3.16.v20170120 2017-01-20 09:06:48 -06:00
Simone Bordet
cef2ff9522 Happy New Year 2017. 2017-01-19 19:31:53 +01:00
Simone Bordet
0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet
07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet
347c48d657 Revert "resolve merge and update license headers"
This reverts commit 53b31b03ddda3776f3db71e28e55312b1c982092, reversing
changes made to 4565c186d7491a97d72217a96e86b15ced506de6.
2017-01-19 18:26:43 +01:00
Jesse McConnell
53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Joakim Erdfelt
7494914ff6 Updating to version 9.3.16-SNAPSHOT 2016-12-20 13:09:32 -07:00
Joakim Erdfelt
680ecd646b Updating to version 9.3.15.v20161220 2016-12-20 12:31:58 -07:00
Jesse McConnell
6a7e5dd4f5 Updating to version 9.4.1-SNAPSHOT 2016-12-08 09:41:50 -06:00
Jesse McConnell
c54efb5929 Updating to version 9.4.0.v20161208 2016-12-08 08:56:45 -06:00
Jesse McConnell
f8338b3f59 Updating to version 9.4.1-SNAPSHOT 2016-12-07 10:32:41 -06:00
Jesse McConnell
dac1d17a2d Updating to version 9.4.0.v20161207 2016-12-07 09:47:30 -06:00
Jan Bartel
693c4e6e1a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-01 17:07:54 +11:00
Jan Bartel
f2d8157b1e Issue #1143 2016-12-01 17:07:07 +11:00
Joakim Erdfelt
fa6d9029fc Merge branch 'jetty-9.4.x' 2016-11-15 14:30:19 -07:00
Jan Bartel
c0c7a9a5df Issue #1091 2016-11-11 10:39:34 +11:00
Joakim Erdfelt
2c38511828 Updating to version 9.3.15-SNAPSHOT 2016-10-28 13:01:34 -07:00
Joakim Erdfelt
14611d2f76 Updating to version 9.3.14.v20161028 2016-10-28 12:21:02 -07: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
d3deeff32c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-20 12:39:33 +11:00
Jan Bartel
6ff5a3a7e9 Issue #1017 2016-10-20 12:38:05 +11:00
Greg Wilkins
f9be11bcc2 Improve logging modules and listing #984
cleanup logging config
2016-10-20 10:57:56 +11:00
Simone Bordet
6db48b2f02 Merged branch 'jetty-9.4.x' into 'master'. 2016-10-19 16:35:36 +02:00
Greg Wilkins
a32923b66e Improve logging modules and listing #984
added jul-slf4j
updated logging dependencies
2016-10-19 16:25:18 +11:00
Simone Bordet
39f47244fa Merged branch 'jetty-9.4.x' into 'master'. 2016-10-17 15:36:32 +02:00
Joakim Erdfelt
ade14ba34b Updating to version 9.3.14-SNAPSHOT 2016-10-14 11:33:51 -07:00
Joakim Erdfelt
c3a78e70a8 Updating to version 9.3.13.v20161014 2016-10-14 10:39:37 -07:00
Jan Bartel
18693074de Issue #1007 2016-10-14 15:53:52 +11:00
Greg Wilkins
b11757a1e2 Issue #984 Improve module listing
Fixed cycle in logging from gcloud datastore
2016-10-14 15:42:12 +11:00
Jan Bartel
6a2316fb23 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-13 15:21:51 +11:00
Greg Wilkins
9d475a624b Normalize tags #998 2016-10-13 10:06:17 +11:00
Jan Bartel
6489d7fd23 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-11 18:00:12 +11:00
Greg Wilkins
d8b1c88abc Issue #984 Improve module listing
Reworked logging modules
added support for ,= and += properties
2016-10-07 12:48:47 +11:00
Jan Bartel
f0c5c0f149 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-07 10:58:58 +11:00
Jan Bartel
97d18665ef Issue #963
Remove debug and fix NPE
2016-10-07 10:58:12 +11:00
Jan Bartel
f7f49fa96e Issue #954
Extra debug when checking for indexes.
2016-10-07 09:50:33 +11:00
Simone Bordet
bcc29de3eb Merged branch 'jetty-9.4.x' into 'master'. 2016-10-06 16:37:43 +02:00
Greg Wilkins
91e9e7b76a Issue #984 Improve module listing 2016-10-06 17:01:08 +11:00