Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,591 Commits 62 Branches 460 Tags 368 MiB
Commit Graph

1311 Commits

Author SHA1 Message Date
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
Joakim Erdfelt da6be3ed7a Fixing javadoc 2016-03-07 10:24:57 -07:00
Greg Wilkins 17d1beeec8 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-15 12:34:15 +01:00
Greg Wilkins 98607e2abf 487158 Switched SCM URIs to github 2016-02-15 12:26:42 +01:00
Joakim Erdfelt f98dde5e5b Updating to version 9.2.16-SNAPSHOT 2016-02-10 15:36:41 -07:00
Joakim Erdfelt 9b6890d3c1 Updating to version 9.2.15.v20160210 2016-02-10 14:49:12 -07:00
Simone Bordet 281313440b Merged branch 'jetty-9.3.x' into 'master'. 2016-02-08 15:57:40 +01:00
Simone Bordet 1ed327ecce Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-02-08 15:56:53 +01:00
Simone Bordet e853632c22 Updated ALPN version for JDK 8u73 and 8u74. 2016-02-08 15:52:03 +01:00
Simone Bordet 56c0bc768c Merged branch 'jetty9.3.x' into 'master'. 2016-01-21 17:52:37 +01:00
Simone Bordet 7703784cab Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-01-21 17:32:14 +01:00
Simone Bordet 35bc923f50 Updated ALPN version for JDK 8u71 and 8u72. 2016-01-21 17:25:48 +01:00
Joakim Erdfelt e0ce545ad7 Updating to version 9.3.8-SNAPSHOT 2016-01-15 17:15:14 -07:00
Joakim Erdfelt c0b191119b Updating to version 9.3.7.v20160115 2016-01-15 16:40:15 -07:00
Joakim Erdfelt b7f9c9aca9 Updating to version 9.3.7-SNAPSHOT 2016-01-13 08:21:01 -07:00
Joakim Erdfelt 21ca3f6690 Updating to version 9.3.7.RC1 2016-01-13 07:30:24 -07:00
Joakim Erdfelt c62b42ffb3 485199 - Remove copyright blurb from pom.xml files 2016-01-08 11:28:57 -07:00
Jan Bartel b47990189c 484616 Outdated version of javaee_web_services_client_1_2.xsd 2016-01-06 13:35:32 +11:00
Jan Bartel d760926554 484616 Outdated version of javaee_web_services_client_1_2.xsd 2016-01-06 13:34:46 +11:00
Simone Bordet 6128bd6d45 Merged branch 'jetty-9.3.x' into 'master'. 2016-01-05 11:50:52 +01:00
Simone Bordet f519aa28fb Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-01-05 11:40:57 +01:00
Simone Bordet 50100ca86d Fixed copyright blurbs. 2016-01-05 11:30:38 +01:00
Joakim Erdfelt ac24196b0d Happy New Year 2016 2016-01-04 14:34:20 -07:00
Joakim Erdfelt cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Joakim Erdfelt b5db18378d Happy New Year 2016 2016-01-04 14:21:26 -07:00
Joakim Erdfelt edf686fe0a Updating to version 9.3.7-SNAPSHOT 2015-11-06 12:13:00 -07:00
Joakim Erdfelt d737e1c638 Updating to version 9.3.6.v20151106 2015-11-06 11:09:32 -07:00
Joakim Erdfelt ec8f8d3e4f Updating to version 9.2.15-SNAPSHOT 2015-11-06 11:06:48 -07:00
Joakim Erdfelt ecba378f5c Updating to version 9.2.14.v20151106 2015-11-06 10:32:14 -07:00
Greg Wilkins 7843b7348e 480827 Implemented Unix Domain Socket Connector 
Squashed commit of the following:

commit fbb680ba7cdb73495524ea9e5b0f49caee7f68d8
Merge: ed2550b 64ea0db
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 6 10:44:00 2015 +1100

    Merge branch 'master' into unix-socket

commit ed2550b50f978e1984e19fbda642baf450dbe6a1
Merge: 88d7b35 de137ab
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Nov 5 18:41:25 2015 +1100

    Merge branch 'master' into unix-socket

commit 88d7b35f885de2da7dec836e6e4ae2b522d517f0
Merge: 7d4155f 3e2658a
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Nov 5 17:38:27 2015 +1100

    Merge branch 'master' into unix-socket

commit 7d4155fe4a407d493683b66709bc638879b0b422
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Nov 5 17:24:48 2015 +1100

    Unix socket configuration

commit 2737b19f73ad153c20e1762874558a5d62849f90
Merge: cd0cc2e 92cc44c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Nov 4 15:13:40 2015 +1100

    Merge branch 'master' into unix-socket

    Conflicts:
    	jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java

commit cd0cc2ef36a558d948bf26aff4f9e3519da2f823
Merge: 639753b 303f98e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Nov 2 12:21:19 2015 +1100

    Merge branch 'master' into unix-socket

commit 639753b5ed37778d7231acfe9d52039aed66351e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 15:42:58 2015 +1100

    local connectors report NOIP address

commit 6d38c4195f145b99f775a06d546960b119094b0c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 12:11:13 2015 +1100

    Gentler ssl close test

commit 40b46b66a738c9187f859d522a0165bb09b113c8
Merge: b7eb082 fa53b11
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 11:09:42 2015 +1100

    Merge branch 'master' into unix-socket

commit b7eb082be44864c058b6f01b10364013596d3650
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 08:34:30 2015 +1100

    SecureRequestCustomizer for UnixSockets

commit edbb3c080200b4c6aa2836eff6c81bf31a73a8c1
Merge: 90e8cc0 de7ac72
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 29 19:47:05 2015 +1100

    Merge branch 'master' into unix-socket

commit 90e8cc060ff6dc4b249818db38334ffa543f002f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 29 19:31:50 2015 +1100

    use proxy connection

commit b1772ef5dcac9ddf9bb5ecda1cda6d038ca21755
Merge: e95a932 9fe7332
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 29 16:46:29 2015 +1100

    Merge branch 'master' into unix-socket

commit e95a932bda5a96bf98ada4fb47664790af2aa0a2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Oct 28 15:58:25 2015 +1100

    fixed config

commit f8963b2ed6b6b4b96f1d9403194c9d50ab1f12fd
Merge: 9c56b53 8b27484
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Oct 28 15:34:28 2015 +1100

    Merge branch 'master' into unix-socket

commit 9c56b53cbec20d98e5cb05cf8d1f668fe84b95e0
Merge: 298a311 39768f8
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Oct 26 13:04:34 2015 +1100

    Merge branch 'master' into unix-socket

commit 298a311af952ad3ef5d1c7635deabf47bddaa1c6
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 15:24:19 2015 +1100

    Async accepting

commit 8266753d124c04ec8bca8aa02be1ef3d826d6769
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 14:45:35 2015 +1100

    set acceptors

commit 6a56c5b9e19063fcb95cdc1228adf723c0d41362
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 11:44:54 2015 +1100

    licence

commit d80e5748e6c4327bae57de2af01983990dd2afe0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 11:24:14 2015 +1100

    unixsocket work in progress adding modules

commit cf0c1153d9966cc7182ba29411527b4341c34da6
Merge: 645b671 c39bfa2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 08:52:01 2015 +1100

    Merge branch 'master' into unix-socket

commit 645b6712d37282c26011a95c8c98e45c249b2e5f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 08:49:52 2015 +1100

    IP headers

commit 67b210b9ea81af68ce3848a114bbbd1b80a8ca52
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 22 23:48:57 2015 +1100

    working with haproxy

commit e4fce9cf5d896a9a29a7c6280fcaa0336dfcc0f2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 22 18:25:09 2015 +1100

    unixsocket working

commit 6f013788cad44e6641cd89720c5e7f3652cdc257
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 22 15:39:55 2015 +1100

    work in progress
 2015-11-06 11:17:46 +11:00
Simone Bordet 700975fe41 Merged branch 'jetty-9.3.x' into 'master'. 2015-11-05 12:17:30 +01:00
Simone Bordet 50e565bac0 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-11-05 12:14:28 +01:00
Simone Bordet b4cf2921c8 Updated ALPN version for JDK 8u65 and 8u66. 2015-11-05 12:05:08 +01:00
Jan Bartel b3b48924d5 Update build profile for jdk1.8.0.66 2015-11-02 12:42:22 +11:00
Jan Bartel 8b27484ea2 Update build profile for jdk1.8.0.66 2015-10-28 13:50:34 +11:00
Joakim Erdfelt 87cc795e88 Bumping up surefire plugin version 
+ This should address the CI build JVM hang bug if we have a
  bad/failing testcase (like the recent jetty-proxy issues)
+ See bug https://issues.apache.org/jira/browse/SUREFIRE-524
 2015-10-23 11:31:06 -07:00
Jan Bartel 43a28a5080 480272 Update to newer jdt ecj version 2015-10-21 15:26:26 +11:00
Jan Bartel 781a380fbd 480272 Update to newer jdt ecj version 2015-10-21 15:25:24 +11:00
Joakim Erdfelt 4dfd68b315 Merge branch 'jetty-9.3.x' 
Conflicts:
	aggregates/jetty-all-compact3/pom.xml
	aggregates/jetty-all/pom.xml
	apache-jsp/pom.xml
	apache-jstl/pom.xml
	examples/async-rest/async-rest-jar/pom.xml
	examples/async-rest/async-rest-webapp/pom.xml
	examples/async-rest/pom.xml
	examples/embedded/pom.xml
	examples/pom.xml
	jetty-alpn/jetty-alpn-client/pom.xml
	jetty-alpn/jetty-alpn-server/pom.xml
	jetty-alpn/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/pom.xml
	jetty-cdi/cdi-core/pom.xml
	jetty-cdi/cdi-full-servlet/pom.xml
	jetty-cdi/cdi-servlet/pom.xml
	jetty-cdi/cdi-websocket/pom.xml
	jetty-cdi/pom.xml
	jetty-cdi/test-cdi-webapp/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-fcgi/fcgi-client/pom.xml
	jetty-fcgi/fcgi-server/pom.xml
	jetty-fcgi/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-http2/http2-alpn-tests/pom.xml
	jetty-http2/http2-client/pom.xml
	jetty-http2/http2-common/pom.xml
	jetty-http2/http2-hpack/pom.xml
	jetty-http2/http2-http-client-transport/pom.xml
	jetty-http2/http2-server/pom.xml
	jetty-http2/pom.xml
	jetty-infinispan/pom.xml
	jetty-io/pom.xml
	jetty-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jspc-maven-plugin/pom.xml
	jetty-maven-plugin/pom.xml
	jetty-monitor/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-alpn/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi-context/pom.xml
	jetty-osgi/test-jetty-osgi-webapp/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-plus/pom.xml
	jetty-proxy/pom.xml
	jetty-quickstart/pom.xml
	jetty-rewrite/pom.xml
	jetty-runner/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-spring/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/javax-websocket-client-impl/pom.xml
	jetty-websocket/javax-websocket-server-impl/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/websocket-api/pom.xml
	jetty-websocket/websocket-client/pom.xml
	jetty-websocket/websocket-common/pom.xml
	jetty-websocket/websocket-server/pom.xml
	jetty-websocket/websocket-servlet/pom.xml
	jetty-xml/pom.xml
	pom.xml
	tests/pom.xml
	tests/test-continuation/pom.xml
	tests/test-http-client-transport/pom.xml
	tests/test-integration/pom.xml
	tests/test-jmx/jmx-webapp-it/pom.xml
	tests/test-jmx/jmx-webapp/pom.xml
	tests/test-jmx/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-quickstart/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-infinispan-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/pom.xml
	tests/test-sessions/test-mongodb-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-jaas-webapp/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
	tests/test-webapps/test-jndi-webapp/pom.xml
	tests/test-webapps/test-mock-resources/pom.xml
	tests/test-webapps/test-proxy-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/pom.xml
	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
 2015-10-13 08:53:35 -07:00
Joakim Erdfelt dde32787c4 Updating to version 9.3.6-SNAPSHOT 2015-10-12 15:47:37 -07:00
Joakim Erdfelt 29722bd880 Updating to version 9.3.5.v20151012 2015-10-12 15:10:39 -07:00
Jan Bartel 73de40921c Merge branch 'jetty-9.3.x' into gcloud-session-manager 2015-10-13 08:35:50 +11:00
Joakim Erdfelt 06593a546c Using 8.0.27 release 2015-10-12 13:15:19 -07:00
Joakim Erdfelt dcc3ad3f22 Bumping up apache-jsp to 8.0.27-SNAPSHOT 2015-10-09 10:14:49 -07:00
Joakim Erdfelt 2cce7510e1 Updating to 9.3.5-SNAPSHOT 2015-10-08 17:49:09 -07:00
Joakim Erdfelt 9cf0e34a1d Updating to version 9.4.0-SNAPSHOT 2015-10-07 15:41:32 -07:00
Joakim Erdfelt 37296bec3c Updating to version 9.3.4.v20151007 2015-10-07 14:58:38 -07:00
Jan Bartel 022f8e66f6 Merge branch 'master' into gcloud-session-manager 2015-10-07 12:13:00 +11:00
Jan Bartel 7f82124d54 478862 Update to jstl 1.2.5 2015-10-06 19:30:37 +11:00
Jan Bartel 2f4f639735 First draft of session manager using gcloud datastore. 2015-10-01 09:41:07 +10:00
Simone Bordet da3699dc55 Merged branch 'jetty-9.2.x' into 'master'. 2015-09-21 16:32:58 +02:00
Simone Bordet 77fdfb8754 Updated ALPN version for JDK 8u60. 2015-09-21 16:19:48 +02:00
Jan Bartel 03a601f2b2 477385 Make jetty osgi manifests only resolve jetty packages against a single distro version 2015-09-16 19:13:47 +10:00
Joakim Erdfelt 7957ed06ef jetty-test-helper to 3.1, removing snapshot repo references 2015-09-09 16:01:57 -07:00
Jesse McConnell 6409366499 [maven-release-plugin] prepare for next development iteration 2015-08-27 10:11:29 -05:00
Jesse McConnell 3086adc965 [maven-release-plugin] prepare release jetty-9.3.3.v20150827 2015-08-27 10:11:21 -05:00
Jesse McConnell f8734f23ce [maven-release-plugin] prepare for next development iteration 2015-08-25 14:10:01 -05:00
Jesse McConnell e9edf4c24b [maven-release-plugin] prepare release jetty-9.3.3.v20150825 2015-08-25 14:09:54 -05:00
Jesse McConnell 7a2f4df2c9 set for release 2015-08-25 11:57:52 -05:00
Greg Wilkins d780839bec 474634 - AsyncListener.onError() handling. 
Added HttpConfiguration.maxErrorDispatches to detect error loops
Fixed ManyWays... unit test to handle error dispatch.
 2015-08-14 10:06:57 +10:00
Joakim Erdfelt a3684f7fb8 [maven-release-plugin] prepare for next development iteration 2015-07-30 09:47:57 -07:00
Joakim Erdfelt 798fc8118b [maven-release-plugin] prepare release jetty-9.2.13.v20150730 2015-07-30 09:47:48 -07:00
Joakim Erdfelt 4b3879845d [maven-release-plugin] prepare for next development iteration 2015-07-30 07:02:10 -07:00
Joakim Erdfelt 6b7e9ac4b0 [maven-release-plugin] prepare release jetty-9.3.2.v20150730 2015-07-30 07:02:02 -07:00
Simone Bordet aa75bcf078 Updated ALPN versions for JDK 8u51. 2015-07-28 16:23:08 +02:00
Simone Bordet dea406d2b3 Updated ALPN versions for JDK 8u51. 2015-07-27 11:04:27 +02:00
Joakim Erdfelt 3f85fbbbd2 Unit testing upgrades 
+ Using jetty-test-helper 3.0
+ Adding jetty-perf-helper (replacement for BenchmarkHelper)
+ Adding JmxServiceConnection to jetty-deploy (formerly part of
  jetty-test-helper)
 2015-07-23 12:44:43 -07:00
Joakim Erdfelt b954a2dad5 Unit testing upgrades 
+ Using jetty-test-helper 3.0
+ Adding jetty-perf-helper (replacement for BenchmarkHelper)
+ Adding JmxServiceConnection to jetty-deploy (formerly part of
  jetty-test-helper)
 2015-07-23 12:16:50 -07:00
Jesse McConnell 9b790c38ce [maven-release-plugin] prepare for next development iteration 2015-07-14 11:42:34 -05:00
Jesse McConnell b35d32f2b8 [maven-release-plugin] prepare release jetty-9.3.1.v20150714 2015-07-14 11:42:28 -05:00
Jesse McConnell 7204707902 [maven-release-plugin] prepare for next development iteration 2015-07-09 12:14:38 -05:00
Jesse McConnell 3b1533673e [maven-release-plugin] prepare release jetty-9.2.12.v20150709 2015-07-09 12:14:30 -05:00
Jan Bartel 5ac1c0a3b7 471623 Update to apache jsp 8.0.23 
Use 8.0.23.M1 for jetty version of apache jsp 8.0.23
 2015-07-03 15:47:05 +10:00
Joakim Erdfelt 438e1543dc Bumping up surefire plugin to 2.18.1 2015-06-29 10:02:40 -07:00
Joakim Erdfelt f630a8416b Consolidating maven-javadoc-plugin configuration 
+ all <configuration> is now in top level pom
   as a <pluginManagement> entry for all sub-modules
 2015-06-26 08:09:23 -07:00
Jan Bartel 8a64c50f24 Update to pmd plugin 3.4 and plugin-plugin 3.4 and jetty-build-support 1.4 2015-06-25 18:20:11 +10:00
Joakim Erdfelt ecdcc2e7c0 Adding maven plugin tags to javadoc:aggregate build 2015-06-15 16:33:29 -07:00
Jesse McConnell 60e45a940e [maven-release-plugin] prepare for next development iteration 2015-06-15 15:34:11 -05:00
Jesse McConnell d3dec8d513 [maven-release-plugin] prepare release jetty-9.2.12.M0 2015-06-15 15:34:03 -05:00
Joakim Erdfelt cf6c4a914e Updating version to 9.3.1-SNAPSHOT 2015-06-15 10:25:49 -07:00
Joakim Erdfelt 1a9da9f9e4 Updating versions to 9.3.0.v20150612 2015-06-12 09:34:24 -07:00
Joakim Erdfelt c6ac82f50b Merge branch 'master' into release-9.3 2015-06-12 09:30:46 -07:00
Simone Bordet 574373b806 Removed JDK 7 ALPN files and build profiles. 2015-06-12 18:27:01 +02:00
Joakim Erdfelt 496b4dfc83 [maven-release-plugin] prepare for next development iteration 2015-06-11 15:08:36 -07:00
Joakim Erdfelt f53c5d8fac [maven-release-plugin] prepare release jetty-9.3.0.v20150611 2015-06-11 15:08:29 -07:00
Jesse McConnell bfe6c2638e [maven-release-plugin] prepare for next development iteration 2015-05-29 09:06:42 -05:00
Jesse McConnell 71e0f4d8ce [maven-release-plugin] prepare release jetty-9.2.11.v20150529 2015-05-29 09:06:36 -05:00
Jesse McConnell a7087cbfbf [maven-release-plugin] prepare for next development iteration 2015-05-28 10:06:51 -05:00
Jesse McConnell 913c63e597 [maven-release-plugin] prepare release jetty-9.2.11.v20150528 2015-05-28 10:03:44 -05:00
Greg Wilkins cc40282a7d Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	jetty-osgi/jetty-osgi-alpn/pom.xml
	pom.xml
 2015-05-22 21:06:03 +10:00
Simone Bordet 43780f6c78 Updated ALPN API to 1.1.2.v20150522. 2015-05-22 10:24:32 +02:00
Greg Wilkins c5e4abd792 467281 Remove Java 1.7 support from Jetty 9.3 2015-05-14 09:31:50 +10:00
Joakim Erdfelt e9b67afc24 Fixing formatting 2015-05-13 11:18:13 -07:00
Joakim Erdfelt 763966a9b4 Using released jetty-parent-25 2015-05-13 11:17:25 -07:00
Greg Wilkins 435bed0c37 fixed import into eclipse IDE 2015-05-13 23:13:16 +10:00
Simone Bordet 79a841da4b Merged branch 'jetty-9.2.x' into 'master'. 2015-05-08 10:55:10 +02:00
Simone Bordet f580cf72ac Updated ALPN API to 1.1.1.v20150508. 2015-05-08 10:52:54 +02:00
Simone Bordet b26552cbb5 Merged branch 'jetty-9.2.x' into 'master'. 2015-04-15 19:21:11 +02:00
Simone Bordet 6fa863d6be Updated ALPN and NPN versions for JDK 7u79, 7u80 and 8u45. 2015-04-15 19:09:46 +02:00
Joakim Erdfelt dc2221a152 Build under Java 1.8 
+ Enforcer setup to JDK 1.8+
+ Java7 profiles removed (for now)
+ Main compile phase source/test is 1.7
+ Test compile phase source/test is 1.8
 2015-04-10 13:21:12 -07:00
Jan Bartel 7375ba2cc3 Alpha impl for infinispan session manager. 
Conflicts:
	tests/test-sessions/pom.xml

Conflicts:
	tests/test-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionExpiryTest.java
 2015-04-02 12:20:12 +11:00
Jan Bartel a1bf23233e Update to org.eclipse.jetty.parent 24 2015-03-27 16:18:58 +11:00
Jesse McConnell da4f95f3d3 [maven-release-plugin] prepare for next development iteration 2015-03-25 09:08:27 -05:00
Jesse McConnell e92fd438fd [maven-release-plugin] prepare release jetty-9.2.11.M0 2015-03-25 09:08:21 -05:00
Simone Bordet 161317a5ef Merged branch 'jetty-9.2.x' into 'master'. 2015-03-23 22:32:40 +01:00
Simone Bordet 85999058e0 Updated ALPN version for JDK 8u40. 2015-03-23 22:14:02 +01:00
Jan Bartel 7c53dfe5a4 459734 Update to apache jsp 8.0.20 2015-03-19 17:19:05 +11:00
Jesse McConnell e3fd0056cf [maven-release-plugin] prepare for next development iteration 2015-03-10 08:00:22 -05:00
Jesse McConnell 9d648f4000 [maven-release-plugin] prepare release jetty-9.2.10.v20150310 2015-03-10 08:00:14 -05:00
Simone Bordet 3162ccc299 Fixed dependency on old test helper classes. 2015-03-02 17:00:52 +01:00
Simone Bordet 3cf2a5409d Updated toolchain's test helper to 2.9. 2015-03-02 16:37:37 +01:00
Jesse McConnell 1659d83978 [maven-release-plugin] prepare for next development iteration 2015-02-24 10:38:33 -06:00
Jesse McConnell dc0c3f4c52 [maven-release-plugin] prepare release jetty-9.2.9.v20150224 2015-02-24 10:38:28 -06:00
Jan Bartel d85662bd6e 459681 Remove Glassfish JSP in favor of Apache JSP 2015-02-18 19:25:20 +11:00
Jesse McConnell ce5db2ca55 [maven-release-plugin] prepare for next development iteration 2015-02-17 16:02:22 -06:00
Jesse McConnell 26b7597928 [maven-release-plugin] prepare release jetty-9.2.8.v20150217 2015-02-17 16:02:16 -06:00
Jan Bartel e21d078d2b Update date on osgi bundle copyright message. 2015-02-12 10:33:20 +11:00
Greg Wilkins 2162455b72 Removed SPDY and NPN 
Because jetty 9.3 is targetted for HTTP2, we have removed support for SPDY and NPN.
 2015-02-11 14:20:06 +11:00
Simone Bordet 1ccd0d0dba Merged branch 'jetty-9.2.x' into 'master'. 2015-01-30 12:08:27 +01:00
Simone Bordet 4c751e10e1 Updated ALPN and NPN versions. 
NPN to version 1.1.10.v20150130 for OpenJDK 7u75 and 7u76.
ALPN to version 7.1.3.v20150130 for OpenJDK 7u75 and 7u76,
and to version 8.1.3.v20150130 for OpenJDK 8u31.
 2015-01-30 11:55:28 +01:00
Jesse McConnell aa22842c20 [maven-release-plugin] prepare for next development iteration 2015-01-16 17:48:29 -06:00
Jesse McConnell 8c58a9abc4 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 17:48:23 -06:00
Jesse McConnell 8748abbfa1 tweake 2015-01-16 16:34:21 -06:00
Jesse McConnell 425a14de18 set for release 2015-01-16 16:32:19 -06:00
Jesse McConnell 81bb8411d1 [maven-release-plugin] prepare for next development iteration 2015-01-16 12:06:36 -06:00
Jesse McConnell 7865f88b81 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 12:06:30 -06:00
Jesse McConnell db991355a2 [maven-release-plugin] prepare for next development iteration 2015-01-16 10:41:45 -06:00
Jesse McConnell 6930abb8d3 [maven-release-plugin] prepare release jetty-9.2.7.v20140116 2015-01-16 10:41:39 -06:00
Jesse McConnell 9225b124a4 [maven-release-plugin] prepare for next development iteration 2015-01-16 08:21:35 -06:00
Jesse McConnell ebd563e64d [maven-release-plugin] prepare release 9.2.7.v20140116 2015-01-16 08:21:29 -06:00
Joakim Erdfelt 73110f5ba0 Merge branch 'jetty-9.2.x' 2015-01-09 10:00:57 -07:00
Joakim Erdfelt d8186af7ac Bumping up maven-deploy-plugin to v2.8.2 with retry configuration 2015-01-09 10:00:39 -07:00
Joakim Erdfelt a3201a3c81 Happy New Year 2015 2015-01-07 17:06:59 -07:00
Joakim Erdfelt 6a0668b7a1 Happy New Year 2015 2015-01-07 17:03:30 -07:00
Simone Bordet e8c88cfd9c Merged branch 'jetty-9.2.x' into 'master'. 2014-12-22 21:32:09 +01:00
Jan Bartel eb06d7cf5f 454983 Source bundles should not be singleton 2014-12-12 13:40:33 +01:00
Joakim Erdfelt 71af18f4b7 454952 - Allow Jetty to run in Java 8 compact 3 profile 
+ Simplifying setup, removing entire-project wide compiler setting
 + Setting up jetty-all-compact3 aggregate for the compilation instead
 + Marking various classes that are never going to be safe to use in
   compact3 as excluded
 2014-12-11 16:15:12 -07:00
Joakim Erdfelt f96f3489e3 454952 - Allow Jetty to run in Java 8 compact 3 profile 
+ Forcing <target> of 8 to satisfy javac error
 2014-12-11 15:14:29 -07:00
Joakim Erdfelt 2b196a9ae1 454952 - Allow Jetty to run in Java 8 compact 3 profile 
+ Step 1, enable a profile that will use the Java 8 "compact 3" profile
  during compilation time.
 2014-12-11 15:12:59 -07:00
Jan Bartel bc22ba72dc [maven-release-plugin] prepare for next development iteration 2014-12-05 16:45:12 +01:00
Jan Bartel 1cc075cf98 [maven-release-plugin] prepare release jetty-9.2.6.v20141205 2014-12-05 16:45:01 +01:00
Jesse McConnell 127b48c932 [maven-release-plugin] prepare for next development iteration 2014-12-03 09:00:57 -06:00
Jesse McConnell 028f4b9610 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 09:00:46 -06:00
Jesse McConnell 1263d1f3c8 [maven-release-plugin] prepare for next development iteration 2014-12-03 08:26:47 -06:00
Jesse McConnell 5c7f706496 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 08:26:35 -06:00
Simone Bordet b573848a45 Merged branch 'jetty-9.2.x' into 'master'. 2014-12-02 12:15:13 +01:00
Simone Bordet 948450d724 Updated ALPN version to 7.1.2.v20141202 and 8.1.2.v20141202. 2014-12-02 12:12:20 +01:00
Jesse McConnell 09846e324d [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00