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/05 23:45:55 UTC
lucene-solr:jira/http2: SOLR-12837: Correct version of dependencies

Repository: lucene-solr
Updated Branches:
  refs/heads/jira/http2 135de05d9 -> bb0b9a144


SOLR-12837: Correct version of dependencies


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

Branch: refs/heads/jira/http2
Commit: bb0b9a1444bfe955242467a8e2325f2378c4d538
Parents: 135de05
Author: Cao Manh Dat <da...@apache.org>
Authored: Sat Oct 6 06:45:43 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Sat Oct 6 06:45:43 2018 +0700

----------------------------------------------------------------------
 lucene/ivy-versions.properties | 4 ++++
 solr/server/ivy.xml            | 4 ++--
 solr/solrj/ivy.xml             | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bb0b9a14/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 8cce10f..78c1d58 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -248,6 +248,10 @@ org.eclipse.jetty.version = 9.4.11.v20180605
 /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/bb0b9a14/solr/server/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/server/ivy.xml b/solr/server/ivy.xml
index a1d191c..51654a7 100644
--- a/solr/server/ivy.xml
+++ b/solr/server/ivy.xml
@@ -56,8 +56,8 @@
     <dependency org="org.eclipse.jetty" name="jetty-util" rev="${/org.eclipse.jetty/jetty-util}" conf="jetty"/>
     <dependency org="org.eclipse.jetty" name="jetty-webapp" rev="${/org.eclipse.jetty/jetty-webapp}" conf="jetty"/>
     <dependency org="org.eclipse.jetty" name="jetty-xml" rev="${/org.eclipse.jetty/jetty-xml}" conf="jetty"/>
-    <dependency org="org.eclipse.jetty" name="jetty-alpn-conscrypt-server" rev="${/org.eclipse.jetty/jetty-xml}" conf="jetty"/>
-    <dependency org="org.eclipse.jetty" name="jetty-alpn-server" rev="${/org.eclipse.jetty/jetty-xml}" conf="jetty"/>
+    <dependency org="org.eclipse.jetty" name="jetty-alpn-conscrypt-server" rev="${/org.eclipse.jetty/jetty-alpn-conscrypt-server}" conf="jetty"/>
+    <dependency org="org.eclipse.jetty" name="jetty-alpn-server" rev="${/org.eclipse.jetty/jetty-alpn-server}" conf="jetty"/>
 
     <dependency org="org.eclipse.jetty.http2" name="http2-server" rev="${/org.eclipse.jetty.http2/http2-server}" conf="jetty"/>
     <dependency org="org.eclipse.jetty.http2" name="http2-common" rev="${/org.eclipse.jetty.http2/http2-common}" conf="jetty"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bb0b9a14/solr/solrj/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/ivy.xml b/solr/solrj/ivy.xml
index 671815b..5153f24 100644
--- a/solr/solrj/ivy.xml
+++ b/solr/solrj/ivy.xml
@@ -49,8 +49,8 @@
     <dependency org="org.eclipse.jetty" name="jetty-util" rev="${/org.eclipse.jetty/jetty-util}" conf="compile"/>
     <dependency org="org.eclipse.jetty" name="jetty-http" rev="${/org.eclipse.jetty/jetty-http}" conf="compile"/>
     <dependency org="org.eclipse.jetty" name="jetty-io" rev="${/org.eclipse.jetty/jetty-io}" conf="compile"/>
-    <dependency org="org.eclipse.jetty" name="jetty-alpn-conscrypt-client" rev="${/org.eclipse.jetty/jetty-io}" conf="compile"/>
-    <dependency org="org.eclipse.jetty" name="jetty-alpn-client" rev="${/org.eclipse.jetty/jetty-io}" conf="compile"/>
+    <dependency org="org.eclipse.jetty" name="jetty-alpn-conscrypt-client" rev="${/org.eclipse.jetty/jetty-alpn-conscrypt-client}" conf="compile"/>
+    <dependency org="org.eclipse.jetty" name="jetty-alpn-client" rev="${/org.eclipse.jetty/jetty-alpn-client}" conf="compile"/>
     <dependency org="org.conscrypt" name="conscrypt-openjdk-uber" rev="${/org.conscrypt/conscrypt-openjdk-uber}" conf="compile"/>
 
     <dependency org="org.apache.logging.log4j" name="log4j-slf4j-impl" rev="${/org.apache.logging.log4j/log4j-slf4j-impl}" conf="test"/>