Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,076 Commits 68 Branches 465 Tags 359 MiB
Commit Graph

974 Commits

Author SHA1 Message Date
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
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
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 f315ec8b4c Fixing imports 2017-04-05 07:07:43 -07:00
Greg Wilkins dd084b4e74 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-03-30 17:20: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 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 4543c73052 Merge branch 'jetty-9.4.x' 2017-01-28 16:24:15 -06:00
Jesse McConnell 700491f0da Merge pull request #1289 from earldouglas/its 
Replace contraction with possesive
 2017-01-28 16:23:39 -06:00
Jesse McConnell 9574ec2fa1 Merge branch 'jetty-9.4.x' 2017-01-27 17:16:24 -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 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
Simone Bordet 843192efea Merged branch 'jetty-9.4.x' into 'master'. 2017-01-17 11:41:25 +01: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
Simone Bordet b7b3dfdc77 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-12 17:53:09 +01:00
Simone Bordet e539d0b1fd Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-12 17:52:45 +01:00
Simone Bordet 11d669092a Issue #1073 - JDK9 support in Jetty 9.3.x. 
* Updated Maven plugins to versions that support JDK 9.
* Added jdk9 profiles to the build files.
* Introduced modules jetty-alpn-java-client and jetty-alpn-java-server
containing a pure JDK 9 implementation of ALPN.
* Wired ALPN connection factories (client and server) to use the proper
ALPN implementation based on the JDK platform version (8 or 9).
 2017-01-12 15:41:02 +01:00