[
https://issues.apache.org/jira/browse/CAMEL-11879?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16510755#comment-16510755
]
ASF GitHub Bot commented on CAMEL-11879:
----------------------------------------
oscerd closed pull request #1996: CAMEL-11879: Upgraded lucene version to 7.0.0
URL: https://github.com/apache/camel/pull/1996
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java
index 74cea7f8824..9d098851385 100644
---
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java
+++
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java
@@ -19,5 +19,5 @@
import org.apache.lucene.util.Version;
public interface LuceneConstants {
- Version LUCENE_VERSION = Version.LUCENE_5_4_1;
+ Version LUCENE_VERSION = Version.LUCENE_7_0_0;
}
diff --git
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
index 7b039c2b603..57cbeb2b79b 100644
---
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
+++
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
@@ -108,7 +108,7 @@ public SolrComponent getComponent() {
private CloudSolrClient getCloudServer() {
CloudSolrClient rVal = null;
if (this.getZkHost() != null && this.getCollection() != null) {
- rVal = new CloudSolrClient(zkHost);
+ rVal = new CloudSolrClient.Builder().withZkHost(zkHost).build();
rVal.setDefaultCollection(this.getCollection());
}
return rVal;
@@ -123,31 +123,19 @@ public Producer createProducer() throws Exception {
ref = new SolrComponent.SolrServerReference();
CloudSolrClient cloudServer = getCloudServer();
if (cloudServer == null) {
- HttpSolrClient solrServer = new HttpSolrClient(url);
- ConcurrentUpdateSolrClient solrStreamingServer = new
ConcurrentUpdateSolrClient(url, streamingQueueSize, streamingThreadCount);
-
- // set the properties on the solr server
- if (maxRetries != null) {
- solrServer.setMaxRetries(maxRetries);
- }
+ HttpSolrClient solrServer = new
HttpSolrClient.Builder(url).build();
+ ConcurrentUpdateSolrClient solrStreamingServer = new
ConcurrentUpdateSolrClient.Builder(url).withQueueSize(streamingQueueSize).withThreadCount(streamingThreadCount).build();
+
+ // set the properties on the solr server
if (soTimeout != null) {
solrServer.setSoTimeout(soTimeout);
}
if (connectionTimeout != null) {
solrServer.setConnectionTimeout(connectionTimeout);
- }
- if (defaultMaxConnectionsPerHost != null) {
-
solrServer.setDefaultMaxConnectionsPerHost(defaultMaxConnectionsPerHost);
- }
- if (maxTotalConnections != null) {
- solrServer.setMaxTotalConnections(maxTotalConnections);
- }
+ }
if (followRedirects != null) {
solrServer.setFollowRedirects(followRedirects);
- }
- if (allowCompression != null) {
- solrServer.setAllowCompression(allowCompression);
- }
+ }
ref.setSolrServer(solrServer);
ref.setUpdateSolrServer(solrStreamingServer);
}
diff --git
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/JettySolrFactory.java
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/JettySolrFactory.java
index aa9a95082f8..fba1662bebd 100644
---
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/JettySolrFactory.java
+++
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/JettySolrFactory.java
@@ -29,6 +29,7 @@
import org.apache.http.conn.ssl.SSLContextBuilder;
import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
+import org.apache.solr.client.solrj.embedded.JettyConfig;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.embedded.SSLConfig;
import org.eclipse.jetty.servlet.ServletHolder;
@@ -106,8 +107,8 @@ private static JettySolrRunner createJetty(String solrHome,
String configFile, S
SSLConfig sslConfig = buildSSLConfig(ssl, false);
context = context == null ? "/solr" : context;
- JettySolrRunner jetty = new JettySolrRunner(solrHome, context, 0,
configFile, schemaFile,
- stopAtShutdown,
extraServlets, sslConfig);
+ JettyConfig jettyConfig = new
JettyConfig.Builder().setContext(context).setPort(0).stopAtShutdown(false).withServlets(extraServlets).withSSLConfig(sslConfig).build();
+ JettySolrRunner jetty = new JettySolrRunner(solrHome, jettyConfig);
jetty.start();
diff --git
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCloudFixture.java
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCloudFixture.java
index dbe379e86d8..53cb46c77e2 100644
---
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCloudFixture.java
+++
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCloudFixture.java
@@ -79,8 +79,8 @@ public SolrCloudFixture(String solrHome) throws Exception {
log.info("JETTY RUNNING AT " + jetty.getBaseUrl() + " PORT " +
jetty.getLocalPort());
}
}
-
- solrClient = new CloudSolrClient(zkAddr, true);
+
+ solrClient = new CloudSolrClient.Builder().withZkHost(zkAddr).build();
solrClient.connect();
createCollection(solrClient, "collection1", 1, 1, "conf1");
diff --git
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrFixtures.java
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrFixtures.java
index 716a056ab27..075907e26e3 100644
---
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrFixtures.java
+++
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrFixtures.java
@@ -23,7 +23,7 @@
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
-import org.apache.solr.client.solrj.impl.HttpSolrServer;
+
public class SolrFixtures {
@@ -59,11 +59,12 @@ String solrRouteUri() {
return "solr://localhost:" + port + "/solr";
}
}
+
SolrClient getServer() {
if (serverType == TestServerType.USE_HTTPS) {
return solrHttpsServer;
- } else if (serverType == TestServerType.USE_CLOUD) {
+ } else if (serverType == TestServerType.USE_CLOUD) {
return cloudFixture.solrClient;
} else {
return solrServer;
@@ -73,14 +74,14 @@ SolrClient getServer() {
static void createSolrFixtures() throws Exception {
solrHttpsRunner = JettySolrFactory.createJettyTestFixture(true);
httpsPort = solrHttpsRunner.getLocalPort();
- log.info("Started Https Test Server: " + solrHttpsRunner.getBaseUrl());
- solrHttpsServer = new HttpSolrServer("https://localhost:"; + httpsPort
+ "/solr");
+ log.info("Started Https Test Server: " +
solrHttpsRunner.getBaseUrl());
+ solrHttpsServer = new HttpSolrClient.Builder("https://localhost: +
httpsPort + /solr").build();
solrHttpsServer.setConnectionTimeout(60000);
solrRunner = JettySolrFactory.createJettyTestFixture(false);
port = solrRunner.getLocalPort();
-
- solrServer = new HttpSolrServer("http://localhost:"; + port + "/solr");
+
+ solrServer = new HttpSolrClient.Builder("http://localhost: + port +
/solr").build();
log.info("Started Test Server: " + solrRunner.getBaseUrl());
cloudFixture = new SolrCloudFixture("src/test/resources/solr");
@@ -109,7 +110,7 @@ public static void clearIndex() throws SolrServerException,
IOException {
solrHttpsServer.commit();
}
if (cloudFixture != null) {
- cloudFixture.solrClient.deleteByQuery("*:*");
+ cloudFixture.solrClient.deleteByQuery("*:*");
cloudFixture.solrClient.commit();
}
}
diff --git
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
index 71baf6ccf53..fcb5269709f 100644
---
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
+++
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
@@ -22,7 +22,7 @@
import java.util.List;
import org.apache.camel.Exchange;
-import org.apache.solr.client.solrj.impl.HttpSolrServer;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.util.ClientUtils;
import org.apache.solr.common.SolrDocument;
@@ -51,7 +51,7 @@ public void setUp() throws Exception {
public void testInsertSolrInputDocumentAsXMLWithoutAddRoot() throws
Exception {
SolrInputDocument doc = new SolrInputDocument();
- doc.addField("id", "MA147LL/A", 1.0f);
+ doc.addField("id", "MA147LL/A");
String docAsXml = ClientUtils.toXML(doc);
template.sendBodyAndHeader("direct:start", docAsXml,
SolrConstants.OPERATION, SolrConstants.OPERATION_INSERT);
solrCommit();
@@ -65,7 +65,7 @@ public void testInsertSolrInputDocumentAsXMLWithoutAddRoot()
throws Exception {
public void testInsertSolrInputDocumentAsXMLWithAddRoot() throws Exception
{
SolrInputDocument doc = new SolrInputDocument();
- doc.addField("id", "MA147LL/A", 1.0f);
+ doc.addField("id", "MA147LL/A");
String docAsXml = "<add>" + ClientUtils.toXML(doc) + "</add>";
template.sendBodyAndHeader("direct:start", docAsXml,
SolrConstants.OPERATION, SolrConstants.OPERATION_INSERT);
solrCommit();
@@ -79,7 +79,7 @@ public void testInsertSolrInputDocumentAsXMLWithAddRoot()
throws Exception {
public void testInsertSolrInputDocument() throws Exception {
SolrInputDocument doc = new SolrInputDocument();
- doc.addField("id", "MA147LL/A", 1.0f);
+ doc.addField("id", "MA147LL/A");
template.sendBodyAndHeader("direct:start", doc,
SolrConstants.OPERATION, SolrConstants.OPERATION_INSERT);
solrCommit();
@@ -94,11 +94,11 @@ public void testInsertSolrInputDocumentList() throws
Exception {
List<SolrInputDocument> docList = new ArrayList<SolrInputDocument>(2);
SolrInputDocument doc = new SolrInputDocument();
- doc.addField("id", "MA147LL/A", 1.0f);
+ doc.addField("id", "MA147LL/A");
docList.add(doc);
doc = new SolrInputDocument();
- doc.addField("id", "KP147LL/A", 1.0f);
+ doc.addField("id", "KP147LL/A");
docList.add(doc);
template.sendBodyAndHeader("direct:start", docList,
SolrConstants.OPERATION, SolrConstants.OPERATION_INSERT);
@@ -160,7 +160,7 @@ public void caughtSolrExceptionIsHandledElegantly() throws
Exception {
template.send("direct:start", exchange);
//noinspection ThrowableResultOfMethodCallIgnored
- assertEquals(HttpSolrServer.RemoteSolrException.class,
exchange.getException().getClass());
+ assertEquals(HttpSolrClient.RemoteSolrException.class,
exchange.getException().getClass());
}
@Test
diff --git a/parent/pom.xml b/parent/pom.xml
index 5b57f0cfeb4..145cc9a4658 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -455,10 +455,10 @@
<logback-version>1.2.0</logback-version>
<lucene3-bundle-version>3.6.0_1</lucene3-bundle-version>
<lucene3-version>3.6.0</lucene3-version>
- <lucene-bundle-version>5.5.2_1</lucene-bundle-version>
+ <lucene-bundle-version>6.6.0_2</lucene-bundle-version>
<!-- lucene aligned with elasticsearch version of lucene in use -->
- <lucene-version>5.5.2</lucene-version>
- <lucene-version-range>[5,6)</lucene-version-range>
+ <lucene-version>7.0.0</lucene-version>
+ <lucene-version-range>[5,7)</lucene-version-range>
<lightcouch-version>0.1.8</lightcouch-version>
<lightcouch-gson-version>2.4</lightcouch-gson-version>
<lightcouch-bundle-version>0.1.8_2</lightcouch-bundle-version>
@@ -620,8 +620,8 @@
<snmp4j-version>2.3.4_1</snmp4j-version>
<solr-bundle-version>5.5.2_1</solr-bundle-version>
<!-- solr version aligned with lucene -->
- <solr-version>5.5.2</solr-version>
- <solr-version-range>[5,6)</solr-version-range>
+ <solr-version>7.0.0</solr-version>
+ <solr-version-range>[5,7)</solr-version-range>
<spark-version>1.6.1</spark-version>
<spark-rest-version>2.6.0</spark-rest-version>
<spark-rest-bundle-version>2.6.0_1</spark-rest-bundle-version>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Upgrade to lucene 7
> -------------------
>
> Key: CAMEL-11879
> URL: https://issues.apache.org/jira/browse/CAMEL-11879
> Project: Camel
> Issue Type: Improvement
> Components: camel-lucene
> Reporter: Claus Ibsen
> Assignee: Viral Gohel
> Priority: Major
> Fix For: 2.22.0
>
>
> We should upgrade lucene and solr to newer versions.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
