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
15,850 Commits 55 Branches 466 Tags
Commit Graph

1314 Commits

Author SHA1 Message Date
Joakim Erdfelt
6c3c24e7dd Updating jetty-version-maven-plugin declaration 2016-10-14 10:34:18 -07:00
Joakim Erdfelt
82942cb3a4 Merge branch 'jetty-9.4.x' into issue-207 2016-10-12 11:36:28 -07:00
Jesse McConnell
3d69ce327e Merge branch 'jetty-9.4.x' 2016-09-30 19:07:23 +00:00
Jesse McConnell
3a34e4d21b Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-30 19:06:51 +00:00
Jesse McConnell
863913b64e set for dev 2016-09-30 19:05:47 +00:00
Jesse McConnell
b91cc8a4ea set for release 2016-09-30 18:01:20 +00:00
Jan Bartel
b44b9d2540 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-16 11:38:01 +10:00
Joakim Erdfelt
878f0e90a0 Updating jetty-version-maven-plugin version 2016-09-15 11:32:13 -07:00
Joakim Erdfelt
6cf10172ca Updating to version 9.3.13-SNAPSHOT 2016-09-15 07:34:52 -07:00
Joakim Erdfelt
8b35fdc5a5 Updating to version 9.3.12.v20160915 2016-09-15 06:48:16 -07:00
Joakim Erdfelt
fb7da26ad2 Updating to version 9.2.20-SNAPSHOT 2016-09-08 13:04:11 -07:00
Joakim Erdfelt
7b94bc32f4 Updating to version 9.2.19.v20160908 2016-09-08 12:11:44 -07:00
Joakim Erdfelt
0df8a766b7 Revert "Moving jetty-documentation to release profile" 
This reverts commit a9afa20ca3a270c58905dfb4c06c0483e9289285.
 2016-08-19 15:04:03 -07:00
Joakim Erdfelt
a9afa20ca3 Moving jetty-documentation to release profile 2016-08-19 15:03:32 -07:00
Joakim Erdfelt
39f1d7332c 467246 - Support javax.websocket version 1.1 
+ WIP
 2016-08-19 15:03:32 -07:00
Jesse McConnell
9b6af31dce merge from 9.4.x after M1 release 2016-08-16 08:18:27 -05:00
Jesse McConnell
984dd7ed3c [maven-release-plugin] prepare for next development iteration 2016-08-15 23:04:15 +00:00
Jesse McConnell
e38e6b5a7f [maven-release-plugin] prepare release jetty-9.4.0.M1 2016-08-15 23:04:10 +00:00
Jesse McConnell
eb2cadf7fe Merge branch 'jetty-9.4.x' 2016-08-15 13:41:46 -05:00
Jesse McConnell
d5960d9900 scrape out remaining monitor references 2016-08-15 13:36:50 -05:00
Jan Bartel
176ee5774c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-12 11:32:08 +10:00
Jan Bartel
518c1f2575 Issue #837 
Update to apache jsp 8.5.4
 2016-08-12 11:00:56 +10:00
Jesse McConnell
a711fac443 Merge branch 'jetty-9.4.x' 2016-08-10 16:56:45 -05:00
Jesse McConnell
7301edefde drop jetty-monitor from build 2016-08-10 16:56:24 -05:00
Jan Bartel
5232b933a4 Issue #746 Update osgi manifests to servlet 4.0 2016-08-04 14:20:43 +10:00
Joakim Erdfelt
225460fea3 Bumping up dependency-plugin version 2016-07-29 09:53:54 -07:00
Joakim Erdfelt
2830e51e04 Merge branch 'jetty-9.3.x' into release-9.3.11 2016-07-28 12:20:36 -07:00
Joakim Erdfelt
7701c1e163 Merge branch 'jetty-9.4.x' 2016-07-26 13:30:44 -07:00
Joakim Erdfelt
b78f05f7bd Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-26 13:15:44 -07:00
Joakim Erdfelt
4b9b7b746e Removing duplicate dependency-plugin reference 2016-07-26 13:11:26 -07:00
Joakim Erdfelt
514e0b6e72 Merge branch 'jetty-9.4.x' 2016-07-26 11:41:24 -07:00
Joakim Erdfelt
8b6f4fcb5e Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-26 11:41:04 -07:00
Joakim Erdfelt
3b907b274c Upgrading version of maven-dependency-plugin 2016-07-26 10:40:29 -07:00
Joakim Erdfelt
6e1b1cdb36 Updating to version 9.3.12-SNAPSHOT 2016-07-21 19:07:19 -07:00
Joakim Erdfelt
9fd6d4354e Updating to version 9.3.11.v20160721 2016-07-21 18:37:09 -07:00
Joakim Erdfelt
0b18340179 Updating to version 9.2.19-SNAPSHOT 2016-07-21 13:10:23 -07:00
Joakim Erdfelt
d3ff3423f0 Updating to version 9.2.18.v20160721 2016-07-21 12:35:26 -07:00
Simone Bordet
f068780749 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-20 13:19:15 +02:00
Simone Bordet
11d0569a75 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-20 13:18:26 +02:00
Simone Bordet
c09251fbaf Updated ALPN version for JDK 8u101 and 8u102. 2016-07-20 13:17:31 +02:00
Simone Bordet
0d74c3ec2c Updated ALPN version for JDK 8u101 and 8u102. 2016-07-20 13:05:43 +02:00
Greg Wilkins
53c07a5a83 Servlet 4.0 getMappings rough implementation #746 2016-07-20 13:58:19 +10:00
Greg Wilkins
2ee64a8d56 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-07 11:49:00 +10:00
Greg Wilkins
8675c17d92 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-07 11:46:38 +10:00
Joakim Erdfelt
8a12915dac Fixing surefire random run definition 2016-07-06 11:26:54 -07:00
Jesse McConnell
2dd4843e44 merge from 9.4.x 2016-06-22 15:28:17 -05:00
Jesse McConnell
399c5beb04 merge from 9.3.x 2016-06-22 15:23:51 -05:00
Jesse McConnell
ae931538ab [maven-release-plugin] prepare for next development iteration 2016-06-22 13:59:10 -05:00
Jesse McConnell
df1ed4fb03 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 13:59:06 -05:00
Jesse McConnell
030ec61837 [maven-release-plugin] prepare for next development iteration 2016-06-22 09:14:25 -05:00