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

207 Commits

Author SHA1 Message Date
Jesse McConnell 705048cc49 Updating to version 9.3.22.v20171030 2017-10-30 15:16:29 -05:00
Simone Bordet 54eb4a0f19 Merged branch 'jetty-9.4.x' into 'master'. 2017-10-23 15:32:47 +02:00
Andy Wilkinson 0dfdd43cc2 Correct groupId of websocket-servlet in jetty-bom (#1860) 
Signed-off-by: Andy Wilkinson <awilkinson@pivotal.io>
 2017-10-20 22:00:51 +11:00
Jan Bartel 050d593056 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-17 16:45:31 +11:00
Greg Wilkins c35d7724f4 fixed merge 2017-09-23 09:23:40 +10:00
Greg Wilkins 6ef618e8cf Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-09-23 09:22:41 +10:00
Greg Wilkins 9163ff20bb Issue #215 Conscrypt module for SSL and ALPN 
Added new modules to the bom
 2017-09-23 09:22:03 +10:00
Greg Wilkins 1b7ebf5599 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-09-23 00:22:57 +10:00
Joakim Erdfelt 12874baaa8 Fixing jetty-bom references for Jetty 9.3.x 2017-09-18 14:15:46 -07:00
Joakim Erdfelt eee41174f2 Merge branch 'release-9.4.7' into jetty-9.4.x 2017-09-18 14:06:44 -07:00
olivier lamy ff11a3edd4 fix groupdId for websocket-servlet and comment jetty-monitor as it is not part of the build anymore 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-09-18 17:12:47 +10:00
olivier lamy f0df30cc94 fix artifactIds for fcgi 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-09-18 17:06:03 +10:00
Joakim Erdfelt d9865a02ba Updating to version 9.4.8-SNAPSHOT 2017-09-14 08:44:27 -07:00
Joakim Erdfelt 80fb788d0c Updating to version 9.4.7.v20170914 2017-09-14 07:35:18 -07:00
Joakim Erdfelt 651f422034 Merge branch 'jetty-9.4.x' to 'master' 2017-08-18 10:54:58 -07:00
Joakim Erdfelt f2cf8b9bf8 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2017-08-16 09:39:55 -07:00
Joakim Erdfelt b8ccd444ae Bumping jetty-bom to same SNAPSHOT version as rest of project 2017-08-16 08:50:13 -07:00
Simone Bordet 3af1f11839 Issue #1741 - Java 9 javadoc failure in build. 
Updated Maven Javadoc Plugin to 3.0.0-M1 and removed unused imports
that were influencing somehow the Javadoc generation.
 2017-08-15 23:01:01 +02:00
Simone Bordet 27a7d2e634 Merged branch 'jetty-9.4.x' into 'master'. 2017-08-15 19:47:40 +02:00
Joakim Erdfelt 3c96cf200b Updating plugins in jetty-bom 2017-08-15 10:41:32 -07:00
Simone Bordet d8861c795c Merged branch 'jetty-9.4.x' into 'master'. 2017-08-15 18:54:11 +02:00
Joakim Erdfelt dea0a05043 Issue #1738 adding missing section in jetty-bom 2017-08-15 09:27:47 -07: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
Greg Wilkins 0f06d4a480 update BOM to use ${project.version} 2017-08-08 09:13:26 -07:00
olivier lamy b8e4f72e38 add Hazelcast session management #1571 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-08-08 09:13:19 -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
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 157c4d7d76 Issue #1650 - removing cdi-websocket support 2017-06-28 16:39:40 -07:00
Joakim Erdfelt 00beb607fc Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-13 10:40:02 -07:00
Jan Bartel 09bc4f3d8b Merge pull request #1575 from olamy/feature/hazelcast_session_management 
add Hazelcast session management #1571
 2017-06-13 15:58:28 +02:00
Greg Wilkins 5066dd7d13 update BOM to use ${project.version} 2017-06-08 08:55:10 +02: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 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
Greg Wilkins d3e50f8f80 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-22 23:37:51 +02:00
Joakim Erdfelt b32f652d7c Issue #1536 adding missing artifacts 2017-05-22 10:33:01 -07:00
Joakim Erdfelt 59c86307cb Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-05-18 16:05:57 -07:00
Joakim Erdfelt 7f497e8720 Issue #1527 - jetty-bom, breaking the build again 2017-05-18 15:48:01 -07:00
olivier lamy 59a70a3cf5 fix for #1527 9.4.x branch 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-05-11 14:03:36 +10:00
olivier lamy 6d92c4c931 fix for #1527 9.3.x branch 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-05-11 13:46:57 +10: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
Greg Wilkins 68caf72835 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-01 13:30:41 +02:00
Simone Bordet 8af0d153e0 Updated version to correct value. 2017-04-24 18:42:19 +02:00
olivier lamy a3f77a127c update bom with new 9.4 modules 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-04-21 14:37:48 +10: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
olivier lamy a9fbfc0868 fix issues from pr review #1348 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-04-01 19:43:48 +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