Commit Graph

1191 Commits

Author SHA1 Message Date
Joakim Erdfelt 6d681ce999 Using jetty-version plugin 2.3 2016-12-16 15:38:11 -07:00
Jesse McConnell 6a7e5dd4f5 Updating to version 9.4.1-SNAPSHOT 2016-12-08 09:41:50 -06:00
Jesse McConnell c54efb5929 Updating to version 9.4.0.v20161208 2016-12-08 08:56:45 -06:00
Jesse McConnell f8338b3f59 Updating to version 9.4.1-SNAPSHOT 2016-12-07 10:32:41 -06:00
Jesse McConnell dac1d17a2d Updating to version 9.4.0.v20161207 2016-12-07 09:47:30 -06:00
Joakim Erdfelt fa6d9029fc Merge branch 'jetty-9.4.x' 2016-11-15 14:30:19 -07:00
Joakim Erdfelt 2c38511828 Updating to version 9.3.15-SNAPSHOT 2016-10-28 13:01:34 -07:00
Joakim Erdfelt 14611d2f76 Updating to version 9.3.14.v20161028 2016-10-28 12:21:02 -07:00
Jan Bartel 90e4d162c8 Issue #907 2016-10-27 16:15:44 +11:00
Greg Wilkins 714d29db76 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-26 20:39:29 +11:00
Greg Wilkins 7f7021315d fixed bad revert 2016-10-26 20:39:04 +11:00
Greg Wilkins f4e6162b98 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-26 20:32:18 +11:00
Greg Wilkins 812272c658 Revert "Adding jdk9 profile"
This reverts commit 1151964d74.
2016-10-26 20:31:42 +11:00
Simone Bordet 8421a9b200 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-10-26 11:13:03 +02:00
Simone Bordet 338e924a5d Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-10-26 11:10:19 +02:00
Simone Bordet 4cc5178944 Updated ALPN version for JDK 8u111 and 8u112. 2016-10-26 11:03:43 +02:00
Greg Wilkins 53853df3bb Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-26 11:20:50 +11:00
Joakim Erdfelt 1151964d74 Adding jdk9 profile 2016-10-25 15:15:46 -07:00
Joakim Erdfelt 458aebbd01 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-10-20 15:11:40 -07:00
Joakim Erdfelt 76992139f8 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-10-20 15:11:25 -07:00
Joakim Erdfelt 3bfc914889 More attempts at jacoco exclusions 2016-10-20 14:14:50 -07:00
Joakim Erdfelt 2d650512bf Skipping jacoco collection on build/test/support/integration modules 2016-10-20 12:48:32 -07:00
Joakim Erdfelt b8127399d7 Tweaking jacoco includes/excludes in pom.xml 2016-10-20 11:28:26 -07:00
Joakim Erdfelt 6ded652dae Tweaking jacoco includes/excludes 2016-10-20 09:31:00 -07:00
Joakim Erdfelt fccffdb526 Merge branch 'release-9.3.13' into jetty-9.3.x 2016-10-20 09:25:57 -07:00
Joakim Erdfelt 36d75d4c4f Merge branch 'jetty-9.4.x' 2016-10-19 10:59:28 -07:00
Joakim Erdfelt 0651b3fa20 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-10-19 10:59:09 -07:00
Joakim Erdfelt 52e81a5ef8 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-10-19 10:56:49 -07:00
Joakim Erdfelt 91e5fb2ce5 Adding jacoco report generation and publishing 2016-10-19 08:51:45 -07:00
Joakim Erdfelt ade14ba34b Updating to version 9.3.14-SNAPSHOT 2016-10-14 11:33:51 -07:00
Joakim Erdfelt c3a78e70a8 Updating to version 9.3.13.v20161014 2016-10-14 10:39:37 -07:00
Joakim Erdfelt 6c3c24e7dd Updating jetty-version-maven-plugin declaration 2016-10-14 10:34:18 -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
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
Jesse McConnell 9a4cb41122 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 09:14:21 -05:00
Jesse McConnell e7034117ea [maven-release-plugin] prepare for next development iteration 2016-06-21 08:50:13 -05:00
Jesse McConnell 16c435c69d [maven-release-plugin] prepare release jetty-9.3.10.v20160621 2016-06-21 08:50:09 -05:00
Jesse McConnell 34e92ec59e update jetty version plugin 2016-06-21 08:18:05 -05:00
Joakim Erdfelt abdbd177c1 Wrong version plugin (oops) 2016-06-20 09:12:05 -07:00
Joakim Erdfelt 7b1d807e49 Updating version plugin 2016-06-20 09:10:27 -07:00
Jan Bartel 2bb060ae32 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-15 18:21:08 +10:00
Jan Bartel 5093df33dc Issue #505
Updated to asm 5.1.
2016-06-15 18:20:32 +10:00
Jesse McConnell 1bccf090b5 Merge branch 'jetty-9.4.x' 2016-06-13 11:51:09 -05:00
Jesse McConnell 64ed45389b Issue 589 creation of jetty-home and leveraging it in jetty-distribution 2016-06-07 15:42:10 -05:00
Simone Bordet 473c8f0c09 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-07 10:24:15 +02:00
Simone Bordet 73fe6715de Issue #306 - Merge jetty-parent into jetty-project.
Moved more plugin version declarations into jetty.project's pom.
2016-06-07 10:23:38 +02:00
Simone Bordet 2d1d3fe6e9 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-06 21:39:31 +02:00
Simone Bordet a8f25b550f Fixes #487 - JDK 9 build compatibility.
Fixes #306 - Merge jetty-parent into jetty-project.

- Removed jetty.parent dependency, moving all relevant sections to
jetty.project's pom.xml.
- Introduced profiles for JDK 8 only modules and configuration, and
for JDK 9 only modules and configurations.
- Major cleanup of pom.xml files.
- All Maven Plugin now declared in alphabetical order in
pluginManagement section of jetty.project's pom.xml.
2016-06-06 21:28:51 +02:00
Jan Bartel 7dc283cc0c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-27 16:45:04 +10:00
Jan Bartel d6689ce803 Add memcached option for session data caching 2016-05-27 16:43:46 +10:00
Jesse McConnell dc4574f380 [maven-release-plugin] prepare for next development iteration 2016-05-17 17:30:17 -05:00
Jesse McConnell 0bbebec1e0 [maven-release-plugin] prepare release jetty-9.3.9.v20160517 2016-05-17 17:30:13 -05:00
Jesse McConnell d5c6793e6a [maven-release-plugin] prepare for next development iteration 2016-05-17 15:33:46 -05:00
Jesse McConnell 0bab7e6616 [maven-release-plugin] prepare release jetty-9.2.17.v20160517 2016-05-17 15:33:42 -05:00
Joakim Erdfelt 9c5beaad4f Merge branch 'jetty-9.4.x' 2016-05-03 11:36:42 -07:00
Joakim Erdfelt 86bf31aad7 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-03 11:36:25 -07:00
Jesse McConnell 8fd446040b documentation build in default reactor 2016-05-03 07:29:17 -05:00