Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 00:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,678 Commits 55 Branches 466 Tags
Commit Graph

954 Commits

Author SHA1 Message Date
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
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
Christoph Dreis
e9f398cf41 Deprecate ConcurrentHashSet (#1570) 
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
 2017-05-30 21:46:11 +02:00
WalkerWatch
82c909acdc Documentation updates 2017-05-18 12:12:32 -04: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
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
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
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
Joakim Erdfelt
92afe54c1d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-10 13:22:32 -07:00
Joakim Erdfelt
e25007cb79 Issue #1390 - Addressing new File(URL) use in Windows 
+ Fixing HashLoginService to track its Config via File reference only
  (dropping support for URL reference)
+ Adding new `this.web-inf.path` property that jetty-web.xml can use
 2017-03-10 12:47:06 -07:00
Jan Bartel
5933f70ae6 Issue #1049 
Ensure file paths for osgi config files are correct urls
 2017-03-10 09:34:20 -07:00
Joakim Erdfelt
cf507084fe Cherry-pick Cleanup 2017-03-10 09:04:02 -07:00
Jan Bartel
7dc61365e4 Issue #1387 
Upgraded paxexam and osgi container.
 2017-03-10 09:02:40 -07:00
Jan Bartel
20c50424a3 Issue #1387 
Upgraded paxexam and osgi container.
 2017-03-10 17:28:42 +11:00
Jan Bartel
72fe2a88c2 Issue #1049 
Ensure file paths for osgi config files are correct urls
 2017-03-10 11:59:20 +11:00
Joakim Erdfelt
01d539e2be Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-09 14:20:19 -07:00
Joakim Erdfelt
e796063ace Issue #1049 - Upgrading paxexam, downgrading surefire 2017-03-09 07:43:26 -07:00
Joakim Erdfelt
76c6377ed7 Windows Test Issue 
+ Adding slf4j-simple to test scope to attempt to capture reason
  for the test setup failure:

  "org.osgi.framework.BundleException: Error while renaming bundle file
  to final location C:\"
 2017-03-09 06:58:45 -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
700491f0da Merge pull request #1289 from earldouglas/its 
Replace contraction with possesive
 2017-01-28 16:23:39 -06:00
Jan Bartel
0b45f377bf Issue #1290 2017-01-27 15:42:52 +11:00
James Earl Douglas
590838f644
Replace contraction with possesive 2017-01-26 19:26:50 -07: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
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