Commit Graph

15003 Commits

Author SHA1 Message Date
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 bcd6ed9267 Merge remote-tracking branch 'origin/release-9.3.21' into jetty-9.3.x 2017-09-20 14:33:00 -07:00
Joakim Erdfelt 36a649a66c Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2017-09-20 14:29:17 -07:00
WalkerWatch d77ba8203a Making note of Infinispan 9.1.0 modules 2017-09-20 17:16:28 -04:00
WalkerWatch edb168f782 Fixed version and formatting issues. 2017-09-20 16:55:59 -04:00
WalkerWatch 8d3d109f8f Cleaning up hazelcast doc 2017-09-20 16:37:56 -04:00
WalkerWatch 5d1efcf1c2 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-09-20 16:35:15 -04:00
WalkerWatch c256f622dd Cleaning up naming 2017-09-20 16:35:05 -04:00
Greg Wilkins effec06eb6 Issue #1797 Multi Release Jar javadoc 2017-09-20 15:40:17 +10:00
Greg Wilkins aa93a37603 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-1797 2017-09-20 14:55:06 +10:00
Greg Wilkins 50f861e8f2 Issue #1797 MR jar support in java8 code 2017-09-20 13:47:37 +10:00
Jan Bartel 82bfdf74f0 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640 2017-09-20 13:35:37 +10:00
Jan Bartel d9ecd5e6bc Issue #1818 2017-09-20 13:31:49 +10:00
Jesse Glick 8aa954a3c7 @janbartel suggests applying sorting also to WebInfConfiguration.findWebInfLibJars. 2017-09-19 12:29:24 -04:00
Jan Bartel 39aee0b18f Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640 2017-09-19 16:43:17 +10:00
Jan Bartel d3b14b97fb Issue #1760 2017-09-19 14:38:14 +10:00
Jan Bartel d808094e82 Issue #1829 2017-09-19 14:32:34 +10:00
Greg Wilkins 219b61f5b4 Issue #1797
Converted jetty-util to be a multi release jar
Added org/eclipse/jetty/util/MultiReleaseJarFile as botha  java8 and java9 version
deprecated jarScanner
updated AnnotationParser to use MultiReleaseJarFile
2017-09-19 13:40:59 +10:00
Jan Bartel 65d77ff129 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640 2017-09-19 12:01:52 +10:00
Joakim Erdfelt 17e11a7e7d Updating to version 9.3.22-SNAPSHOT 2017-09-18 15:04:47 -07:00
Joakim Erdfelt 15bd75f858 Updating to version 9.3.21.v20170918 2017-09-18 14:24:36 -07:00
Joakim Erdfelt e838eced95 Removing M0 release details 2017-09-18 14:20:19 -07:00
Joakim Erdfelt 6fb0eb5c9d Toolchain version updates 2017-09-18 14:18:21 -07:00
Joakim Erdfelt 12874baaa8 Fixing jetty-bom references for Jetty 9.3.x 2017-09-18 14:15:46 -07:00
Joakim Erdfelt eee41174f2 Merge branch 'release-9.4.7' into jetty-9.4.x 2017-09-18 14:06:44 -07:00
Jesse Glick ac61f0e968 Ensure that WebAppClassLoader.addJars considers classpath entries in a deterministic order.
Signed-off-by: Jesse Glick <jglick@cloudbees.com>
2017-09-18 16:20:53 -04:00
Joakim Erdfelt 3d5f06d05d Merge pull request #1827 from olamy/bugfix/bom-coordinates
fix some Maven artifact coordinates in the bom
2017-09-18 05:20:02 -07:00
olivier lamy ff11a3edd4 fix groupdId for websocket-servlet and comment jetty-monitor as it is not part of the build anymore
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-09-18 17:12:47 +10:00
olivier lamy f0df30cc94 fix artifactIds for fcgi
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-09-18 17:06:03 +10:00
Joakim Erdfelt d9865a02ba Updating to version 9.4.8-SNAPSHOT 2017-09-14 08:44:27 -07:00
WalkerWatch 6176f67049 Additional updates for #1813. 2017-09-14 11:13:02 -04:00
Joakim Erdfelt 80fb788d0c Updating to version 9.4.7.v20170914 2017-09-14 07:35:18 -07:00
Simone Bordet 12220c2a66 Fixes #1813 - Update Garbage Collection documentation to reflect JDK9 changes. 2017-09-14 13:46:10 +02:00
Simone Bordet aa4a77794e Issue #212 - HttpClient to support pluggable AuthenticationStore.
AuthenticationStore must be initialized eagerly.
2017-09-14 13:00:52 +02:00
Simone Bordet 93d0d324ab Formatting cleanup and fixed javadocs. 2017-09-14 11:56:45 +02:00
Simone Bordet ce9be291d3 Fixes #212 - HttpClient to support pluggable AuthenticationStore. 2017-09-14 11:29:39 +02:00
Jan Bartel 7ad415b9b8 Issue #1819 2017-09-14 16:07:00 +10:00
Joakim Erdfelt 562834d903 Updating jetty-version-maven-plugin 2017-09-13 16:34:51 -07:00
Jan Bartel 320f734fcd Issue #1640
Improve javadocs
2017-09-14 08:53:27 +10:00
Simone Bordet 6c471264d7 Issue #1818 - Infinispan tests failing with JDK 9.
Disabled tests for JDK 9.
2017-09-13 15:42:49 +02:00
Simone Bordet 0bfc5a140f Issue #1817 - JstlTest failure with JDK 9.
Disabled test for JDK 9.
2017-09-13 15:42:18 +02:00
Simone Bordet 8d03e97205 Fixes #1816 - HttpClientTest.testClientCannotValidateServerCertificate() hangs with JDK 9.
Now upgrading the connection also in cased of filled=-1, so that the
new nested connection attempts to read/write and will see a failure
(although not the SslHandshakeException).
2017-09-13 15:26:44 +02:00
Simone Bordet ac2776259c Issue #1815 - WebSocket test failures.
Ignored unstable tests.
2017-09-13 10:46:22 +02:00
Jan Bartel 16498333a4 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640 2017-09-13 15:36:25 +10:00
Greg Wilkins 3399fd36dc Fix #1814 Java Version utility 2017-09-13 15:20:43 +10:00
Jan Bartel 5aa92552bd Issue #1809 2017-09-13 11:42:17 +10:00
Greg Wilkins bdc7242de6 reformatted code LdapLoginModule.java 2017-09-13 11:09:58 +10:00
Joakim Erdfelt 187f37dc5f Merge pull request #1801 from eclipse/issue-1797-multi-release-jars
Issue #1797 - Safety checks for Java 8 and Multi-Release JARs during bytecode scanning
2017-09-12 16:06:55 -07:00
WalkerWatch b9b284b3f6 Updated documentation for symlinks. Resolves #1812 2017-09-12 15:31:41 -04:00
Simone Bordet a0cb4247e7 Fixes #1718 - QueuedThreadPool not exposed on JMX.
Now MBeanContainer keeps track of the parent/child component relationship.

MBeans are registered for a pair (parent, child) and unregistered only
for the same pair.

For example, Server owns a ThreadPool and a Connector; in turn the
Connector adds the Server ThreadPool as an unmanaged component to itself.
The ThreadPool is registered as MBean with the pair (Server, ThreadPool).
When the Connector is stopped and removed from the component tree,
MBeanContainer sees a removal event for the pair (ServerConnector, ThreadPool).
But since that pair was not the one that triggered the registration of
the MBean, the MBean is not unregistered.
2017-09-12 00:47:02 +02:00