You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/10/03 09:36:56 UTC
[1/2] lucene-solr:branch_6x: SOLR-9588: more guava dependency
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x ae7b685e4 -> 6e0637bb4
SOLR-9588: more guava dependency
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0aca0531
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0aca0531
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0aca0531
Branch: refs/heads/branch_6x
Commit: 0aca05311042045d34970da1fde2b2156bcd858d
Parents: c067df4
Author: Noble Paul <no...@apache.org>
Authored: Mon Oct 3 15:06:35 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Mon Oct 3 15:06:35 2016 +0530
----------------------------------------------------------------------
.../org/apache/solr/client/solrj/impl/HttpClientUtil.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0aca0531/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
index 96f4d82..b8a6cd8 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.zip.GZIPInputStream;
import java.util.zip.InflaterInputStream;
-import com.google.common.collect.Lists;
import org.apache.http.Header;
import org.apache.http.HeaderElement;
import org.apache.http.HttpEntity;
@@ -50,7 +49,7 @@ import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
import org.apache.http.impl.client.SystemDefaultHttpClient;
import org.apache.http.impl.conn.PoolingClientConnectionManager;
-import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; // jdoc
+import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.protocol.HttpContext;
import org.apache.solr.common.SolrException;
@@ -60,6 +59,8 @@ import org.apache.solr.common.params.SolrParams;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static java.util.Collections.singletonList;
+
/**
* Utility class for creating/configuring httpclient instances.
*/
@@ -95,7 +96,7 @@ public class HttpClientUtil {
0, false);
private static final List<HttpClientConfigurer> configurers
- = Collections.synchronizedList(Lists.newArrayList(new HttpClientConfigurer()));
+ = Collections.synchronizedList(new ArrayList<>(singletonList(new HttpClientConfigurer())));
private static final List<HttpRequestInterceptor> interceptors = Collections.synchronizedList(new ArrayList<>());
[2/2] lucene-solr:branch_6x: Merge remote-tracking branch
'origin/branch_6x' into branch_6x
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/branch_6x' into branch_6x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6e0637bb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6e0637bb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6e0637bb
Branch: refs/heads/branch_6x
Commit: 6e0637bb4f65e341a9181054307e7a43d6fda595
Parents: 0aca053 ae7b685
Author: Noble Paul <no...@apache.org>
Authored: Mon Oct 3 15:06:49 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Mon Oct 3 15:06:49 2016 +0530
----------------------------------------------------------------------
.../org/apache/solr/handler/component/SpellCheckComponent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------