Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-25 00:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,206 Commits 55 Branches 466 Tags
Commit Graph

838 Commits

Author SHA1 Message Date
Lachlan Roberts
a639ee9275 Resolved errorprone MissingOverride warnings #2206 
`@Override` was added to methods which were missing the annotation #2206

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-03-01 13:59:25 +11:00
Joakim Erdfelt
650b804142 Issue #2108 - Updating license headers for year 2018 2018-01-09 10:14:52 -06: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
21365234f8 Issue #2108 - Updating license headers for year 2018 2018-01-09 09:44:41 -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
Joakim Erdfelt
fa4c7b0ca9 Issue #2108 - Updating license headers for year 2018 2018-01-09 08:39:37 -06:00
Joakim Erdfelt
067fc5d2d8 Issue #2108 - Upgrade licenses for 2018 2018-01-09 07:42:06 -06:00
Greg Wilkins
45e3abbdcf Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-01-09 13:17:32 +01:00
olivier lamy
5a323a01dd more javadoc fixes #2056 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2018-01-09 13:35:58 +11:00
Joakim Erdfelt
2dd970b055 Updating to version 9.2.24-SNAPSHOT 2017-12-18 10:43:47 -06:00
Joakim Erdfelt
cdbe733684 Updating to version 9.2.23.v20171218 2017-12-18 09:06:48 -06:00
Jan Bartel
84c016571d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-12-13 11:10:31 +01:00
Jan Bartel
f21fb5d6d9
Issue #2030 fix NPE in AnnotationConfiguration with debug enabled (#2031) 
* Issue #2030 fix NPE in AnnotationConfiguration with debug enabled

Signed-off-by: Jan Bartel <janb@webtide.com>
 2017-12-13 11:04:55 +01: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
Jan Bartel
92dbf5b7b6 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-18 17:23:43 +11:00
Jan Bartel
d5769c21a9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-18 17:16:19 +11:00
Jan Bartel
da813488fb Issue #1213 
Ensure use asm5 for osgi tests
 2017-10-18 17:07:00 +11:00
Greg Wilkins
7d9645cb11 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-18 12:26:40 +11:00
Greg Wilkins
c12ba01014 Issue #1797 use platform for MR jars 2017-10-18 12:24:26 +11:00
Greg Wilkins
44a1f1e1a6 Issue #1797 use platform for MR jars 2017-10-18 12:19:33 +11:00
Jan Bartel
e9d813552b Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-05 17:37:11 +11:00
Jan Bartel
0282232ca4 Issue #1868 2017-10-05 17:12:21 +11:00
Greg Wilkins
1b7ebf5599 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-09-23 00:22:57 +10:00
Jan Bartel
d808094e82 Issue #1829 2017-09-19 14:32:34 +10:00
Joakim Erdfelt
eee41174f2 Merge branch 'release-9.4.7' into jetty-9.4.x 2017-09-18 14:06:44 -07: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
Jan Bartel
7ad415b9b8 Issue #1819 2017-09-14 16:07:00 +10: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
Jan Bartel
7c4f7b13f7 Issue #1682 2017-08-08 09:15:35 -07:00
Joakim Erdfelt
3fdbcffbbd Updating to version 9.2.23-SNAPSHOT 2017-08-08 09:12:55 -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
Simone Bordet
f7302a13b4 Merged branch 'jetty-9.4.x' into 'master'. 2017-08-01 11:21:41 +02:00
Jan Bartel
8661a73a3f Issue #1682 2017-07-28 11:55:57 +02:00
Greg Wilkins
134dfd318d Issue #1676 removed deprecated FileResource 2017-07-18 20:12:53 +02:00
Joakim Erdfelt
2e8f9fc748 Revert "Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch" 
This reverts commit 38c112764d6fb606c377e80c9ed45eed92b0a5c3.
 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
4d2c299fe8 Updating to version 9.2.23-SNAPSHOT 2017-06-06 08:55:12 -07:00
Joakim Erdfelt
0af30bce5a Updating to version 9.2.22.v20170606 2017-06-06 07:03: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
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