Commit Graph

579 Commits

Author SHA1 Message Date
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
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 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
WalkerWatch 82c909acdc Documentation updates 2017-05-18 12:12:32 -04: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 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 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 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
Simone Bordet f8e3b1f9c2 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-17 11:38:45 +01:00
Simone Bordet 9e9ee03d7f Issue #1073 - JDK9 support in Jetty 9.3.x.
Fixed dependencies for modules that run tests that require ALPN.
2017-01-17 11:32:20 +01: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
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
Joakim Erdfelt ade14ba34b Updating to version 9.3.14-SNAPSHOT 2016-10-14 11:33:51 -07:00