You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/10/31 08:08:10 UTC
lucene-solr:jira/http2_benchmark: Update jetty version

Repository: lucene-solr
Updated Branches:
  refs/heads/jira/http2_benchmark 39c16885d -> 3805c1115


Update jetty version


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3805c111
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3805c111
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3805c111

Branch: refs/heads/jira/http2_benchmark
Commit: 3805c11158b97ee6800270b7a6a8682d893d3552
Parents: 39c1688
Author: Cao Manh Dat <da...@apache.org>
Authored: Wed Oct 31 08:08:02 2018 +0000
Committer: Cao Manh Dat <da...@apache.org>
Committed: Wed Oct 31 08:08:02 2018 +0000

----------------------------------------------------------------------
 lucene/ivy-versions.properties        | 8 +++++++-
 lucene/tools/junit4/solr-tests.policy | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3805c111/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 4e680d9..8d8e062 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -244,12 +244,18 @@ org.codehaus.janino.version = 2.7.6
 /org.codehaus.woodstox/stax2-api = 3.1.4
 /org.codehaus.woodstox/woodstox-core-asl = 4.4.1
 
-org.eclipse.jetty.version = 9.4.11.v20180605
+/org.conscrypt/conscrypt-openjdk-uber = 1.3.0
+
+org.eclipse.jetty.version = 9.4.12.v20180830
 /org.eclipse.jetty.http2/http2-client = ${org.eclipse.jetty.version}
 /org.eclipse.jetty.http2/http2-common = ${org.eclipse.jetty.version}
 /org.eclipse.jetty.http2/http2-hpack = ${org.eclipse.jetty.version}
 /org.eclipse.jetty.http2/http2-http-client-transport = ${org.eclipse.jetty.version}
 /org.eclipse.jetty.http2/http2-server = ${org.eclipse.jetty.version}
+/org.eclipse.jetty/jetty-alpn-client = ${org.eclipse.jetty.version}
+/org.eclipse.jetty/jetty-alpn-conscrypt-client = ${org.eclipse.jetty.version}
+/org.eclipse.jetty/jetty-alpn-conscrypt-server = ${org.eclipse.jetty.version}
+/org.eclipse.jetty/jetty-alpn-server = ${org.eclipse.jetty.version}
 /org.eclipse.jetty/jetty-client = ${org.eclipse.jetty.version}
 /org.eclipse.jetty/jetty-continuation = ${org.eclipse.jetty.version}
 /org.eclipse.jetty/jetty-deploy = ${org.eclipse.jetty.version}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3805c111/lucene/tools/junit4/solr-tests.policy
----------------------------------------------------------------------
diff --git a/lucene/tools/junit4/solr-tests.policy b/lucene/tools/junit4/solr-tests.policy
index 1c46a78..c95b27b 100644
--- a/lucene/tools/junit4/solr-tests.policy
+++ b/lucene/tools/junit4/solr-tests.policy
@@ -76,6 +76,11 @@ grant {
   // SSL related properties for Solr tests
   permission java.security.SecurityPermission "getProperty.ssl.*";
   permission javax.net.ssl.SSLPermission "setDefaultSSLContext";
+  permission java.security.SecurityPermission "insertProvider.*";
+  permission java.security.SecurityPermission "putProviderProperty.*";
+  permission java.security.SecurityPermission "getProviderProperty.*";
+  permission java.security.SecurityPermission "getProperty.conscrypt.*";
+  permission java.security.SecurityPermission "putProperty.conscrypt.*";  
 
   // SASL/Kerberos related properties for Solr tests
   permission javax.security.auth.PrivateCredentialPermission "javax.security.auth.kerberos.KerberosTicket * \"*\"", "read";