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/17 03:05:39 UTC
lucene-solr:jira/http2: Remove duplication jars in solr/server
Repository: lucene-solr
Updated Branches:
refs/heads/jira/http2 9a36e87f8 -> bfe0468d4
Remove duplication jars in solr/server
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bfe0468d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bfe0468d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bfe0468d
Branch: refs/heads/jira/http2
Commit: bfe0468d4103d6402815edb9646310ff97d3bd6b
Parents: 9a36e87
Author: Cao Manh Dat <da...@apache.org>
Authored: Wed Oct 17 10:05:32 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Wed Oct 17 10:05:32 2018 +0700
----------------------------------------------------------------------
solr/webapp/build.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bfe0468d/solr/webapp/build.xml
----------------------------------------------------------------------
diff --git a/solr/webapp/build.xml b/solr/webapp/build.xml
index 99f8d17..726eac0 100644
--- a/solr/webapp/build.xml
+++ b/solr/webapp/build.xml
@@ -24,6 +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*" />
<!-- this module has no javadocs -->
<target name="javadocs"/>
@@ -49,7 +50,7 @@
<mkdir dir="${server.dir}/solr-webapp/webapp/WEB-INF/lib"/>
<copy todir="${server.dir}/solr-webapp/webapp/WEB-INF/lib">
<fileset dir="${common-solr.dir}/core/lib" excludes="${exclude.from.webapp},${common.classpath.excludes}"/>
- <fileset dir="${common-solr.dir}/solrj/lib" excludes="${exclude.from.webapp},${common.classpath.excludes}"/>
+ <fileset dir="${common-solr.dir}/solrj/lib" excludes="${exclude.from.webapp},${exclude.from.sorlj},${common.classpath.excludes}"/>
<fileset dir="${lucene-libs}" excludes="${exclude.from.webapp},${common.classpath.excludes}" />
<fileset dir="${dist}" excludes="${exclude.from.webapp},${common.classpath.excludes}">
<include name="solr-solrj-${version}.jar" />