mirror of
https://github.com/jetty/jetty.project.git
synced 2025-02-22 15:15:48 +00:00
31a9b6f2e8
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
60 lines
2.0 KiB
XML
60 lines
2.0 KiB
XML
<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>
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
<artifactId>jetty-alpn-parent</artifactId>
|
|
<version>9.4.8-SNAPSHOT</version>
|
|
</parent>
|
|
<modelVersion>4.0.0</modelVersion>
|
|
<artifactId>jetty-alpn-client</artifactId>
|
|
<name>Jetty :: ALPN :: Client</name>
|
|
<properties>
|
|
<bundle-symbolic-name>${project.groupId}.alpn.client</bundle-symbolic-name>
|
|
</properties>
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.apache.felix</groupId>
|
|
<artifactId>maven-bundle-plugin</artifactId>
|
|
<extensions>true</extensions>
|
|
<executions>
|
|
<execution>
|
|
<goals>
|
|
<goal>manifest</goal>
|
|
</goals>
|
|
<configuration>
|
|
<instructions>
|
|
<Import-Package>org.eclipse.jetty.alpn;resolution:=optional</Import-Package>
|
|
</instructions>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
<!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
|
|
with a snapshot. -->
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-source-plugin</artifactId>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<artifactId>findbugs-maven-plugin</artifactId>
|
|
<configuration>
|
|
<onlyAnalyze>org.eclipse.jetty.alpn.*</onlyAnalyze>
|
|
</configuration>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
<artifactId>jetty-io</artifactId>
|
|
<version>${project.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty.toolchain</groupId>
|
|
<artifactId>jetty-test-helper</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
</dependencies>
|
|
</project>
|