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 11:05:11 UTC
lucene-solr:jira/http2: Fix precommit
Repository: lucene-solr
Updated Branches:
refs/heads/jira/http2 bfe0468d4 -> b9431da54
Fix precommit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b9431da5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b9431da5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b9431da5
Branch: refs/heads/jira/http2
Commit: b9431da54075c338bc013becb9422c62dade3192
Parents: bfe0468
Author: Cao Manh Dat <da...@apache.org>
Authored: Wed Oct 17 18:05:03 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Wed Oct 17 18:05:03 2018 +0700
----------------------------------------------------------------------
.../client/solrj/embedded/JettySolrRunner.java | 3 -
.../component/HttpShardHandlerFactory.java | 2 -
.../handler/component/ShardHandlerFactory.java | 7 +-
.../solr/security/PKIAuthenticationPlugin.java | 6 +-
.../apache/solr/update/UpdateShardHandler.java | 1 -
.../solr/security/BasicAuthIntegrationTest.java | 1 -
.../conscrypt-openjdk-uber-1.3.0.jar.sha1 | 1 +
.../conscrypt-openjdk-uber-LICENSE-ASL.txt | 202 +++++++++++++++++++
solr/licenses/conscrypt-openjdk-uber-NOTICE.txt | 30 +++
.../jetty-alpn-client-9.4.11.v20180605.jar.sha1 | 1 +
...n-conscrypt-client-9.4.11.v20180605.jar.sha1 | 1 +
...n-conscrypt-server-9.4.11.v20180605.jar.sha1 | 1 +
.../jetty-alpn-server-9.4.11.v20180605.jar.sha1 | 1 +
.../solr/client/solrj/impl/Http2SolrClient.java | 6 +-
.../solrj/impl/Krb5HttpClientBuilder.java | 1 -
.../client/solrj/impl/LBHttpSolrClient.java | 29 ---
.../jetty/client/SolrBasicAuthentication.java | 3 +-
.../client/solrj/TestLBHttp2SolrClient.java | 1 -
.../ConcurrentUpdateSolrClientBadInputTest.java | 2 +-
.../impl/Http2SolrClientCompatibilityTest.java | 1 -
.../solrj/impl/HttpSolrClientBadInputTest.java | 2 +-
.../impl/LBHttpSolrClientBadInputTest.java | 2 +-
22 files changed, 250 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
index 39340a9..5161406 100644
--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
@@ -30,7 +30,6 @@ import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
-import java.security.Security;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.LinkedList;
@@ -42,12 +41,10 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.servlet.SolrDispatchFilter;
-import org.conscrypt.OpenSSLProvider;
import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory;
import org.eclipse.jetty.http2.HTTP2Cipher;
import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
index 18371f4..c5207e6 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
@@ -37,7 +37,6 @@ import org.apache.solr.client.solrj.impl.Http2SolrClient;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.client.solrj.impl.LBHttp2SolrClient;
import org.apache.solr.client.solrj.impl.LBSolrClient;
-import org.apache.solr.client.solrj.impl.SolrHttpClientBuilder;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.cloud.ZkController;
import org.apache.solr.common.SolrException;
@@ -65,7 +64,6 @@ import org.slf4j.LoggerFactory;
import static org.apache.solr.util.stats.InstrumentedHttpListenerFactory.KNOWN_METRIC_NAME_STRATEGIES;
-
public class HttpShardHandlerFactory extends ShardHandlerFactory implements org.apache.solr.util.plugin.PluginInfoInitialized, SolrMetricProducer {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String DEFAULT_SCHEME = "http";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/core/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java
index 81d8261..8395769 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java
@@ -16,17 +16,16 @@
*/
package org.apache.solr.handler.component;
+import java.util.Collections;
+import java.util.Locale;
+
import com.google.common.collect.ImmutableMap;
-import org.apache.solr.client.solrj.impl.SolrHttpClientBuilder;
import org.apache.solr.common.SolrException;
import org.apache.solr.core.PluginInfo;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.solr.security.HttpClientBuilderPlugin;
import org.apache.solr.util.plugin.PluginInfoInitialized;
-import java.util.Collections;
-import java.util.Locale;
-
public abstract class ShardHandlerFactory {
public abstract ShardHandler getShardHandler();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java
index 84388b6..6f85d95 100644
--- a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java
@@ -53,13 +53,11 @@ import org.apache.solr.core.CoreContainer;
import org.apache.solr.request.SolrRequestInfo;
import org.apache.solr.util.CryptoKeys;
import org.eclipse.jetty.client.api.Request;
-import org.eclipse.jetty.client.api.Result;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static java.nio.charset.StandardCharsets.UTF_8;
-
public class PKIAuthenticationPlugin extends AuthenticationPlugin implements HttpClientBuilderPlugin {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final Map<String, PublicKey> keyCache = new ConcurrentHashMap<>();
@@ -243,6 +241,7 @@ public class PKIAuthenticationPlugin extends AuthenticationPlugin implements Htt
return builder;
}
+ @SuppressForbidden(reason = "Needs currentTimeMillis to set current time in header")
private Optional<String> generateToken() {
if (disabled()) return Optional.empty();
@@ -295,8 +294,7 @@ public class PKIAuthenticationPlugin extends AuthenticationPlugin implements Htt
generateToken().ifPresent(s -> httpRequest.setHeader(HEADER, myNodeName + " " + s));
}
}
-
- @SuppressForbidden(reason = "Needs currentTimeMillis to set current time in header")
+
void setHeader(HttpRequest httpRequest) {
generateToken().ifPresent(s -> httpRequest.setHeader(HEADER, myNodeName + " " + s));
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
index 4e9fa21..4af1ae7 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
@@ -31,7 +31,6 @@ import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.solr.client.solrj.impl.Http2SolrClient;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
-import org.apache.solr.client.solrj.impl.SolrHttpClientBuilder;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.ExecutorUtil;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
index 06215d8..fd03b31 100644
--- a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
@@ -58,7 +58,6 @@ import org.apache.solr.common.util.Base64;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.common.util.Utils;
-import org.apache.solr.util.LogLevel;
import org.apache.solr.util.SolrCLI;
import org.junit.BeforeClass;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/licenses/conscrypt-openjdk-uber-1.3.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/conscrypt-openjdk-uber-1.3.0.jar.sha1 b/solr/licenses/conscrypt-openjdk-uber-1.3.0.jar.sha1
new file mode 100644
index 0000000..f22fee4
--- /dev/null
+++ b/solr/licenses/conscrypt-openjdk-uber-1.3.0.jar.sha1
@@ -0,0 +1 @@
+2c468e995725b37434ecda3cf45b1760e31a0f7e
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/licenses/conscrypt-openjdk-uber-LICENSE-ASL.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/conscrypt-openjdk-uber-LICENSE-ASL.txt b/solr/licenses/conscrypt-openjdk-uber-LICENSE-ASL.txt
new file mode 100644
index 0000000..7a4a3ea
--- /dev/null
+++ b/solr/licenses/conscrypt-openjdk-uber-LICENSE-ASL.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/licenses/conscrypt-openjdk-uber-NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/conscrypt-openjdk-uber-NOTICE.txt b/solr/licenses/conscrypt-openjdk-uber-NOTICE.txt
new file mode 100644
index 0000000..2235cf0
--- /dev/null
+++ b/solr/licenses/conscrypt-openjdk-uber-NOTICE.txt
@@ -0,0 +1,30 @@
+Copyright 2016 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-----------------------------------------------------------------------
+This product contains a modified portion of `Netty`, a configurable network
+stack in Java, which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.netty.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * http://netty.io/
+
+This product contains a modified portion of `Apache Harmony`, modular Java runtime,
+which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.harmony.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * https://harmony.apache.org/
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/licenses/jetty-alpn-client-9.4.11.v20180605.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jetty-alpn-client-9.4.11.v20180605.jar.sha1 b/solr/licenses/jetty-alpn-client-9.4.11.v20180605.jar.sha1
new file mode 100644
index 0000000..adf3f73
--- /dev/null
+++ b/solr/licenses/jetty-alpn-client-9.4.11.v20180605.jar.sha1
@@ -0,0 +1 @@
+f2b629044cd968bbe15f63778e4aaf095ac2fb5c
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/licenses/jetty-alpn-conscrypt-client-9.4.11.v20180605.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jetty-alpn-conscrypt-client-9.4.11.v20180605.jar.sha1 b/solr/licenses/jetty-alpn-conscrypt-client-9.4.11.v20180605.jar.sha1
new file mode 100644
index 0000000..a3d1e66
--- /dev/null
+++ b/solr/licenses/jetty-alpn-conscrypt-client-9.4.11.v20180605.jar.sha1
@@ -0,0 +1 @@
+1bcf9ac353851f86070338dfffac3c0c2a9ed524
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/licenses/jetty-alpn-conscrypt-server-9.4.11.v20180605.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jetty-alpn-conscrypt-server-9.4.11.v20180605.jar.sha1 b/solr/licenses/jetty-alpn-conscrypt-server-9.4.11.v20180605.jar.sha1
new file mode 100644
index 0000000..2f7b6df
--- /dev/null
+++ b/solr/licenses/jetty-alpn-conscrypt-server-9.4.11.v20180605.jar.sha1
@@ -0,0 +1 @@
+b847f09976120ed9ef6e237c9b88b6b66eb1d477
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/licenses/jetty-alpn-server-9.4.11.v20180605.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jetty-alpn-server-9.4.11.v20180605.jar.sha1 b/solr/licenses/jetty-alpn-server-9.4.11.v20180605.jar.sha1
new file mode 100644
index 0000000..1c09347
--- /dev/null
+++ b/solr/licenses/jetty-alpn-server-9.4.11.v20180605.jar.sha1
@@ -0,0 +1 @@
+ec3b6afab2c074141f0faa71446bc41c6146f44b
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index e3fd2c0..458939a 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -93,7 +93,7 @@ import static org.apache.solr.common.util.Utils.getObjectByPath;
public class Http2SolrClient extends SolrClient {
private static volatile SSLConfig defaultSSLConfig;
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String AGENT = "Solr[" + Http2SolrClient.class.getName() + "] 2.0";
private static final String UTF_8 = StandardCharsets.UTF_8.name();
private static final String DEFAULT_PATH = "/select";
@@ -172,11 +172,11 @@ public class Http2SolrClient extends SolrClient {
HttpClientTransport transport;
if (builder.useHttp1_1) {
- LOG.debug("Create Http2SolrClient with HTTP/1.1 transport");
+ log.debug("Create Http2SolrClient with HTTP/1.1 transport");
transport = new HttpClientTransportOverHTTP(2);
httpClient = new HttpClient(transport, sslContextFactory);
} else {
- LOG.debug("Create Http2SolrClient with HTTP/2 transport");
+ log.debug("Create Http2SolrClient with HTTP/2 transport");
HTTP2Client http2client = new HTTP2Client();
transport = new HttpClientTransportOverHTTP2(http2client);
httpClient = new HttpClient(transport, sslContextFactory);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientBuilder.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientBuilder.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientBuilder.java
index fd1a7fb..e4adceb 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientBuilder.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientBuilder.java
@@ -44,7 +44,6 @@ import org.apache.http.entity.BufferedHttpEntity;
import org.apache.http.impl.auth.SPNegoSchemeFactory;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.eclipse.jetty.client.HttpAuthenticationStore;
-import org.eclipse.jetty.client.SolrProxyAuthenticationProtocolHandler;
import org.eclipse.jetty.client.SolrWWWAuthenticationProtocolHandler;
import org.eclipse.jetty.client.api.Authentication;
import org.eclipse.jetty.client.api.ContentResponse;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java
index 94fa940..e18d761 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java
@@ -17,45 +17,16 @@
package org.apache.solr.client.solrj.impl;
import java.io.IOException;
-import java.lang.ref.WeakReference;
-import java.net.ConnectException;
-import java.net.MalformedURLException;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-import java.net.URL;
import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
import org.apache.http.client.HttpClient;
import org.apache.solr.client.solrj.ResponseParser;
import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.HttpSolrClient.RemoteExecutionException;
-import org.apache.solr.client.solrj.request.IsUpdateRequest;
-import org.apache.solr.client.solrj.request.RequestWriter;
-import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.common.SolrException;
-import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.util.SolrjNamedThreadFactory;
-import org.slf4j.MDC;
-
-import static org.apache.solr.common.params.CommonParams.ADMIN_PATHS;
/**
* LBHttpSolrClient or "LoadBalanced HttpSolrClient" is a load balancing wrapper around
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/solrj/src/java/org/eclipse/jetty/client/SolrBasicAuthentication.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/eclipse/jetty/client/SolrBasicAuthentication.java b/solr/solrj/src/java/org/eclipse/jetty/client/SolrBasicAuthentication.java
index 6112774..f154ea3 100644
--- a/solr/solrj/src/java/org/eclipse/jetty/client/SolrBasicAuthentication.java
+++ b/solr/solrj/src/java/org/eclipse/jetty/client/SolrBasicAuthentication.java
@@ -19,6 +19,7 @@ package org.eclipse.jetty.client;
import java.net.URI;
import java.nio.charset.StandardCharsets;
+import java.util.Locale;
import org.eclipse.jetty.client.api.Authentication;
import org.eclipse.jetty.client.api.ContentResponse;
@@ -48,7 +49,7 @@ public class SolrBasicAuthentication implements Authentication {
@Override
public URI getURI() {
// cache result by host and port
- return URI.create(String.format("%s://%s:%d", request.getScheme(), request.getHost(), request.getPort()));
+ return URI.create(String.format(Locale.ROOT, "%s://%s:%d", request.getScheme(), request.getHost(), request.getPort()));
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java
index 5cd7989..2d80c4a 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java
@@ -38,7 +38,6 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.embedded.JettyConfig;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.Http2SolrClient;
-import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.impl.LBHttp2SolrClient;
import org.apache.solr.client.solrj.response.QueryResponse;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java
index f28d9c0..ac755eb 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java
@@ -41,7 +41,7 @@ public class ConcurrentUpdateSolrClientBadInputTest extends SolrJettyTestBase {
@BeforeClass
public static void beforeTest() throws Exception {
JettyConfig jettyConfig = JettyConfig.builder()
- .withSSLConfig(sslConfig)
+ .withSSLConfig(sslConfig.buildServerSSLConfig())
.build();
createJetty(legacyExampleCollection1SolrHome(), jettyConfig);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java
index 0d0d985..b21a73e 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java
@@ -19,7 +19,6 @@ package org.apache.solr.client.solrj.impl;
import org.apache.http.ParseException;
import org.apache.solr.SolrJettyTestBase;
-import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBadInputTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBadInputTest.java
index cf97829..e2dd6af 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBadInputTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBadInputTest.java
@@ -40,7 +40,7 @@ public class HttpSolrClientBadInputTest extends SolrJettyTestBase {
@BeforeClass
public static void beforeTest() throws Exception {
JettyConfig jettyConfig = JettyConfig.builder()
- .withSSLConfig(sslConfig)
+ .withSSLConfig(sslConfig.buildServerSSLConfig())
.build();
createJetty(legacyExampleCollection1SolrHome(), jettyConfig);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9431da5/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBadInputTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBadInputTest.java
index 6c0ad81..76ec934 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBadInputTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBadInputTest.java
@@ -39,7 +39,7 @@ public class LBHttpSolrClientBadInputTest extends SolrJettyTestBase {
@BeforeClass
public static void beforeTest() throws Exception {
JettyConfig jettyConfig = JettyConfig.builder()
- .withSSLConfig(sslConfig)
+ .withSSLConfig(sslConfig.buildServerSSLConfig())
.build();
createJetty(legacyExampleCollection1SolrHome(), jettyConfig);
}