9c13cf3a52
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-02 17:37:56 +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
a21dab222f
fix simone review comments
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 16:29:21 +01:00
e2ddfbde00
Issue #3425 upgrade conscrypt to 2.0.0 disable TLSv1.3 for jdk8 tests
...
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
715bac2660
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageBinaryCallable.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageTextCallable.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/BinaryWholeMessage.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/TextWholeMessage.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/EchoTest.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtension.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/FragmentExtensionTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/OutgoingFramesCapture.java
2019-03-04 09:44:47 -05:00
e476cec6d3
Issue #1676 - Removing deprecated methods and classes
...
+ Changing usages of JVM deprecated classes / methods as well
+ Cleaning up test cases and javadoc
+ Removing test methods that rely on deprecated and now removed concepts
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-28 17:54:28 -05:00
f5b3ddc1a5
Adding optionalRemoteDebug feature to test-jetty-osgi
2019-02-28 16:10:46 -05: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
1c55e2bf79
Issue #3303 - Update to jakarta ee javax artifacts for jetty-10.
...
Updated javax.annotation -> jakarta.annotation.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 18:56:16 +01:00
e2506d4811
Merge pull request #3168 from eclipse/jetty-10.0.x-3162_jetty_servlet_api
...
Issue #3162 - Use Jetty specific Servlet API jar.
2019-02-07 17:33:14 +01:00
fb90666931
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-02-06 17:24:06 +11:00
72ad74866c
Issue #3162 - Reverting not-relevant OSGi changes
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-04 18:51:51 +01:00
e135197066
Issue #3162 - Introducing more convenience Options for PaxExam
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-04 18:51:51 +01:00
95bc15f521
Issue #3162 - Correcting websocket issues in OSGi
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-04 18:51:51 +01:00
66f8259df3
Issue #3162 - Use Jetty specific Servlet API jar.
...
Removed references to jetty-osgi-servlet-api.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:51:26 +01:00
13cee0bc4d
Issue #3049 - Warn on common SslContextFactory problematic configurations.
...
Updating SslContextFactory configuration for tests, take 2.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-31 16:51:20 +01:00
26fa79a050
Issue #3162 - Reverting not-relevant OSGi changes
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-30 12:43:36 -06:00
c30c8d4339
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-client/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml
# jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithWebSocket.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
# jetty-quickstart/pom.xml
# jetty-servlets/pom.xml
# jetty-util/pom.xml
# jetty-websocket/javax-websocket-client/pom.xml
# jetty-websocket/javax-websocket-server/pom.xml
# jetty-websocket/jetty-websocket-server/pom.xml
# pom.xml
2019-01-30 11:56:58 -06:00
4d191d8a31
fix groupId ( #3294 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-25 16:04:33 +10:00
5095c8a7b2
Issue #3288 - Correcting Jetty WebSocket API artifactIds
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-23 15:58:11 -06:00
0e97d9b68d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-01-15 14:57:21 +11:00
9f3f3b78ae
Issue #3250 Ease osgi debugging ( #3251 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-01-15 14:38:16 +11: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
bd4933b33c
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-12-21 21:48:36 +10:00
63820e5405
activate Maven enforcer Upper bound dependencies check ( #3116 )
...
* add requireUpperBoundDeps rule
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-21 21:35:31 +10:00
f2f6598ddc
Fixed param name after review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-18 08:46:52 +11:00
6590dfe832
fixed javax websocket OSGi test
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 16:19:16 +11:00
1176b267b5
removed -impl from websocket name and fixed SCI
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 10:05:10 +11:00
52d0d62594
Configure default EndpointIdentificationAlgorithm for WebSocketCoreClient
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 09:36:13 +11:00
9a67114c43
work in progress to fix websocket OSGi
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-12 17:35:46 +11:00
61686843db
Issue #3162 Partial fix for javaxwebsocket in osgi, wip.
2018-12-12 14:44:04 +11:00
ff0aa965c4
Issue #3162 - Attempting to address ServiceLoader with javax.websocket (client) on OSGi
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-12-12 14:43:58 +11:00
1167adf713
Issue #3162 Partial fix for javaxwebsocket in osgi, wip.
2018-12-12 10:15:43 +11:00
13ee892921
Merge remote-tracking branch 'remotes/lachlan/jetty-10.0.x-3129-websocketModuleRefactor' into jetty-10.0.x-3129-websocket
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-05 09:55:22 +01:00
f4cf671b27
Issue #3129 Fix websocket in osgi; javax websocket test still broken.
2018-12-05 09:38:13 +01:00
435dd200bd
Issue #3162 - Attempting to address ServiceLoader with javax.websocket (client) on OSGi
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-12-04 11:31:02 -06:00
7262bfd584
Issue #3162 - Fixing testcase assertions
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-12-04 08:50:19 -06:00
97bba2eb6f
Issue #3162 - Fail test early if `conscrypt-version` is undefined (like on Windows, or within an IDE)
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-12-04 08:48:15 -06:00
24e680e272
Issue #3162 - Introducing more convenience Options for PaxExam
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-12-03 17:35:08 -06:00
db11be087a
Issue #3162 - Updating XML (removing references that seem to be getting in the way)
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-12-03 17:33:20 -06:00
c3348a0a03
Issue #3162 - Correcting websocket issues in OSGi
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-11-30 15:03:44 -06:00
e8ba030904
Issue #3129 - refactor of javax websocket package names
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-29 17:43:51 +01:00
8ff82423f9
Issue #3162 - Use Jetty specific Servlet API jar.
...
Removed references to jetty-osgi-servlet-api.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-29 17:36:09 +01:00
bfa2dbf68c
Issue #3162 - Use Jetty specific Servlet API jar.
...
* Updated module-info.java to reference the "jetty.servlet.api" module.
* Updated POMs to reference the o.e.j.toolchain:jetty-servlet-api artifact.
* Removed references to jetty-schemas.jar.
* Updated attribute "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"
to match the new Jetty Servlet API jar.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-29 16:51:29 +01:00
Simone Bordet
Joakim Erdfelt
olivier lamy
Jan Bartel
Olivier Lamy
Greg Wilkins
Lachlan Roberts