Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,433 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

402 Commits

Author SHA1 Message Date
WalkerWatch 814769637d Merge branch 'jetty-9.4.x' 2017-11-06 10:29:41 -05:00
Olivier Lamy 4a659a9e89 upgrade assembly plugin and use tarLongFileMode posix #1782 (#1942) 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-11-06 18:24:09 +11:00
Greg Wilkins 530e28563c Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-20 11:27:55 +11:00
Greg Wilkins be04d47a9d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-20 11:27:30 +11:00
Greg Wilkins 4dc6791ade Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-20 11:20:45 +11:00
Jan Bartel 4ec2a154fc Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-19 15:17:46 +11:00
Jan Bartel 3793f974d5 Issue #1909 2017-10-19 15:08:02 +11:00
Jan Bartel 050d593056 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-17 16:45:31 +11:00
Jan Bartel 15a08f2095 Issue #1900 2017-10-17 14:31:11 +11:00
Jan Bartel a615cc86be Update jetty-schemas to 4.0. 2017-10-06 09:37:41 +11:00
Greg Wilkins 1b7ebf5599 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-09-23 00:22:57 +10:00
Greg Wilkins 31a9b6f2e8 Issue #215 Conscrypt module for SSL and ALPN 
Squash of the following commits:

commit 53e503b48d290e2ff83b214fd81572bf4cacd9ab
Merge: cc4ed73 d77ba82
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 21 07:27:45 2017 +1000

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn

commit cc4ed73ae45e69addbb31221a860dd0984d92ac5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 21 07:26:45 2017 +1000

    Issue #215 Conscrypt module debug

commit f640693f7ef61f8012d1454b2ed364740b330a6e
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Sep 20 18:23:51 2017 +0200

    Issue #215 - Consider native ALPN/SSL provider.

    Fixed server-side ALPN negotiation for Conscrypt.

commit 669e992624a0f8f23103c70ba895b877dcec2404
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Sep 20 16:56:20 2017 +0200

    Issue #215 - Consider native ALPN/SSL provider.

    Fixed client-side ALPN negotiation for Conscrypt.

commit aa873263d73c19461890bd1f9a417c796412b3d2
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Sep 20 15:26:45 2017 +0200

    Issue #215 - Consider native ALPN/SSL provider.

    Code cleanups.

    Changed ALPNProcessor.init(boolean) to init().
    Removed unnecessary try/catches and simplified exception handling.

commit db9b169c35da956bcc42013f9bb8acddd7238d14
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 18:07:30 2017 +1000

    Issue #215 Conscrypt SSL pom cleanups

commit 096572e029352428275e86a964fa92dbeee19a65
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 15:57:20 2017 +1000

    Issue #215 Conscrypt SSL ALPN cleanups

commit b3c1bcb1fa9a7e15517a348270738e24c7b0a820
Merge: c836708 effec06
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 15:46:13 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn

commit c836708a9bcd5fb61ed26302eb7d71b618cce329
Merge: de039d4 d9ecd5e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 14:56:06 2017 +1000

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn

commit de039d42f23f9caa239e5ddee0242b9a83a45441
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 17:19:49 2017 +1000

    Fix #1823 MimeTypes for ResourceHandler mp4

commit ff1e08434415cd6d909715547c2a54dbd0fc5dee
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 14:21:39 2017 +1000

    Issue #215

commit 3bb63147ebf4967698f51a65f009d80010038b20
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 14:08:05 2017 +1000

    Issue #215

    Use conscrypt 1.0.0.RC10 uber jar

commit 8b18099fde67f12d0e98d0b414568c9b76835459
Merge: 06f6530 eee4117
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 10:35:43 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 06f65305d536250c5dfa2aaa84ffacdac113c8fc
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 14 16:04:05 2017 +1000

    Issue #215 Conscrypt ALPN provider

    First attempt at client support

commit 32d77461935263da86fb363233af0aa5a159d1fc
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 14 09:48:43 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit bc051dca5e3ea7fed6ddb3a25ba5cecbd1c5b18b
Merge: 573c9f0 6c47126
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 14 08:49:10 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 573c9f060172b2863b0b0a94c1ec2fb9a8762fa2
Merge: 47e22fe 3399fd3
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 13 15:24:27 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 47e22fe2e4f8e3cc71f3117ad7d789dc3ea56675
Merge: 63ffa2b 187f37d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 13 11:04:24 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 63ffa2bdc13fa85d02459855a3f8e0de4f4b4f1b
Merge: cf1443d a0cb424
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 12 09:04:45 2017 +1000

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit cf1443d3ab71ac1aec7f153c233e869a3d6f783f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 12 09:03:52 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit a37aec327274042e1007f4146a3c3ec06fb424d9
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 7 21:19:28 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit 6d7f39b2b0e53570afa61be5abfef2a352f80cf3
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 7 18:22:19 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit a7d0f46b57091550724242693559d786180896ff
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 7 18:16:35 2017 +1000

    Issue #215 Conscrypt ALPN provider
 2017-09-21 07:34:25 +10: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
Joakim Erdfelt f107ec8c21 Merge pull request #1712 from gouessej/master 
Add systemd service file #1485
 2017-09-13 06:48:27 -07:00
Zachary Duquette 6613a45677 Added missing space to remove bash warning from JETTY_START_TIMEOUT 
Signed-off-by: Zachary Duquette <zachary.duquette@eidosmontreal.com>
 2017-08-18 16:10:02 -04:00
Zachary Duquette ed4d488e93 Configure jetty start timeout using JETTY_START_TIMEOUT 
Signed-off-by: Zachary Duquette <zachary.duquette@eidosmontreal.com>
 2017-08-17 15:36:10 -04:00
Greg Wilkins 8e7cdd8371 Updated for servlet 4.0 schemas 2017-08-15 15:33:11 +10:00
Greg Wilkins 39cb278577 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-08-10 13:22:54 +10:00
Jan Bartel 67d93f9f74 Issue #1724 2017-08-10 13:05:50 +10:00
Joakim Erdfelt 3ec5f8fa3d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-08-09 16:21:08 -07: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
Greg Wilkins cfeb2a3325 Issue #215 Conscrypt SSL provider 
upgraded to 1.0.0.RC9
 2017-08-08 09:15:51 -07:00
Greg Wilkins 1a07ddd787 Issue #215 Conscrypt SSL provider 
Added module to install Conscrupt SSL provider
 2017-08-08 09:15:43 -07:00
Jan Bartel 3296c01e8e Issue #1600 2017-08-08 09:13:29 -07:00
Greg Wilkins 652cc327d7 Stop module 
Moved jetty-stop.xml to jetyt-home
Created stop module
 2017-08-08 09:13:26 -07:00
olivier lamy b8e4f72e38 add Hazelcast session management #1571 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-08-08 09:13:19 -07:00
Julien Gouesse 65d7148461 Add systemd service file #1485 
Signed-off-by: Julien Gouesse <gouessej@orange.fr>
 2017-08-05 21:24:46 +02:00
Greg Wilkins 6494c2ce7c Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-08-02 12:22:37 +10:00
Greg Wilkins 7298bed572 Issue #215 Conscrypt SSL provider 
Added module to install Conscrupt SSL provider
 2017-08-02 11:52:31 +10:00
Greg Wilkins 640f20bec2 update distribution api 2017-07-25 11:55:51 +02:00
Greg Wilkins 7065196400 Issue #1676 remove deprecated properties from XML 2017-07-19 16:29:13 +02:00
Greg Wilkins 79cafb37a0 Issue #1676 Removed deprecated module jetty-continuations 2017-07-18 15:42:14 +02:00
Joakim Erdfelt a9c329859d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-12 13:18:12 -07:00
Joakim Erdfelt 2e8f9fc748 Revert "Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch" 
This reverts commit 38c112764d.
 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 157c4d7d76 Issue #1650 - removing cdi-websocket support 2017-06-28 16:39:40 -07:00
Jan Bartel 21b1ecef7b Issue #1597 
Removed javax.mail and javax.transaction jars and tidied up dependencies for test webapps.
 2017-06-21 16:20:01 +02:00
Joakim Erdfelt 00beb607fc Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-13 10:40:02 -07:00
Jan Bartel 09bc4f3d8b Merge pull request #1575 from olamy/feature/hazelcast_session_management 
add Hazelcast session management #1571
 2017-06-13 15:58:28 +02:00
Joakim Erdfelt 76ace004b6 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-09 09:17:43 -07:00
Jan Bartel 10a6e5fa5e Issue #1600 2017-06-09 11:55:21 +02:00
Greg Wilkins c6b9ce0401 Stop module 
Moved jetty-stop.xml to jetyt-home
Created stop module
 2017-06-08 12:53:04 +02:00
olivier lamy 8a300613df add Hazelcast session management #1571 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-06-08 13:02:22 +10: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
Greg Wilkins cbe857de01 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-11 10:08:36 +02:00
WalkerWatch e091701bcd Reviewing modules for #207 2017-05-09 13:38:14 -04:00
Joakim Erdfelt 782f36f157 Updating to version 9.4.6-SNAPSHOT 2017-05-02 14:29:09 -07:00
Joakim Erdfelt 9d8ad7489c Updating to version 9.4.5.v20170502 2017-05-02 13:22:18 -07:00
Joakim Erdfelt 92ea5bda21 Updating to version 9.4.5-SNAPSHOT 2017-04-14 14:43:36 -07:00
Joakim Erdfelt 3dc8f557c6 Updating to version 9.4.4.v20170414 2017-04-14 13:20:17 -07:00
Joakim Erdfelt 1360b863dc Updating to version 9.4.4-SNAPSHOT 2017-03-17 10:53:54 -07:00
Joakim Erdfelt 95e94b49d8 Updating to version 9.4.3.v20170317 2017-03-17 09:54:58 -07:00
Joakim Erdfelt 523fab30bd Updating to version 9.4.3-SNAPSHOT 2017-02-20 08:13:31 -07:00
Joakim Erdfelt 4a674b9cc9 Updating to version 9.4.2.v20170220 2017-02-20 06:22:45 -07:00
Joakim Erdfelt 3c29947a0d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-02-15 11:54:57 -07:00
Greg Wilkins 5a04af9292 Issue #1226 use $NAME 2017-02-09 16:48:15 +11:00
Jesse McConnell 9574ec2fa1 Merge branch 'jetty-9.4.x' 2017-01-27 17:16:24 -06:00
Jesse McConnell 621ebae192 Resolve #1292 remove bogus test dependency from jetty-home artifact dependencies 2017-01-27 17:16: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
Simone Bordet 9c975d7c9b Merged branch 'jetty-9.4.x' into 'master'. 2017-01-13 19:06:36 +01:00
Greg Wilkins 07fb9c97db Issue #1260 expand system properties 2017-01-13 17:49:27 +11:00
Simone Bordet b7b3dfdc77 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-12 17:53:09 +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 a51f800054 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-10 15:07:26 +01:00
Greg Wilkins bf60197490 Fixes #1226 
Moved jetty.sh to jetty-home
relocated JETTY_RUN to be a jetty directory in /var/run etc.
moved start.log to be in JETTY_RUN
 2017-01-10 17:10:27 +11: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
Simone Bordet a62e0968d5 Merged branch 'jetty-9.4.x' into 'master'. 2016-10-19 20:47:59 +02:00
Simone Bordet c6ac3c8c39 Removed unnecessary files. 2016-10-19 20:46:59 +02:00
Simone Bordet 6db48b2f02 Merged branch 'jetty-9.4.x' into 'master'. 2016-10-19 16:35:36 +02:00
Simone Bordet b2c62b648f Removed reference to jetty-logging.xml. 
File jetty-logging.xml has been renamed to console-capture.xml,
but it's not needed anymore in jetty.conf.
 2016-10-19 16:01:28 +02:00
Simone Bordet 582de49311 Improved error message for modules that are no longer available. 2016-10-19 15:56:28 +02:00
Simone Bordet ae240b9c17 Fixed properties in *.mod and *.xml for module console-capture. 2016-10-19 11:44:13 +02:00
Simone Bordet 39f47244fa Merged branch 'jetty-9.4.x' into 'master'. 2016-10-17 15:36:32 +02:00
Greg Wilkins 68e86e4d4e Deprecated Modules #1003 
Added deprecated.properties file to provide more details of deprecated modules
 2016-10-14 10:48:51 +11:00
Jan Bartel 6a2316fb23 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-13 15:21:51 +11:00
Greg Wilkins 9d475a624b Normalize tags #998 2016-10-13 10:06:17 +11:00
Jesse McConnell 08dc20476b fix jolokia on merge from 9.4.x 2016-10-12 09:48:02 -05:00
Greg Wilkins af0a2abe25 moved 3rd party xml to modules 2016-10-11 20:02:50 +11:00
Simone Bordet bcc29de3eb Merged branch 'jetty-9.4.x' into 'master'. 2016-10-06 16:37:43 +02:00
Greg Wilkins 91e9e7b76a Issue #984 Improve module listing 2016-10-06 17:01:08 +11:00
Greg Wilkins c52eec226e Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-02 11:23:18 +10:00
WalkerWatch b33c463c6e Updating jamon version to 2.81 as part of module revisions in #731. (#895) 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-09-02 10:03:35 +10: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
Joakim Erdfelt 5d11cd3392 Fixing version 2016-07-26 13:10:36 -07:00
Jan Bartel 003e9cd302 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-17 15:54:02 +10:00
Greg Wilkins 4bf4c51084 Issue #644 Modules for enabling logging 
Use JCL module
 2016-06-17 15:10:41 +10:00
Jan Bartel 1e7b866d6f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-17 13:36:56 +10:00
Greg Wilkins 2fbf466393 Issue #644 Modules for enabling logging 2016-06-17 07:39:11 +10:00
Jan Bartel 80cae83bde Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-16 12:17:18 +10:00
Jan Bartel fd0c2c968c Reinstate xmemcached module 2016-06-16 10:31:36 +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