Created
February 24, 2018 01:00
-
-
Save elyograg/638b153ad95f58ff03f8cb33d79dc392 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties | |
index 1516ced..352402f 100644 | |
--- a/lucene/ivy-versions.properties | |
+++ b/lucene/ivy-versions.properties | |
@@ -244,6 +244,7 @@ org.codehaus.janino.version = 2.7.6 | |
/org.codehaus.woodstox/woodstox-core-asl = 4.4.1 | |
org.eclipse.jetty.version = 9.4.8.v20171121 | |
+/org.eclipse.jetty/jetty-alpn-server = ${org.eclipse.jetty.version} | |
/org.eclipse.jetty/jetty-continuation = ${org.eclipse.jetty.version} | |
/org.eclipse.jetty/jetty-deploy = ${org.eclipse.jetty.version} | |
/org.eclipse.jetty/jetty-http = ${org.eclipse.jetty.version} | |
@@ -258,6 +259,9 @@ org.eclipse.jetty.version = 9.4.8.v20171121 | |
/org.eclipse.jetty/jetty-util = ${org.eclipse.jetty.version} | |
/org.eclipse.jetty/jetty-webapp = ${org.eclipse.jetty.version} | |
/org.eclipse.jetty/jetty-xml = ${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-server = ${org.eclipse.jetty.version} | |
org.gagravarr.vorbis.java.version = 0.8 | |
/org.gagravarr/vorbis-java-core = ${org.gagravarr.vorbis.java.version} | |
diff --git a/solr/server/build.xml b/solr/server/build.xml | |
index d3d7af6..16f5d98 100644 | |
--- a/solr/server/build.xml | |
+++ b/solr/server/build.xml | |
@@ -42,6 +42,10 @@ | |
<!-- jetty libs in lib/ --> | |
<ivy:retrieve conf="jetty,servlet,metrics" type="jar,bundle" log="download-only" symlink="${ivy.symlink}" | |
pattern="lib/[artifact]-[revision].[ext]" sync="${ivy.sync}"/> | |
+ <!-- jetty http2 libs in lib/http2/ --> | |
+ <ivy:retrieve conf="jettyhttp2" type="jar,bundle" log="download-only" symlink="${ivy.symlink}" | |
+ pattern="lib/http2/[artifact]-[revision].[ext]" sync="${ivy.sync}"/> | |
+ <!-- logging jars in lib/ext/ --> | |
<ivy:retrieve conf="logging" type="jar,bundle" log="download-only" symlink="${ivy.symlink}" | |
pattern="lib/ext/[artifact]-[revision].[ext]" sync="${ivy.sync}"/> | |
<!-- start.jar - we don't use sync=true here, we don't own the dir, but | |
diff --git a/solr/server/ivy.xml b/solr/server/ivy.xml | |
index c9b3a73..c907ab8 100644 | |
--- a/solr/server/ivy.xml | |
+++ b/solr/server/ivy.xml | |
@@ -21,6 +21,7 @@ | |
<configurations defaultconfmapping="metrics->master;jetty->master;start->master;servlet->master;logging->master"> | |
<conf name="metrics" description="metrics jars" transitive="true"/> | |
<conf name="jetty" description="jetty jars" transitive="false"/> | |
+ <conf name="jettyhttp2" description="jetty http2 jars" transitive="false"/> | |
<conf name="start" description="jetty start jar" transitive="false"/> | |
<conf name="servlet" description="servlet-api jar" transitive="false"/> | |
<conf name="logging" description="logging setup" transitive="false"/> | |
@@ -40,6 +41,7 @@ | |
<dependency org="info.ganglia.gmetric4j" name="gmetric4j" rev="${/info.ganglia.gmetric4j/gmetric4j}" conf="metrics" /> | |
<dependency org="io.dropwizard.metrics" name="metrics-graphite" rev="${/io.dropwizard.metrics/metrics-graphite}" conf="metrics" /> | |
+ <dependency org="org.eclipse.jetty" name="jetty-alpn-server" rev="${/org.eclipse.jetty/jetty-alpn-server}" conf="jetty"/> | |
<dependency org="org.eclipse.jetty" name="jetty-continuation" rev="${/org.eclipse.jetty/jetty-continuation}" conf="jetty"/> | |
<dependency org="org.eclipse.jetty" name="jetty-deploy" rev="${/org.eclipse.jetty/jetty-deploy}" conf="jetty"/> | |
<dependency org="org.eclipse.jetty" name="jetty-http" rev="${/org.eclipse.jetty/jetty-http}" conf="jetty"/> | |
@@ -53,6 +55,9 @@ | |
<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.http2" name="http2-common" rev="${/org.eclipse.jetty.http2/http2-common}" conf="jettyhttp2"/> | |
+ <dependency org="org.eclipse.jetty.http2" name="http2-hpack" rev="${/org.eclipse.jetty.http2/http2-hpack}" conf="jettyhttp2"/> | |
+ <dependency org="org.eclipse.jetty.http2" name="http2-server" rev="${/org.eclipse.jetty.http2/http2-server}" conf="jettyhttp2"/> | |
<dependency org="javax.servlet" name="javax.servlet-api" rev="${/javax.servlet/javax.servlet-api}" conf="jetty"/> | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ivy:retrieve] :::::::::::::::::::::::::::::::::::::::::::::: | |
[ivy:retrieve] :: UNRESOLVED DEPENDENCIES :: | |
[ivy:retrieve] :::::::::::::::::::::::::::::::::::::::::::::: | |
[ivy:retrieve] :: org.eclipse.jetty.http2#http2-common;9.4.8.v20171121: | |
configuration not found in org.eclipse.jetty.http2#http2-common;9.4.8.v20171121 | |
: 'jettyhttp2'. It was required from org.apache.solr#server;working@purgatory je | |
ttyhttp2 | |
[ivy:retrieve] :: org.eclipse.jetty.http2#http2-hpack;9.4.8.v20171121: | |
configuration not found in org.eclipse.jetty.http2#http2-hpack;9.4.8.v20171121: | |
'jettyhttp2'. It was required from org.apache.solr#server;working@purgatory jett | |
yhttp2 | |
[ivy:retrieve] :: org.eclipse.jetty.http2#http2-server;9.4.8.v20171121: | |
configuration not found in org.eclipse.jetty.http2#http2-server;9.4.8.v20171121 | |
: 'jettyhttp2'. It was required from org.apache.solr#server;working@purgatory je | |
ttyhttp2 | |
[ivy:retrieve] :::::::::::::::::::::::::::::::::::::::::::::: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment