Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2686 from cakofony/conscrypt 

Fixes #2342 Upgrade Conscrypt to 1.1.4
This commit is contained in:
Joakim Erdfelt 2018-06-29 09:09:40 -05:00 committed by GitHub
parent 0a7ad593e4 cd60da7a12
commit e45009d96a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-home/src/main/resources/modules/conscrypt.mod
View File

@ -29,6 +29,6 @@ Conscrypt is distributed under the Apache Licence 2.0
https://github.com/google/conscrypt/blob/master/LICENSE https://github.com/google/conscrypt/blob/master/LICENSE
[ini] [ini]
conscrypt.version?=1.0.0.RC11 conscrypt.version?=1.1.4
jetty.sslContext.provider?=Conscrypt jetty.sslContext.provider?=Conscrypt

4
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java
View File

@ -100,9 +100,9 @@ public class TestJettyOSGiBootHTTP2Conscrypt
res.add(CoreOptions.systemProperty("jetty.alpn.protocols").value("h2,http/1.1")); res.add(CoreOptions.systemProperty("jetty.alpn.protocols").value("h2,http/1.1"));
res.add(CoreOptions.systemProperty("jetty.sslContext.provider").value("Conscrypt")); res.add(CoreOptions.systemProperty("jetty.sslContext.provider").value("Conscrypt"));
res.add(wrappedBundle(mavenBundle().groupId("org.conscrypt").artifactId("conscrypt-openjdk-uber").version("1.0.0.RC11")) res.add(wrappedBundle(mavenBundle().groupId("org.conscrypt").artifactId("conscrypt-openjdk-uber").version("1.1.4"))
.imports("javax.net.ssl,*") .imports("javax.net.ssl,*")
.exports("org.conscrypt;version=1.0.0.RC11") .exports("org.conscrypt;version=1.1.4")
.instructions("Bundle-NativeCode=META-INF/native/libconscrypt_openjdk_jni-linux-x86_64.so") .instructions("Bundle-NativeCode=META-INF/native/libconscrypt_openjdk_jni-linux-x86_64.so")
.start()); .start());
res.add(mavenBundle().groupId("org.eclipse.jetty.osgi").artifactId("jetty-osgi-alpn").versionAsInProject().noStart()); res.add(mavenBundle().groupId("org.eclipse.jetty.osgi").artifactId("jetty-osgi-alpn").versionAsInProject().noStart());

2
pom.xml
View File

@ -25,7 +25,7 @@
<jsp.version>8.5.24.2</jsp.version> <jsp.version>8.5.24.2</jsp.version>
<!-- default values are unsupported, but required to be defined for reactor sanity reasons --> <!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
<alpn.version>undefined</alpn.version> <alpn.version>undefined</alpn.version>
<conscrypt.version>1.0.0.RC11</conscrypt.version> <conscrypt.version>1.1.4</conscrypt.version>
<asm.version>6.2</asm.version> <asm.version>6.2</asm.version>
<jmh.version>1.20</jmh.version> <jmh.version>1.20</jmh.version>
<jmhjar.name>benchmarks</jmhjar.name> <jmhjar.name>benchmarks</jmhjar.name>