Commit Graph

1258 Commits

Author SHA1 Message Date
Joakim Erdfelt 5e57b9562f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2017-02-02 16:14:10 -07:00
Joakim Erdfelt 9a8f22d5dd Testing Updates
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
  in jetty-test-helper and the test classes.
2017-02-02 15:51:38 -07:00
Jesse McConnell bba4a8bbf6 Merge remote-tracking branch 'origin/release-9.4.1' into jetty-9.4.x 2017-01-26 11:22:08 -06:00
Simone Bordet 20f57fcd14 Fixed version for the maven-eclipse-plugin. 2017-01-23 21:45:43 +01:00
Jesse McConnell f2be9f2255 add scp to site plugin so we can deploy docs after release 2017-01-23 09:46:29 -06:00
Jesse McConnell e695fc80d6 Updating to version 9.2.22-SNAPSHOT 2017-01-20 12:32:51 -06:00
Jesse McConnell 513b5e5f90 Updating to version 9.2.21.v20170120 2017-01-20 12:32:00 -06:00
Jesse McConnell d0c33ebe8b Updating to version 9.4.2-SNAPSHOT 2017-01-20 10:49:06 -06:00
Jesse McConnell 556ecbcdcf Updating to version 9.4.1.v20170120 2017-01-20 09:47:53 -06:00
Jesse McConnell 66b43ecda8 Updating to version 9.3.17-SNAPSHOT 2017-01-20 09:33:43 -06:00
Jesse McConnell df03355d00 Updating to version 9.3.16.v20170120 2017-01-20 09:06:48 -06:00
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet 07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet 347c48d657 Revert "resolve merge and update license headers"
This reverts commit 53b31b03dd, reversing
changes made to 4565c186d7.
2017-01-19 18:26:43 +01:00
Simone Bordet dc1658fad3 Revert "resolve merge and update license headers"
This reverts commit 3c53b3a32f.
2017-01-19 18:26:10 +01:00
Jesse McConnell 3c53b3a32f resolve merge and update license headers 2017-01-19 09:38:22 -06:00
Jesse McConnell 53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Jesse McConnell ce3e6dafec update license headers to 2017 2017-01-19 09:30:00 -06:00
Jan Bartel 7fd8036f93 Issue #1271
Update to org.mortbay.jasper 8.5.9.1
2017-01-19 14:52:51 +11:00
Simone Bordet a7938910b7 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-18 18:54:47 +01:00
Simone Bordet 53281d3202 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-01-18 18:52:20 +01:00
Simone Bordet 79202d1cc6 Updated ALPN version for JDK 8u121. 2017-01-18 18:30:30 +01:00
Simone Bordet 6222ccba14 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-18 17:28:18 +01:00
Simone Bordet f97396b131 Fixes #1275 - Get rid of Mockito.
Converted the 2 tests that were using Mockito and removed from the POMs.
2017-01-18 17:09:57 +01:00
Jan Bartel 608a33bbad Revert "Issue #1271"
This reverts commit 9a7920a0fb.
2017-01-19 00:22:42 +11:00
Jan Bartel 9a7920a0fb Issue #1271 2017-01-18 15:38:30 +11:00
Simone Bordet 76ba287f6c Fixed JUnit JavaDocs URL. 2017-01-16 19:09:26 +01:00
Simone Bordet 08c52461ec Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-13 22:56:23 +01:00
Simone Bordet d83bb06bd6 Issue #1073 - JDK9 support in Jetty 9.3.x.
Restored module jetty-documentation for all profiles.
2017-01-13 22:48:00 +01:00
Simone Bordet 2a416bbc6b Issue #1073 - JDK9 support in Jetty 9.3.x.
Fixed the compact3 profile and other small fixes.
2017-01-12 19:59:11 +01:00
Simone Bordet e539d0b1fd Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-12 17:52:45 +01:00
Simone Bordet 11d669092a Issue #1073 - JDK9 support in Jetty 9.3.x.
* Updated Maven plugins to versions that support JDK 9.
* Added jdk9 profiles to the build files.
* Introduced modules jetty-alpn-java-client and jetty-alpn-java-server
containing a pure JDK 9 implementation of ALPN.
* Wired ALPN connection factories (client and server) to use the proper
ALPN implementation based on the JDK platform version (8 or 9).
2017-01-12 15:41:02 +01:00
Joakim Erdfelt 64f714689e Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-20 15:38:36 -07:00
Joakim Erdfelt 7494914ff6 Updating to version 9.3.16-SNAPSHOT 2016-12-20 13:09:32 -07:00
Joakim Erdfelt 680ecd646b Updating to version 9.3.15.v20161220 2016-12-20 12:31:58 -07:00
Joakim Erdfelt 4bfb312a8c Updating jetty-version-maven-plugin 2016-12-20 12:28:48 -07:00
Simone Bordet 02ccbefb8a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-12-17 18:38:16 +01:00
Joakim Erdfelt 266cac25f8 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-12-16 16:34:17 -07:00
Joakim Erdfelt 6b3b59df43 Updating to version 9.2.21-SNAPSHOT 2016-12-16 16:23:06 -07:00
Joakim Erdfelt bcbcee7f23 Updating to version 9.2.20.v20161216 2016-12-16 15:47:41 -07:00
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 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 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 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
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 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 d5960d9900 scrape out remaining monitor references 2016-08-15 13:36:50 -05:00
Jan Bartel 518c1f2575 Issue #837
Update to apache jsp 8.5.4
2016-08-12 11:00:56 +10:00
Jesse McConnell 7301edefde drop jetty-monitor from build 2016-08-10 16:56:24 -05: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 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 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 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 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 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 5093df33dc Issue #505
Updated to asm 5.1.
2016-06-15 18:20:32 +10: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 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 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 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 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
Jesse McConnell 48ff4ad07c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-04-29 14:27:56 -05:00
Jesse McConnell bc5ab11417 wire documentation into build 2016-04-29 11:29:23 -05:00
Joakim Erdfelt a1eab9d9a4 Fixing version 2016-04-26 16:16:32 -07:00
Joakim Erdfelt 8cc041bb04 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-04-25 12:00:45 -07:00
Joakim Erdfelt 66a70adb98 Merge branch 'release-9.2.16' into jetty-9.2.x 2016-04-25 11:34:07 -07:00
Simone Bordet 64a8d8819f Merged branch 'jetty-9.3.x' into 'master'. 2016-04-20 14:29:38 +02:00
Simone Bordet 89efdb3e09 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-04-20 14:29:11 +02:00
Simone Bordet c90f60bd9c Updated ALPN version for JDK 8u91 and 8u92. 2016-04-20 14:26:17 +02:00
Simone Bordet b3fa4abaa0 Merged branch 'jetty-9.3.x' into 'master'. 2016-04-14 23:45:48 +02:00
Joakim Erdfelt 2fa7d3fa37 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-04-14 14:36:02 -07:00
Joakim Erdfelt 939505c342 Updating to version 9.2.17-SNAPSHOT 2016-04-14 14:03:21 -07:00
Joakim Erdfelt 778fac638d Updating to version 9.2.16.v20160414 2016-04-14 13:21:34 -07:00
Joakim Erdfelt 47bbd9364d Revert "Updating to version 9.2.16.v20160414"
This reverts commit 29ae63855b.
2016-04-14 13:19:59 -07:00
Joakim Erdfelt 29ae63855b Updating to version 9.2.16.v20160414 2016-04-14 13:17:21 -07:00
Joakim Erdfelt b402524401 Bumping up jetty-version-maven-plugin rev 2016-04-14 12:11:07 -07:00
Joakim Erdfelt 6fb338e50d Updating to version 9.3.9-SNAPSHOT 2016-04-11 16:20:50 -07:00
Joakim Erdfelt bb4f3c4882 Updating to version 9.3.9.M1 2016-04-11 15:35:22 -07:00
Jesse McConnell d8a6bed74a set proper scm info 2016-04-07 10:43:12 -05:00
Simone Bordet 5aef3ba3e4 Merged branch 'jetty-9.3.x' into 'master'. 2016-04-04 15:41:04 +02:00
Simone Bordet c1997b40a5 Updated ALPN to OpenJDK 8u77. 2016-04-04 15:38:53 +02:00
Simone Bordet 3e6bc4d17a Updated ALPN version for JDK 8u77. 2016-04-04 10:58:09 +02:00
Jan Bartel 77a6514063 Issue #469 Update to Apache Jasper 8.0.33 2016-03-31 18:43:50 +11:00
Jan Bartel 60bccc178e Issue #469 update to apache jasper 8.0.33 2016-03-31 18:41:03 +11:00
Jan Bartel 185ca3baa1 Issue #469 Update to Apache Jasper 8.0.33 2016-03-31 18:22:49 +11:00
Joakim Erdfelt 4ca7673c3f api-change profile now works with master
+ Adding script to collect all clirr:clirr into single html report
2016-03-24 15:56:32 -07:00
Joakim Erdfelt 6853aa5080 Marking 9.3.8 as clirr comparison 2016-03-23 20:41:19 -07:00
Jan Bartel 8eb240c2be Issue #371 update apache jsp to 8.0.27 2016-03-15 12:41:26 +11:00
Joakim Erdfelt c68d3b1d8d Updating to version 9.3.9-SNAPSHOT 2016-03-14 09:07:52 -07:00
Joakim Erdfelt 1f3b3f31f4 Updating to version 9.3.8.v20160314 2016-03-14 08:30:20 -07:00
Simone Bordet 02190278f1 Merged branch 'jetty-9.3.x' into 'master'. 2016-03-11 22:49:49 +01:00
Joakim Erdfelt 01aded0eaa Bumping up version jetty-version-maven-plugin to 1.1 2016-03-11 08:41:37 -07:00