You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/07/22 01:51:29 UTC
[lucene-solr] branch reference_impl updated: @282 Move to lib/ext
to use our own Jetty classes.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/reference_impl by this push:
new 9cd40d9 @282 Move to lib/ext to use our own Jetty classes.
9cd40d9 is described below
commit 9cd40d94b9ac4a15716c029124ecee13ff73b52e
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Jul 21 20:51:15 2020 -0500
@282 Move to lib/ext to use our own Jetty classes.
---
.../src/java/org/apache/solr/common/util/SolrQueuedThreadPool.java | 2 --
solr/webapp/build.xml | 3 +--
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/SolrQueuedThreadPool.java b/solr/solrj/src/java/org/apache/solr/common/util/SolrQueuedThreadPool.java
index 1befa07..c26162c 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/SolrQueuedThreadPool.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/SolrQueuedThreadPool.java
@@ -30,8 +30,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.solr.common.ParWork;
-import org.apache.solr.common.util.ObjectReleaseTracker;
-import org.apache.solr.common.util.SolrNamedThreadFactory;
import org.eclipse.jetty.util.AtomicBiInteger;
import org.eclipse.jetty.util.BlockingArrayQueue;
import org.eclipse.jetty.util.StringUtil;
diff --git a/solr/webapp/build.xml b/solr/webapp/build.xml
index f22c3f3..e2ffeb6 100644
--- a/solr/webapp/build.xml
+++ b/solr/webapp/build.xml
@@ -46,8 +46,7 @@
<fileset dir="web" excludes="${exclude.from.webapp}, libs/angular-cookies.js, libs/angular-route.js, libs/angular-sanitize.js, libs/angular-utf8-base.js, libs/angular.js, libs/chosen.jquery.js"/>
<fileset dir="${dest}/web" excludes="${exclude.from.war}"/> <!-- contribs' additions -->
</copy>
- <mkdir dir="${server.dir}/solr-webapp/webapp/WEB-INF/lib"/>
- <copy todir="${server.dir}/solr-webapp/webapp/WEB-INF/lib">
+ <copy todir="${server.dir}/solr-webapp/lib/ext">
<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="${lucene-libs}" excludes="${exclude.from.webapp},${common.classpath.excludes}" />