You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/06/13 08:07:56 UTC
[camel] branch master updated (7aadad9 -> f76d8bc)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 7aadad9 CAMEL-12573 - Fixed CS
new ebd8cad CAMEL-11879: Upgraded Lucene and Solr versions to 7.0.0
new f76d8bc CAMEL-12576 - Bump to Lucene and Solr 7.2.1
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/component/lucene/LuceneConstants.java | 2 +-
.../apache/camel/component/solr/SolrEndpoint.java | 26 ++++++----------------
.../camel/component/solr/JettySolrFactory.java | 5 +++--
.../camel/component/solr/SolrCloudFixture.java | 4 ++--
.../apache/camel/component/solr/SolrFixtures.java | 15 +++++++------
.../camel/component/solr/SolrUpdateTest.java | 14 ++++++------
parent/pom.xml | 12 +++++-----
7 files changed, 34 insertions(+), 44 deletions(-)
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 02/02: CAMEL-12576 - Bump to Lucene and Solr 7.2.1
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f76d8bcbff81c7180003a68f32fa3dd880ec8f9b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jun 13 09:26:58 2018 +0200
CAMEL-12576 - Bump to Lucene and Solr 7.2.1
---
.../org/apache/camel/component/lucene/LuceneConstants.java | 2 +-
parent/pom.xml | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
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 9d09885..d8ddbd0 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 @@ package org.apache.camel.component.lucene;
import org.apache.lucene.util.Version;
public interface LuceneConstants {
- Version LUCENE_VERSION = Version.LUCENE_7_0_0;
+ Version LUCENE_VERSION = Version.LUCENE_7_2_1;
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 87ffb8b..672c538 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -459,10 +459,10 @@
<log4j2-version>2.11.0</log4j2-version>
<lucene3-bundle-version>3.6.0_1</lucene3-bundle-version>
<lucene3-version>3.6.0</lucene3-version>
- <lucene-bundle-version>6.6.0_2</lucene-bundle-version>
+ <lucene-bundle-version>7.2.1_1</lucene-bundle-version>
<!-- lucene aligned with elasticsearch version of lucene in use -->
- <lucene-version>7.0.0</lucene-version>
- <lucene-version-range>[5,7)</lucene-version-range>
+ <lucene-version>7.2.1</lucene-version>
+ <lucene-version-range>[7,8)</lucene-version-range>
<lightcouch-version>0.2.0</lightcouch-version>
<lightcouch-bundle-version>0.2.0_1</lightcouch-bundle-version>
<lz4-version>1.4.1</lz4-version>
@@ -626,10 +626,10 @@
<snakeyaml-version>1.21</snakeyaml-version>
<snappy-version>1.1.4</snappy-version>
<snmp4j-version>2.6.2_1</snmp4j-version>
- <solr-bundle-version>5.5.2_1</solr-bundle-version>
+ <solr-bundle-version>7.2.1_1</solr-bundle-version>
<!-- solr version aligned with lucene -->
- <solr-version>7.0.0</solr-version>
- <solr-version-range>[5,7)</solr-version-range>
+ <solr-version>7.2.1</solr-version>
+ <solr-version-range>[7,8)</solr-version-range>
<spark-version>1.6.1</spark-version>
<spark-rest-version>2.7.2</spark-rest-version>
<spark-rest-bundle-version>2.7.2_1</spark-rest-bundle-version>
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 01/02: CAMEL-11879: Upgraded Lucene and Solr versions to
7.0.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ebd8cadf94a30d6cd90604bc75866aa5a0b08b9f
Author: Viral Gohel <vr...@gmail.com>
AuthorDate: Tue Oct 3 20:12:35 2017 +0530
CAMEL-11879: Upgraded Lucene and Solr versions to 7.0.0
---
.../camel/component/lucene/LuceneConstants.java | 2 +-
.../apache/camel/component/solr/SolrEndpoint.java | 26 ++++++----------------
.../camel/component/solr/JettySolrFactory.java | 5 +++--
.../camel/component/solr/SolrCloudFixture.java | 4 ++--
.../apache/camel/component/solr/SolrFixtures.java | 15 +++++++------
.../camel/component/solr/SolrUpdateTest.java | 14 ++++++------
parent/pom.xml | 10 ++++-----
7 files changed, 33 insertions(+), 43 deletions(-)
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 74cea7f..9d09885 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 @@ package org.apache.camel.component.lucene;
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 7b039c2..57cbeb2 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 class SolrEndpoint extends DefaultEndpoint {
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 class SolrEndpoint extends DefaultEndpoint {
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 aa9a950..fba1662 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 javax.net.ssl.X509TrustManager;
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 @@ public final class JettySolrFactory {
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 ffd8bd0..88ce146 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 class SolrCloudFixture {
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 716a056..075907e 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.SolrClient;
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 @@ public class SolrFixtures {
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 @@ public class SolrFixtures {
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 class SolrFixtures {
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 3aad881..e066d3c 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.Arrays;
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 class SolrUpdateTest extends SolrComponentTestSupport {
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 class SolrUpdateTest extends SolrComponentTestSupport {
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 class SolrUpdateTest extends SolrComponentTestSupport {
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 class SolrUpdateTest extends SolrComponentTestSupport {
List<SolrInputDocument> docList = new ArrayList<>(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 class SolrUpdateTest extends SolrComponentTestSupport {
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 dc6907e..87ffb8b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -459,10 +459,10 @@
<log4j2-version>2.11.0</log4j2-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.2.0</lightcouch-version>
<lightcouch-bundle-version>0.2.0_1</lightcouch-bundle-version>
<lz4-version>1.4.1</lz4-version>
@@ -628,8 +628,8 @@
<snmp4j-version>2.6.2_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.7.2</spark-rest-version>
<spark-rest-bundle-version>2.7.2_1</spark-rest-bundle-version>
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.