jetty.project/examples/embedded/pom.xml

139 lines
4.8 KiB
XML
Raw Normal View History

2012-10-18 10:21:42 -04:00
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
2012-11-20 13:25:38 -05:00
<groupId>org.eclipse.jetty.examples</groupId>
2012-11-18 23:57:38 -05:00
<artifactId>examples-parent</artifactId>
2019-07-11 16:54:21 -04:00
<version>10.0.0-SNAPSHOT</version>
2012-11-18 23:57:38 -05:00
<relativePath>../pom.xml</relativePath>
2012-10-18 10:21:42 -04:00
</parent>
<modelVersion>4.0.0</modelVersion>
2012-11-20 13:25:38 -05:00
<groupId>org.eclipse.jetty</groupId>
2012-10-18 10:21:42 -04:00
<artifactId>example-jetty-embedded</artifactId>
<name>Example :: Jetty Embedded</name>
<description>Jetty Embedded Examples</description>
<url>http://www.eclipse.org/jetty</url>
2014-08-15 05:35:49 -04:00
<properties>
2015-05-13 09:13:16 -04:00
<bundle-symbolic-name>${project.groupId}.embedded</bundle-symbolic-name>
2014-08-15 05:35:49 -04:00
</properties>
2012-10-18 10:21:42 -04:00
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-deploy</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-rewrite</artifactId>
<version>${project.version}</version>
</dependency>
2012-10-18 10:21:42 -04:00
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-server</artifactId>
<version>${project.version}</version>
</dependency>
Jetty 10.0.x websocket refactor (#3055) * Adding more todos * More websocket test updates * Adding more information to exception about mismatched hash * AcceptHash improved testing * Prevent duplicate request headers * Removing ability to use LocalFuzzer entirely (until its fixed) * JSR356 HandshakeResponse header modifications are now allowed during Configurator * Correcting MessageSink creation * Using proper sub-protocol * Metadata remembers OnMessage.maxMessageSize now * Minor test updates * Issue #2172 - Fixing JSR-356 Decoder discovery and OnMessage wiring * More websocket test updates * Update for null/empty payload * Partial String Message Sink fix * More websocket fixes around InputStream handling * Moving proposed Abstract FrameHandler hierarchy into core main * More testing fixes, along with a change to use the new core Abstract*FrameHandler * Adding WebSocket URI validation * Updating copy found in other API with improvements made in first API. * More websocket test updates * Fixing compilation * WebSocket test fixes * Fixing ContinuationTest assertions * fixed package * Added some better examples of QuotedCSV I think this test is trying to use QuotedCSV in the wrong way, as it often is offering values when it should be testing parameters. I have added some examples to show that QuotedCSV is capable of handling the quotes, spaces and embedded commas of the tests, but only for parameters and not for values. The question is, is this sufficient for websocket? * Improve close handling The handling of a Close Frame may close the endpoint, so parsing should not continue * moved old AbstractFrameHandler to test * implement ingoing and outgoing frame sequence checking * More work on javax.websocket parameterized server * Bumping up pom plugin versions to jetty-9.4.x standards * Merging up Jenkinsfile to attempt to fix CI build issues * JSR356 @PathParam testing * More WebSocket testing updates * More WebSocket testing updates * WebSocket Idle Timeout from FrameHandler specific policy * WebSocket/JSR Pong support * WebSocket/JSR Correcting MessageHandler.Whole<PongMessage> handling * URL Decode UriTemplatePathSpec values * Fixing test expectations * Fixing AbstractWholeMessageHandler buffer flip * More websocket test fixes * Updated ALPN version for JDK 8u181. * Removing QuotedUtil from WebSocket-core + Moved to QuotedCSV for most usages + Introduced HeaderUtil to satisfy remaining use cases * Review of HttpClient names and Thread names. + Javax WebSocket Server = "Javax-WebSocketServer@####" + Javax WebSocket Client = "Javax-WebSocketClient@####" * added OpCodeTest.java * Minor Frame cleanup * MessageOS cleanup * Made the OpCode of WebSocket Frame immutable. Frames can no longer be set as a continuation and should now be copied using the ContinuationFrame constructor DataFrames can no longer be created without one of the subclasses as the public constructor was removed in favour of newDataFrame method * Chat test * Work on Chat Test Moved implementation of assertValid to WebSocketFrame Removed getFinRsvOp * removed constructors for DataFrame using a basedOn Frame instead use constructors with opCode, payload and fin bit * refactor of WebSocket Frames WIP * WIP: resolved failing tests * CloseStatus rework, now use CloseStatus.toFrame to create Close Frames new DelegateFrame class which ReadOnlyFrame extends trim utf8 byte array in CloseStatus to utf8 character boundaries only * working on test to test socket io erros in websocket-core * renaming for clarity Gave up on maintaining old names, as this is a different package anyway so some adaption will be needed regardless. * Moved AbstractFrameHandlers to common Only have a AbstractTestFrameHandler in core * Close uses CloseStatus Reduced the parsing and generation of CloseStatus when closing * merge * work on WebSocketTest * cleanup log * wip * files missing comment header jetty-jmh was using 9.4.12-SNAPSHOT now using 10.0.0-SNAPSHOT * thread names * remove sequence check from parser * minor cleanups * Call frameHandler externally to parser * OpCode.check now throws ProtocolException instead of returning boolean changed ProtocolException messages in OpCode.check * removed Frame.Type and use OpCode instead separated out FrameValidation for parser into method in WebSocketChannel * moved remaining frame validation checks into WebSocketChannel * referenced counted buffer * cleanups * wip on demand side * First attempt at demandable * demand control * clean up reference counting * clean ups * WebSocketServerTest * wip * fixed auto fragmentation * simple demand test * test demand and retain * Added validation back into the Parser split up validation in WSChannel into methods for incoming and outgoing fixed various tests in websocket-core * more tests * fixed remaining tests failing due to the changes to frame validation * cleanups * more autobahn refixes * adjust mask for auto fragments * clear mask * fully close on unrecoverable error and not wait for close response * Removed the CoreFuzzer and ContinuationTest These tests are now covered elsewhere. * remove declared exception onClosed * Test delay close * Test handler close * fixed test dependency * moved the frame sequence check from OutgoingState from after the ExtensionStack to channel.sendFrame changed error handling to fail the callback of invalid/outOfSequence frames added WebSocket Close tests revealing some problems with demand in state ICLOSE * cleanup * timing issues with WebSocketCloseTest * test cleanups * Cancel demand on close * removed frame validation from generator * finished close testing * Issue #2901 - Moving Http Upgrader to Http Conversation + Solves for Authentication and Redirect * changes from #2902 to jetty-10.0.x * Validation Extension introduced a ValidationExtension to do frame validation in the ExtensionStack added the WebSocketChannel to ExtensionStack.connect to set it on the Extensions * added parameters for ValidationExtension to choose what to validate * ValidationExtension Cleanup ValidationExtension now uses the Validation methods from its WebSocketChannel simplified the parameter passing to the ValidationExtension * core cleanup * Fixed intermittent test failures * clean up duplicates and imports * simplified package structure * many cleanups, simplifications and duplication removal * cleanup * added utf8 validation for text frames into ValidationExtension added tests for utf8 validation * create ValidationExtensionTest * cleanup * merge with jetty-10 update websocket to junit5 * fix to autobahn client report directory * Fixes and cleanup Fixed initial buffer too large for websocket buffer less verbose debug better debug * Removed behavior from policy * cleanup after merge from hell * bug fixes and cleanups * refactor packages with JPMS in mind * unit test for TextMessageHandler * cleanups * more cleanups * provided client/server dependencies * fixed bad refactor * use lambdas for TextMessageHandler * cleanup * cleanup * cleanups * cleanup of websocket-common framehandlers * reverting to jetty websocket api from 9.4 * better chat * renamed websocket common to util * save wip on jetty-websocket-tests * giving up on jetty-websocket-tests as mostly duplicated tests * renamed websocket-util back to websocket-common * moved InvalidWebSocketException to javax common * reworked TextMessageHandler to MessageHandler now handles binary messages as well * implemented getByteBufferPool in remaining DummyChannel classes * Moved the abstract Frame and Message handlers out of websocket-common * replaced usages of AbstractWholeMessageHandler with CoreMessageHandler renamed MessageHandler to CoreMessageHandler * removed AbstractFrameTypeHandler * cleanup * jetty-websocket-common passing tests without websocket-common dependency * fixed compile errors * renamed MessageHandler * Removing reference to websocket-server (no longer exists) * Removing, Extensions now exist in websocket-core * Do not append an empty ByteBuffer * NPE Fix for empty/unused UTF-8 String Builder * NPE Fix for SendPartialBinaryFrameHandler test * Punching holes in WebAppContext needed for JSR356 use * Updating "9.x.x" to "10.x.x" * Removing Bad URI test case that is ignored * Fixing test expectation now that we moved to QuotedCSV * Adding TODO about onOpen failure requiring onError + onClose. * Throwing JSR356 DeploymentException on addEndpoint() failure * Test cleanup (for better error messages) * Adding some comments to explain wrapNonVoidReturnType() * cleanup methodHandle return type filtering * test fixes * Fix change return type to Void * Fixed test by wiring up MessageHandler * test cleanups removed changeReturnType for MethodHandle as filterReturnValue already changes to return type of the filter * fixed MessageReceivingTest.testPartialBinaryFrameHandler * Core BatchMode replaced by boolean * fixed LargeContainerTest.testEcho by allowing the policy to be set on the WSServer as an attribute * acquire batchBuffer before calculating batchSpace in FrameFlusher * Deprecated WebSocketPolicy * Fixing MessageReceivingTest * Refactoring out websocket-servlet + WebSocketPolicy removed from websocket-servlet + websocket-common is removed + Migrating back up to APIs * WIP removing core policy * added missing copyright headers * customize client session * customize cleanup * wip * wip * Removing WebSocketPolicy usage within websocket-core * Allowing DummyCoreSession to have a Behavior * Removing core WebSocketPolicy.clonePolicy() - no longer used * Jetty Native WebSocket now compiles / tests * Remember WebSocketServletFactoryImpl as Context Attribute * JSR356 codebase now compiles * updated websocket servlets * fix handling for no max message size * Fixed LargeContainerTest.testEcho Changed WebSocketServletFactoryImpl.defaultAutFragment to true only check the incoming frame size if autoFragment is false * Added WebSocketConstants to avoid duplicate default locations * applications extensions discovered via headers * fixed ConfiguratorTest.testNoExtensionsConfigurator * cleaned up extension negotiation * cleaned up extension negotiation * cleanups * Convert exceptions to API versions * cleanup imports * convert requestURI to a WebsocketURI in Negotiated * fixed SessionTrackingTest * moved session tracking management to be done by the JavaxWebSocketFrameHandler * Cleanup dump for jdk11 classloaders * fix to ConfiguratorTest added the EchoSocket endpoint on the ServerContainer instead of using server.registerWebSocket * Simplify websocket-servlet fixed jetty websocket chat example fixes for javax websocket chat example fixed Upgrade response header issues Set default configurations improved dump depends on javax server impl do not expose core classes fix javadoc removed FrameHandlerFactory self reference * Removed -impl from javax client and server * Fixed common tests for onClosed event * Improve creation of JavaxWebSocketServerContainer Better handling of executor and httpClient as managed beans * Fixed MessageOutputStream using empty buffers and looping forever no longer enforce maxTextMessageBufferSize on partial messages * Updates after review reintroduced WebSocketServletFactory reverted other API changes * Ignored TextStreamTest tests incorrectly assuming no frame fragmentation When message fragmentation is implemented in PartialStringMessageSink then update these tests to check on the server side for no buffers larger than the maxTextMessageBufferSize. * fixed check for previous WebsocketUpgrade filter Disable the AltFilterTest until problems of the WebSocketUpgradeFilter attributes on the ServletContext are fixed. * fixed flaky SessionTrackingTest by waiting for Sessions to open * remove payload length check for outgoing frames fix bug sending frames after they have failed validation checks * reverted maven coords for javax client and server * updated to latest jetty-10 dump changes * Fix to WebSocketUpgradeFilter Attributes on the ServletContext Removed deprecated method WebSocketUpgradeFilter.configureContext(ServletContext) Changed return type of WebSocketUpgradeFilter.configureContext(ServletContext) to void. WebSocketUpgradeFilter.configureContext was checking the ServletContext for a WebSocketUpgradeFilter set as an attribute before creating a new one. The FilterHolder from web.xml is being set as an attribute in init which is called which happens after configureContext. So instead of checking the attribute in WebSocketUpgradeFilter.configureContext, we are now searching through the filters on the ServletHandler to see if a WebSocketUpgradeFilter has been registered with the CONTEXT_ATTRIBUTE_KEY. * cleanup and identifying problems with FrameHandlerMetadata * properly cache Metadata and copy MessageMetadata properly cache Metadata in the FrameHandlerFactory using the metadataMap copy the MessageMetadata from Metadata to prevent mutating the MethodHandle * added new WebSocketServerContainerExecutorTest removed DelayedStartClientOnServerTest which doesnt seem to be a valid test when executors are shared removed last check for executor==null in JavaxWebSocketServerContainerInitializer as the threadPool is always created in the server * reformatted websocket code * reformat code * Rervert unnecessary changes from 10.0.x * Rervert unnecessary changes from 10.0.x * fix build issues testing Hazelcast sessions * QuotesDecoderTest sessions not being closed * Fixed CookiesTest CookiesTest.testCookiesAreSentToClient was failing due to the Assertion being caught and logged by the upgrade request the response is now captured by a FuturePromise and the assertions are done in the main test the reason the assertion was failing was due to lowercase "set-cookie" instead of "Set-Cookie" * fixed maven coords * javadoc fixes * fixed javadoc * revert maven artifact names * cleanup after review Signed-off-by: Lachlan Roberts <lachlan@webtide.com> Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-02 08:07:43 -04:00
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-servlet</artifactId>
<version>${project.version}</version>
</dependency>
2012-10-18 10:21:42 -04:00
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket-server</artifactId>
2012-10-18 10:21:42 -04:00
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId>
2012-10-18 10:21:42 -04:00
<version>${project.version}</version>
</dependency>
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-20 17:34:25 -04:00
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-java-server</artifactId>
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-20 17:34:25 -04:00
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-conscrypt-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>test-mock-resources</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-proxy</artifactId>
<version>${project.version}</version>
</dependency>
2014-10-22 18:11:27 -04:00
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaas</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jstl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId>
2012-10-18 10:21:42 -04:00
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
2012-10-18 10:21:42 -04:00
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-test-helper</artifactId>
<!-- scope>test</scope-->
</dependency>
</dependencies>
</project>