You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/04/01 07:09:08 UTC
camel git commit: Fix build after solr/lucene upgrade
Repository: camel
Updated Branches:
refs/heads/master 7a1abb386 -> afd200a59
Fix build after solr/lucene upgrade
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/afd200a5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/afd200a5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/afd200a5
Branch: refs/heads/master
Commit: afd200a59dfea4a2e6a4bc5eaa9f044824d77534
Parents: 7a1abb3
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 1 07:09:01 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 1 07:09:01 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/lucene/LuceneConstants.java | 2 +-
.../java/org/apache/camel/component/solr/SolrCloudFixture.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/afd200a5/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java
----------------------------------------------------------------------
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..84a5400 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_5_5_0;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/afd200a5/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCloudFixture.java
----------------------------------------------------------------------
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 231ee4f..dbe379e 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
@@ -17,10 +17,12 @@
package org.apache.camel.component.solr;
import java.io.File;
+import java.io.FileInputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.camel.util.IOHelper;
import org.apache.log4j.Logger;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
@@ -63,8 +65,8 @@ public class SolrCloudFixture {
CloudSolrClient solrClient;
public SolrCloudFixture(String solrHome) throws Exception {
-
- miniCluster = new MiniSolrCloudCluster(1, "/solr", new File("target/tmp"), new File(solrHome, "solr-no-core.xml"), null, null);
+ String xml = IOHelper.loadText(new FileInputStream(new File(solrHome, "solr-no-core.xml")));
+ miniCluster = new MiniSolrCloudCluster(1, "/solr", new File("target/tmp").toPath(), xml, null, null);
String zkAddr = miniCluster.getZkServer().getZkAddress();
String zkHost = miniCluster.getZkServer().getZkHost();
R: camel git commit: Fix build after solr/lucene upgrade
Posted by Andrea Cosentino <an...@yahoo.com.INVALID>.
Sorry Claus. My mistake
Inviato da Yahoo Mail su Android
Il ven, 1 apr, 2016 alle 7:09, davsclaus@apache.org<da...@apache.org> ha scritto: Repository: camel
Updated Branches:
refs/heads/master 7a1abb386 -> afd200a59
Fix build after solr/lucene upgrade
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/afd200a5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/afd200a5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/afd200a5
Branch: refs/heads/master
Commit: afd200a59dfea4a2e6a4bc5eaa9f044824d77534
Parents: 7a1abb3
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 1 07:09:01 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 1 07:09:01 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/lucene/LuceneConstants.java | 2 +-
.../java/org/apache/camel/component/solr/SolrCloudFixture.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/afd200a5/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java
----------------------------------------------------------------------
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..84a5400 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_5_5_0;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/afd200a5/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCloudFixture.java
----------------------------------------------------------------------
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 231ee4f..dbe379e 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
@@ -17,10 +17,12 @@
package org.apache.camel.component.solr;
import java.io.File;
+import java.io.FileInputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.camel.util.IOHelper;
import org.apache.log4j.Logger;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
@@ -63,8 +65,8 @@ public class SolrCloudFixture {
CloudSolrClient solrClient;
public SolrCloudFixture(String solrHome) throws Exception {
-
- miniCluster = new MiniSolrCloudCluster(1, "/solr", new File("target/tmp"), new File(solrHome, "solr-no-core.xml"), null, null);
+ String xml = IOHelper.loadText(new FileInputStream(new File(solrHome, "solr-no-core.xml")));
+ miniCluster = new MiniSolrCloudCluster(1, "/solr", new File("target/tmp").toPath(), xml, null, null);
String zkAddr = miniCluster.getZkServer().getZkAddress();
String zkHost = miniCluster.getZkServer().getZkHost();