b7a7a53a18
Jetty 10.0.x reformat ( #3812 )
...
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Removing Legacy Method Separators
* Restyling branch `jetty-10.0.x`
* Applying checkstyle changes
* Applying checkstyle changes
* Applying XML restyling
* Restyling XML in branch `jetty-10.0.x`
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Fixing XML restyling in branch `jetty-10.0.x`
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Revert "Restyling XML in branch `jetty-10.0.x`"
# Conflicts:
# jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml
# jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml
* Adding back build-resources
* Reformatting pom.xml files
* Disabling Checkstyle job
* fixed empty string on line wrap
* reformatted with latest intellij style
* misc checkstyle fixes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:42:39 +02:00
30704fa5f0
Disabled Conscrypt test due to a Conscrypt bug.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-16 21:34:32 +02:00
47253bae60
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-16 21:33:32 +02:00
d6b6aa4285
Increased connection timeouts.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-16 16:38:17 +02:00
8e48f516c4
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-16 11:50:01 +02:00
267991982e
Increased timeouts for tests that connect to external sites.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-16 11:43:49 +02:00
c7a2d8b7c6
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-15 18:22:09 +02:00
64549fb19c
Updated Conscrypt to 2.1.0.
...
Tagged tests that connect to external servers as "external".
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-15 18:10:21 +02:00
6fb243ff6c
Issue #3464 - Split SslContextFactory into Client and Server
...
Introduced SslContextFactory subclasses Client and Server.
Replaced all usages of SslContextFactory with either Client or Server
as required.
Refactored configuration checking so that warnings are not emitted
when non necessary.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-21 14:42:42 +01:00
ec8a1bdb23
Merge pull request #3313 from eclipse/jetty-10.0.x-1350-dynamic_client_transport
...
Issue #1350 - Dynamic selection of the transport to use based on ALPN on the client side.
2019-03-19 15:31:11 +01:00
95a6b76851
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2019-03-15 16:00:59 -05:00
123918018e
Issue #3425 - Upgrade conscrypt version to 2.0.0 and remove usage of reflection.
...
Small fixes after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-15 09:19:16 +01:00
adbfcbcf60
- Issue #3425 upgrade conscrypt to 2.0.0 and get rid of reflection usage
...
- align conscrypt version in conscrypt.mod file
- add more simple unit test to test conscrypt alpn usage
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 11:35:10 +01:00
aa211b033d
Issue #1350 - Dynamic selection of the transport to use based on ALPN on the client side.
...
Introduced `HttpClientTransportDynamic` to be able to switch transport dynamically.
Refactored other transports and HttpDestination, removing now unnecessary classes.
Introduced ProxyProtocolClientConnectionFactory and used it for testing.
Updated OSGi tests now that jetty-client depends on jetty-alpn-client.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-06 10:26:10 +01:00
9cdb59d4d7
Updating to version 9.4.16-SNAPSHOT
2019-02-15 13:35:15 -05:00
eb70b24016
Updating to version 9.4.15.v20190215
2019-02-15 11:53:00 -05:00
b9f89af847
Fixes #3320 - Review Jetty 10 module-info.java.
...
Reviewed module-info.java files.
For those that have a "requires static" added a comment about
why the dependency is optional.
Rearranged directives in alphabetical order.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-08 17:30:27 +01:00
63f2023e05
happy new year!!
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10:00
9b7afd8a03
Happy new year!! ( #3232 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
f0fbd63a55
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-11-22 12:56:25 +01:00
5f972b451c
Jetty 10.0.x 2978 add module info ( #3120 )
...
Fixes #2978 - Add module-info to relevant Jetty modules.
Added module-info.java for Jetty modules that are not test modules.
Moved jetty-http test utility classes to new module "jetty-http-tools".
Removed generation of test-jar from websocket-core.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-22 12:37:35 +01:00
29fd18e046
Updating to version 9.4.15-SNAPSHOT
2018-11-14 16:42:40 -06:00
c4550056e7
Updating to version 9.4.14.v20181114
2018-11-14 15:19:10 -06:00
a903017f5f
Updating to version 9.4.14-SNAPSHOT
2018-11-11 21:06:50 -06:00
49123a3313
Updating to version 9.4.13.v20181111
2018-11-11 20:02:42 -06:00
dcf6a8fa9f
Updating to version 9.4.13-SNAPSHOT
2018-08-30 10:48:22 -05:00
2720868475
Updating to version 9.4.12.v20180830
2018-08-30 08:56:44 -05:00
0b69f00665
Updating to version 9.4.12-SNAPSHOT
2018-07-11 17:32:16 -05:00
260596dd10
Updating to version 9.4.12.RC0
2018-07-11 16:30:55 -05:00
e4bfe00dce
Updating to version 9.4.12-SNAPSHOT
2018-06-05 14:18:37 -05:00
d5fc0523cf
Updating to version 9.4.11.v20180605
2018-06-05 13:23:02 -05:00
1732ffca51
Updating to version 9.4.11-SNAPSHOT
2018-05-03 11:48:05 -05:00
daa59876e6
Updating to version 9.4.10.v20180503
2018-05-03 10:55:19 -05:00
8763c6065d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-04-20 11:32:46 -05:00
0e88849a68
Issue #2164 Make osgi.serviceloader mostly optional ( #2408 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-04-18 14:48:53 +10:00
c3cc138a3b
Updating to version 9.4.10-SNAPSHOT
2018-03-20 08:25:59 -05:00
1f8159b1e4
Updating to version 9.4.9.v20180320
2018-03-20 07:18:24 -05:00
d5a0878019
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 10:08:30 -06:00
21365234f8
Issue #2108 - Updating license headers for year 2018
2018-01-09 09:44:41 -06:00
8e21c2f303
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-12-13 14:56:26 +01:00
8665348258
Issue #2015 add osgi headers for alpn conscrypt ( #2027 )
...
* Issue #2015 add osgi headers for alpn conscrypt
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-12-13 14:55:34 +01:00
ff53002fac
Updating to version 9.4.9-SNAPSHOT
2017-11-21 13:11:31 -07:00
82b8fb23f7
Updating to version 9.4.8.v20171121
2017-11-21 12:33:52 -07:00
efe694e2e4
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-26 14:41:42 +10:00
35d0b59434
Issue #215 Conscrypt module for SSL and ALPN
...
Upgraded to RC11
2017-09-26 10:09:30 +10:00
1b7ebf5599
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-23 00:22:57 +10:00
31a9b6f2e8
Issue #215 Conscrypt module for SSL and ALPN
...
Squash of the following commits:
commit 53e503b48d290e2ff83b214fd81572bf4cacd9ab
Merge: cc4ed73 d77ba82#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 effec06d9ecd5eFix #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#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 6c471263399fd3187f37da0cb424#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
Greg Wilkins
Simone Bordet
Joakim Erdfelt
olivier lamy
Olivier Lamy
Jesse McConnell
Jan Bartel