Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,121 Commits 72 Branches 465 Tags 369 MiB
Commit Graph

1327 Commits

Author SHA1 Message Date
Simone Bordet 4b0003f086 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-07-24 11:13:32 +02:00
Simone Bordet a0026fd9d2 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-07-24 10:44:39 +02:00
Simone Bordet 3f94a5d132 Fixes #1685 - Update ALPN support for Java 8u141. 2017-07-24 10:08:10 +02:00
Greg Wilkins 79cafb37a0 Issue #1676 Removed deprecated module jetty-continuations 2017-07-18 15:42:14 +02:00
Joakim Erdfelt a9c329859d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-12 13:18:12 -07:00
Joakim Erdfelt 2e8f9fc748 Revert "Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch" 
This reverts commit 38c112764d.
 2017-07-12 11:28:32 -07:00
Joakim Erdfelt 38c112764d Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch 2017-06-28 16:42:37 -07:00
Joakim Erdfelt a1810fa952 Issue #1650 - update clirr to report on API changes 2017-06-27 14:15:19 -07:00
Joakim Erdfelt 2eea25cb1e Restoring 8u131 profile to main pom 2017-06-26 13:38:00 -07:00
Joakim Erdfelt 67cccd610a Post cherry-pick cleanup of jetty-9.4.x...master jetty-websocket 2017-06-26 13:11:33 -07:00
Greg Wilkins 17f6c28c7d Issue #1503 Optionally strip IPv6. Default true 2017-06-26 11:59:40 -07:00
Joakim Erdfelt fcb8693c52 Issue #207 - testcase rework due to new async behaviors 
# Conflicts:
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/ConnectionManager.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/RegexMatcher.java
 2017-06-26 11:49:53 -07:00
Joakim Erdfelt 70d4850ed1 Issue #207 - working @PathParam support 2017-06-26 11:31:42 -07:00
Joakim Erdfelt 3906f9595f 467246 - Support javax.websocket version 1.1 
+ WIP
 2017-06-26 10:55:04 -07:00
Joakim Erdfelt 00beb607fc Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-13 10:40:02 -07:00
Joakim Erdfelt 5665bb6ba4 Using released version of jetty-test-helper 2017-06-09 09:47:43 -07:00
Joakim Erdfelt 76ace004b6 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-09 09:17:43 -07:00
olivier lamy a3be81e618 add new module for hazelcast session manager 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-06-08 22:00:24 +10:00
olivier lamy 8a300613df add Hazelcast session management #1571 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-06-08 13:02:22 +10:00
Joakim Erdfelt 4d2c299fe8 Updating to version 9.2.23-SNAPSHOT 2017-06-06 08:55:12 -07:00
Greg Wilkins ad76aa6c65 Issue #1503 Optionally strip IPv6. Default true 2017-06-06 17:07:14 +02:00
Joakim Erdfelt 0af30bce5a Updating to version 9.2.22.v20170606 2017-06-06 07:03:05 -07:00
Joakim Erdfelt 5d7e97993c Merge remote-tracking branch 'origin/master' into issue-207-master 2017-06-05 10:05: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
Joakim Erdfelt 9c3e5c2150 Removing tag, not relevant 2017-05-18 15:47:52 -07:00
Joakim Erdfelt 04b6afe879 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-05-15 09:48:41 -07:00
Joakim Erdfelt 69696b37b6 Using non-SNAPSHOT javax.servlet-api dependency for CI sanity 2017-05-12 14:07:35 -07:00
Joakim Erdfelt 873c3554e7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-12 14:06:21 -07:00
Joakim Erdfelt 98d36ff0b1 Upgrading maven-source-plugin for build stability 2017-05-12 13:41:53 -07:00
Joakim Erdfelt 521cc6520f Some javadoc plugin configuration updates 
(cherry picked from commit 240c217)
 2017-05-12 12:09:10 -07:00
Joakim Erdfelt 240c217c9d Some javadoc plugin configuration updates 2017-05-12 06:41:01 -07:00
Joakim Erdfelt 036a880f74 Revert "Disabling detection of javadoc links, only use configured ones" 
This reverts commit 7b6dec43f2.
 2017-05-12 06:09:20 -07:00
Greg Wilkins cbe857de01 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-11 10:08:36 +02:00
Joakim Erdfelt 7b6dec43f2 Disabling detection of javadoc links, only use configured ones 2017-05-10 08:28:57 -07:00
Greg Wilkins 0326af2ce9 renamed for clarity 2017-05-09 09:19:54 +02:00
Greg Wilkins a89d0b1578 use b05 servlet api 2017-05-03 11:48:54 +02:00
Greg Wilkins ce8342f12a Updated to latest servlet 4.0 draft 2017-05-03 11:04:57 +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 146a1d5ed5 Merged branch 'jetty-9.4.x' into 'master'. 2017-05-02 22:17:06 +02:00
Simone Bordet 861372c70d Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-05-02 22:16:45 +02:00
Simone Bordet c955fb609e Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-05-02 22:12:29 +02:00
Simone Bordet 9ba7b713d2 Fixes #1523 - Update ALPN support for Java 8u131. 2017-05-02 22:01:00 +02:00
Greg Wilkins 68caf72835 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-01 13:30:41 +02:00
Joakim Erdfelt 002ba9cf00 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 
Conflicts:
	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/AltFilterTest.java
	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeAnnotatedTest.java
	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeContainerTest.java
	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/DecoratorsTest.java
	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/TestABCase3.java
	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/WebSocketCloseTest.java
 2017-04-28 06:01:06 -07:00
Joakim Erdfelt f2dce2944a Fixing build: [WARNING] Unable to locate Source XRef to link to 2017-04-26 08:51:54 -07:00
Joakim Erdfelt 849ad7c917 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-04-21 09:00:54 -07:00
Joakim Erdfelt a654c7c9e5 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 
Conflicts:
	pom.xml
 2017-04-20 18:33:07 -07:00
Joakim Erdfelt 803542c485 Merge pull request #1430 from olamy/feature/bom-artifact 
#1348 add BOM artifact
 2017-04-20 06:19:08 -07:00
olivier lamy a2f89f2bf9 implementation for #1481 
Add a new base class UserStore

Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-04-20 15:03:04 +10: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
Joakim Erdfelt 7e2e64e856 Issue #207 - testcase rework due to new async behaviors 2017-04-11 15:46:47 -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
Greg Wilkins dd084b4e74 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-03-30 17:20:22 +11:00
olivier lamy 9a8b753343 change to jetty-bom 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-03-30 11:07:24 +11:00
olivier lamy e036e6a7b5 #1348 add BOM artifact 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-03-28 16:53:26 +11:00
Joakim Erdfelt b8ddef08d6 Merge remote-tracking branch 'origin/release-9.4.3' into jetty-9.4.x 2017-03-22 09:31:44 -07:00
Joakim Erdfelt 78450cb843 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-22 09:23:25 -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 5ecb8b8526 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-17 09:04:37 -07:00
Joakim Erdfelt 97f488dea4 Issue #1383 - fixing javadoc w/script issue in java 8u121+ 2017-03-17 09:03:38 -07:00
Joakim Erdfelt 9273d99a99 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-03-15 15:07:17 -07:00
Joakim Erdfelt 59c31a40e3 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-14 12:07:57 -07:00
Joakim Erdfelt 3168e2b1e5 Issue #1394 - hardcoding locale in surefire testing too 2017-03-13 11:17:53 -07:00
Joakim Erdfelt f293f637c8 Issue #1394 - fix default character encoding for surefire testing 2017-03-13 11:10:10 -07:00
Greg Wilkins 05f05520eb Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-03-07 07:55:36 +11:00
Joakim Erdfelt 0316e18f91 Issue #207 - working @PathParam support 2017-02-23 15:38:57 -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
Joakim Erdfelt c5c7be2bc5 Merge branch 'jetty-9.4.x' 2017-02-02 16:23:13 -07:00
Joakim Erdfelt 5e57b9562f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2017-02-02 16:14:10 -07:00
Joakim Erdfelt 9a8f22d5dd Testing Updates 
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
  in jetty-test-helper and the test classes.
 2017-02-02 15:51:38 -07:00
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
Simone Bordet 096b4d6e1e Merged branch 'jetty-9.4.x' into 'master'. 2017-01-23 21:46:54 +01:00
Simone Bordet 20f57fcd14 Fixed version for the maven-eclipse-plugin. 2017-01-23 21:45:43 +01:00
Jesse McConnell a2aa2679e3 Merge branch 'jetty-9.4.x' 2017-01-23 09:46:46 -06: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 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
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