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/26 01:22:42 UTC
lucene-solr:jira/http2: Fix booting failure
Repository: lucene-solr
Updated Branches:
refs/heads/jira/http2 20f73e910 -> e9a12a878
Fix booting failure
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e9a12a87
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e9a12a87
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e9a12a87
Branch: refs/heads/jira/http2
Commit: e9a12a878aeb3cf0e51a34b94fd04ea633903c25
Parents: 20f73e9
Author: Cao Manh Dat <da...@apache.org>
Authored: Fri Oct 26 08:22:33 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Fri Oct 26 08:22:33 2018 +0700
----------------------------------------------------------------------
solr/server/build.xml | 2 +-
solr/server/ivy.xml | 5 +++--
solr/webapp/build.xml | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e9a12a87/solr/server/build.xml
----------------------------------------------------------------------
diff --git a/solr/server/build.xml b/solr/server/build.xml
index d3d7af6..4b80c1c 100644
--- a/solr/server/build.xml
+++ b/solr/server/build.xml
@@ -42,7 +42,7 @@
<!-- 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}"/>
- <ivy:retrieve conf="logging" type="jar,bundle" log="download-only" symlink="${ivy.symlink}"
+ <ivy:retrieve conf="logging,shared_lib" 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
it's one jar with a constant name and we don't need it -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e9a12a87/solr/server/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/server/ivy.xml b/solr/server/ivy.xml
index 51654a7..39e8544 100644
--- a/solr/server/ivy.xml
+++ b/solr/server/ivy.xml
@@ -18,12 +18,13 @@
-->
<ivy-module version="2.0" xmlns:maven="http://ant.apache.org/ivy/maven">
<info organisation="org.apache.solr" module="server"/>
- <configurations defaultconfmapping="metrics->master;jetty->master;start->master;servlet->master;logging->master">
+ <configurations defaultconfmapping="metrics->master;jetty->master;start->master;servlet->master;logging->master;shared_lib->master">
<conf name="metrics" description="metrics jars" transitive="true"/>
<conf name="jetty" description="jetty 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"/>
+ <conf name="shared_lib" description="shared library with solrj" transitive="false"/>
</configurations>
<dependencies>
@@ -62,7 +63,7 @@
<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"/>
<dependency org="org.eclipse.jetty.http2" name="http2-hpack" rev="${/org.eclipse.jetty.http2/http2-hpack}" conf="jetty"/>
- <dependency org="org.conscrypt" name="conscrypt-openjdk-uber" rev="${/org.conscrypt/conscrypt-openjdk-uber}" conf="jetty"/>
+ <dependency org="org.conscrypt" name="conscrypt-openjdk-uber" rev="${/org.conscrypt/conscrypt-openjdk-uber}" conf="shared_lib"/>
<dependency org="javax.servlet" name="javax.servlet-api" rev="${/javax.servlet/javax.servlet-api}" conf="jetty"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e9a12a87/solr/webapp/build.xml
----------------------------------------------------------------------
diff --git a/solr/webapp/build.xml b/solr/webapp/build.xml
index 726eac0..3f4c1a7 100644
--- a/solr/webapp/build.xml
+++ b/solr/webapp/build.xml
@@ -24,7 +24,7 @@
<import file="../common-build.xml"/>
<property name="exclude.from.webapp" value="*slf4j*,log4j-*,*javax.servlet*" />
- <property name="exclude.from.sorlj" value="conscrypt-openjdk*,http2-common*,http2-hpack*,jetty-util*,jetty-http*,jetty-io*" />
+ <property name="exclude.from.sorlj" value="conscrypt-openjdk*" />
<!-- this module has no javadocs -->
<target name="javadocs"/>