Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,885 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

13885 Commits

Author SHA1 Message Date
Jesse McConnell bba4a8bbf6 Merge remote-tracking branch 'origin/release-9.4.1' into jetty-9.4.x 2017-01-26 11:22:08 -06:00
Jesse McConnell 76e0bb1e81 merge jetty-9.3.x to jetty-9.4.x 2017-01-26 11:21:33 -06:00
Jesse McConnell 635355c6e7 Merge remote-tracking branch 'origin/release-9.3.16' into jetty-9.3.x 2017-01-26 11:07:27 -06:00
Jesse McConnell b844747d41 merge jetty-9.2.x into jetty-9.3.x 2017-01-26 11:07:01 -06:00
Simone Bordet 9b7bde499a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-23 21:46:11 +01:00
Simone Bordet 20f57fcd14 Fixed version for the maven-eclipse-plugin. 2017-01-23 21:45:43 +01:00
Simone Bordet b4fb6a74c7 Fixes #1282 - ByteArrayEndPointTest.testIdle() failure. 
Reworked the waits in the test to avoid idle timeout checks happening
about at the same time as test operations.
 2017-01-23 21:44:32 +01:00
Jesse McConnell f2be9f2255 add scp to site plugin so we can deploy docs after release 2017-01-23 09:46:29 -06: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 408a94873f set for release 2017-01-20 12:30:27 -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 1ba41c336d set for release 2017-01-20 09:46:59 -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
Jesse McConnell b4260da2d6 set for release 2017-01-20 09:04:10 -06:00
Simone Bordet c7c183c370 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-20 15:42:39 +01:00
Simone Bordet acab5ef18e Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-01-20 15:42:12 +01:00
Simone Bordet 9653d74cae Issue #1229 - ClassLoader constraint issue when using NativeWebSocketConfiguration with WEB-INF/lib/jetty-http.jar present. 
Guarded against NPE.
 2017-01-20 15:41:41 +01:00
Simone Bordet ee17396cee Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-20 12:27:29 +01:00
Simone Bordet 9ae93c19ca Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-01-20 12:20:21 +01:00
Simone Bordet 51f68dc57e Issue #1229 - ClassLoader constraint issue when using NativeWebSocketConfiguration with WEB-INF/lib/jetty-http.jar present. 
Introduced String-based APIs to specify mappings, to avoid the
classloader issue.
 2017-01-20 11:34:29 +01:00
Simone Bordet a205fb3aae Fixes #1276 - Remove org.eclipse.jetty.websocket.server.WebSocketServerFactory from SPI. 2017-01-20 09:55:01 +01:00
Greg Wilkins 389ef2a2a3 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-01-20 15:57:33 +11:00
Greg Wilkins f9c829f7cc Issue #1269 
report inferred encoding
 2017-01-20 11:38:21 +11:00
Greg Wilkins 91987d4233 Issue #1269 
Stop call to getCharacterEncoding forcing a choice.
 2017-01-20 11:18:23 +11:00
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet d18f32f139 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-19 19:20:46 +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
Simone Bordet dc1658fad3 Revert "resolve merge and update license headers" 
This reverts commit 3c53b3a32f.
 2017-01-19 18:26:10 +01:00
Jesse McConnell 3c53b3a32f resolve merge and update license headers 2017-01-19 09:38:22 -06: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 4e0800fa5a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-19 15:22:16 +01:00
Simone Bordet 4565c186d7 Fixes #1277 - http2 alpn test error. 2017-01-19 15:18:55 +01:00
Jan Bartel 7fd8036f93 Issue #1271 
Update to org.mortbay.jasper 8.5.9.1
 2017-01-19 14:52:51 +11:00
Jan Bartel 1ecaac9383 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-01-19 13:53:51 +11:00
Jan Bartel edfd05dd9c Issue #1268 
Add unit tests, tweak log and error messages, fix bug.
 2017-01-19 13:49:50 +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
Simone Bordet a7938910b7 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-18 18:54:47 +01:00
Simone Bordet 53281d3202 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-01-18 18:52:20 +01:00
Simone Bordet 79202d1cc6 Updated ALPN version for JDK 8u121. 2017-01-18 18:30:30 +01:00
Simone Bordet 6222ccba14 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-18 17:28:18 +01:00
Simone Bordet d8aafea4b4 Fixes #1272 - Update ALPN versions for 8u111. 
Updated ALPN table for 8u111 and 8u112.
 2017-01-18 17:14:23 +01:00
Simone Bordet f97396b131 Fixes #1275 - Get rid of Mockito. 
Converted the 2 tests that were using Mockito and removed from the POMs.
 2017-01-18 17:09:57 +01:00
Jan Bartel 608a33bbad Revert "Issue #1271" 
This reverts commit 9a7920a0fb.
 2017-01-19 00:22:42 +11:00
Simone Bordet 6ab0e71b38 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-18 10:42:23 +01:00