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
2555f7a65b
Issue #1852
2017-09-27 14:32:14 +10: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
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
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
Joakim Erdfelt
4d2c299fe8
Updating to version 9.2.23-SNAPSHOT
2017-06-06 08:55:12 -07:00
Joakim Erdfelt
0af30bce5a
Updating to version 9.2.22.v20170606
2017-06-06 07:03:05 -07: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
b5a3eb1f70
removed Configuration marker classes
2017-05-11 11:32:23 +02:00
Greg Wilkins
1fc046fb3d
renamed for clarity
2017-05-09 09:52:20 +02:00
Joakim Erdfelt
cf56168f7d
Updating to version 9.3.20-SNAPSHOT
2017-05-02 15:26:56 -07:00
Joakim Erdfelt
d36d57d5c7
Updating to version 9.3.19.v20170502
2017-05-02 14:31:51 -07:00
Joakim Erdfelt
782f36f157
Updating to version 9.4.6-SNAPSHOT
2017-05-02 14:29:09 -07:00
Joakim Erdfelt
9d8ad7489c
Updating to version 9.4.5.v20170502
2017-05-02 13:22:18 -07:00
Simone Bordet
cab1ec77ad
Merged branch 'jetty-9.4.x' into 'master'.
2017-05-02 10:03:30 +02:00
Greg Wilkins
5493c9e596
Refactor ServletHandler to add getMappedServlet method ( #1519 )
2017-05-01 16:38:55 +02:00
Greg Wilkins
68caf72835
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-01 13:30:41 +02:00
Joakim Erdfelt
92ea5bda21
Updating to version 9.4.5-SNAPSHOT
2017-04-14 14:43:36 -07:00
Joakim Erdfelt
3dc8f557c6
Updating to version 9.4.4.v20170414
2017-04-14 13:20:17 -07:00
Jan Bartel
8885f24ccb
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-04-12 11:26:09 +10:00
Jan Bartel
daafc8fed1
Issue #877
...
Add test case
2017-04-12 11:08:07 +10:00
Joakim Erdfelt
9e2aeda052
Updating to version 9.3.19-SNAPSHOT
2017-04-06 07:47:53 -07:00
Joakim Erdfelt
63273aa40b
Updating to version 9.3.18.v20170406
2017-04-06 06:31:02 -07:00
Jan Bartel
976ffb7ecd
Issue #877
...
And also #1117
2017-03-23 11:24:22 +11:00
Joakim Erdfelt
1360b863dc
Updating to version 9.4.4-SNAPSHOT
2017-03-17 10:53:54 -07:00
Joakim Erdfelt
95e94b49d8
Updating to version 9.4.3.v20170317
2017-03-17 09:54:58 -07:00
Joakim Erdfelt
a6a0ab991f
Updating to version 9.3.18-SNAPSHOT
2017-03-17 09:48:19 -07:00
Joakim Erdfelt
307d23975e
Updating to version 9.3.17.v20170317
2017-03-17 09:07:39 -07:00
Greg Wilkins
9ea4f128d4
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-09 15:59:58 +11:00
Joakim Erdfelt
6cf0663fe8
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-03-08 17:47:27 -07:00
Joakim Erdfelt
298de714f6
More windows build fixes
2017-03-08 15:29:54 -07:00
Joakim Erdfelt
523fab30bd
Updating to version 9.4.3-SNAPSHOT
2017-02-20 08:13:31 -07:00
Joakim Erdfelt
4a674b9cc9
Updating to version 9.4.2.v20170220
2017-02-20 06:22:45 -07:00
Jesse McConnell
e695fc80d6
Updating to version 9.2.22-SNAPSHOT
2017-01-20 12:32:51 -06:00
Jesse McConnell
513b5e5f90
Updating to version 9.2.21.v20170120
2017-01-20 12:32:00 -06: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 53b31b03dd
, reversing
changes made to 4565c186d7
.
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
Jesse McConnell
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
Jan Bartel
d33f42fbab
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-01-19 10:26:11 +11:00
Jan Bartel
255ae29e2a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-01-19 10:25:13 +11:00
Jan Bartel
eeae3bfdad
Issue #1274
2017-01-19 10:24:31 +11: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
Joakim Erdfelt
6b3b59df43
Updating to version 9.2.21-SNAPSHOT
2016-12-16 16:23:06 -07:00
Joakim Erdfelt
bcbcee7f23
Updating to version 9.2.20.v20161216
2016-12-16 15:47:41 -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
4d7a629e1b
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-01 12:07:07 +11:00
Jan Bartel
ce6054391c
Issue #877
2016-12-01 11:57:54 +11:00
Jan Bartel
79c364368d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-11-24 15:51:06 +11:00
Jan Bartel
40d9e56d92
Issue #1117
2016-11-24 14:04:37 +11:00
Joakim Erdfelt
fa6d9029fc
Merge branch 'jetty-9.4.x'
2016-11-15 14:30:19 -07: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
eda0cff90a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-10-28 10:55:03 +11:00
Greg Wilkins
9f430ae7f7
Issue #1038 i
...
Handle resources as URIs
Avoid unneccessary trailing /
2016-10-28 10:50:39 +11:00
Greg Wilkins
6e1994641b
Issue #1038
...
Readded sorting of attributes by length
added .uri attributes
support WAR.path and WAR.uri in preference to WAR
updated for latest unit test
2016-10-28 10:31:22 +11:00
Greg Wilkins
b17dafc2ad
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-10-27 16:34:44 +11:00
Greg Wilkins
0f7028e9fa
Quickstart attribute normilazation #1038
...
Removed a lot of bad tests that incorrection assumed it was OK to mix Paths and URIs like:
jar:file:${jetty.base}/webapps/some.war!/some/path
refactored to keep PathAttributes and URIAttributes separate
2016-10-27 16:29:52 +11:00
Joakim Erdfelt
55c6514a2e
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-10-26 16:42:42 -07: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
a7ac269027
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-10-26 11:42:49 -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
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
Jesse McConnell
863913b64e
set for dev
2016-09-30 19:05:47 +00:00
Jesse McConnell
b91cc8a4ea
set for release
2016-09-30 18:01:20 +00:00
Joakim Erdfelt
6cf10172ca
Updating to version 9.3.13-SNAPSHOT
2016-09-15 07:34:52 -07:00
Joakim Erdfelt
8b35fdc5a5
Updating to version 9.3.12.v20160915
2016-09-15 06:48:16 -07:00
Joakim Erdfelt
fb7da26ad2
Updating to version 9.2.20-SNAPSHOT
2016-09-08 13:04:11 -07:00
Joakim Erdfelt
7b94bc32f4
Updating to version 9.2.19.v20160908
2016-09-08 12:11:44 -07:00
Joakim Erdfelt
6e1b1cdb36
Updating to version 9.3.12-SNAPSHOT
2016-07-21 19:07:19 -07:00
Joakim Erdfelt
9fd6d4354e
Updating to version 9.3.11.v20160721
2016-07-21 18:37:09 -07:00
Joakim Erdfelt
0b18340179
Updating to version 9.2.19-SNAPSHOT
2016-07-21 13:10:23 -07:00
Joakim Erdfelt
d3ff3423f0
Updating to version 9.2.18.v20160721
2016-07-21 12:35:26 -07:00
Jan Bartel
b1d0661655
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-01 18:33:29 +10:00
Jan Bartel
aeda5a40a2
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-01 18:31:39 +10:00
Jan Bartel
29e6c6c4a4
Issue #682
2016-07-01 17:48:32 +10:00
Jesse McConnell
ae931538ab
[maven-release-plugin] prepare for next development iteration
2016-06-22 13:59:10 -05:00
Jesse McConnell
df1ed4fb03
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 13:59:06 -05:00