Commit Graph

76 Commits

Author SHA1 Message Date
Joakim Erdfelt f56fb440a5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-03-26 11:50:47 -05:00
Joakim Erdfelt e2cd16f8aa Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-03-26 11:38:04 -05:00
Joakim Erdfelt c3cc138a3b Updating to version 9.4.10-SNAPSHOT 2018-03-20 08:25:59 -05:00
Joakim Erdfelt 1f8159b1e4 Updating to version 9.4.9.v20180320 2018-03-20 07:18:24 -05:00
olivier lamy c2b2935cee #2344 upgrade javadoc plugin to 3.0.0
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-17 11:18:07 +10:00
Joakim Erdfelt e3e3f9eb0b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed 2018-03-06 11:16:25 -06:00
Joakim Erdfelt ae35ffdb38 Correcting jetty-bom versions 2018-02-28 16:43:11 -06:00
Joakim Erdfelt a05b157c03 Updating to version 9.3.24-SNAPSHOT 2018-02-28 16:39:30 -06:00
Joakim Erdfelt 0554f8d8b4 Updating to version 9.3.23.v20180228 2018-02-28 15:45:57 -06:00
olivier lamy 4d22576bf2 fix bom
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-19 15:46:38 +10:00
WalkerWatch 1458a232d5 Updating jetty-bom pom to 9.4.9-SNAPSHOT 2018-01-24 09:32:52 -05:00
Joakim Erdfelt d5a0878019 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-01-09 10:08:30 -06:00
Joakim Erdfelt 41ed9f29f4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-01-09 09:37:25 -06:00
Greg Wilkins b2ff7c5cb8 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-01-08 21:30:12 +01:00
olivier lamy b3b0bf97e1 remove non valid pom dependency from bom and add distrib with type #2093
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-08 10:03:27 +11:00
olivier lamy 0630256db0 remove pom dependency from bom and add type for non jar entries #2093
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-08 09:48:43 +11:00
Joakim Erdfelt ff53002fac Updating to version 9.4.9-SNAPSHOT 2017-11-21 13:11:31 -07:00
Joakim Erdfelt 82b8fb23f7 Updating to version 9.4.8.v20171121 2017-11-21 12:33:52 -07:00
Jesse McConnell a72eb0001d Updating to version 9.3.23-SNAPSHOT 2017-10-30 15:39:57 -05:00
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