You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2018/06/23 14:06:37 UTC
[camel] branch master updated: CAMEL-11893: Upgraded
lucenceMatchVersion to 7.2.1
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 6938a4e CAMEL-11893: Upgraded lucenceMatchVersion to 7.2.1
6938a4e is described below
commit 6938a4ea6b68e295fae48f52e8e7cb2628f161a3
Author: aldettinger <al...@gmail.com>
AuthorDate: Sat Jun 23 16:04:44 2018 +0200
CAMEL-11893: Upgraded lucenceMatchVersion to 7.2.1
---
.../java/org/apache/camel/component/solr/SolrCloudFixture.java | 10 ++--------
.../src/test/resources/solr/collection1/conf/solrconfig.xml | 2 +-
.../src/test/resources/solr/conf/collection1/solrconfig.xml | 2 +-
3 files changed, 4 insertions(+), 10 deletions(-)
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 3f707c8..cb8f184 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
@@ -49,17 +49,11 @@ public class SolrCloudFixture {
private static final Path TEMP_DIR;
/**
- * Create indexes in this directory, optimally use a subdir, named after the
- * test
+ * Create a temp dir under the maven target folder
*/
static {
LOG = Logger.getLogger(SolrCloudFixture.class);
-
- String s = System.getProperty("tempDir", System.getProperty("java.io.tmpdir"));
- if (s == null) {
- throw new RuntimeException("To run tests, you need to define system property 'tempDir' or 'java.io.tmpdir'.");
- }
- TEMP_DIR = Paths.get(s, "tmp");
+ TEMP_DIR = Paths.get("tmp");
try {
Files.createDirectories(TEMP_DIR);
LOG.info("Created: " + TEMP_DIR);
diff --git a/components/camel-solr/src/test/resources/solr/collection1/conf/solrconfig.xml b/components/camel-solr/src/test/resources/solr/collection1/conf/solrconfig.xml
index 4d4c6d4..c4707d5 100644
--- a/components/camel-solr/src/test/resources/solr/collection1/conf/solrconfig.xml
+++ b/components/camel-solr/src/test/resources/solr/collection1/conf/solrconfig.xml
@@ -36,7 +36,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>4.8</luceneMatchVersion>
+ <luceneMatchVersion>7.2.1</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load an Jars
identified and use them to resolve any "plugins" specified in
diff --git a/components/camel-solr/src/test/resources/solr/conf/collection1/solrconfig.xml b/components/camel-solr/src/test/resources/solr/conf/collection1/solrconfig.xml
index 789df3e..4e07399 100644
--- a/components/camel-solr/src/test/resources/solr/conf/collection1/solrconfig.xml
+++ b/components/camel-solr/src/test/resources/solr/conf/collection1/solrconfig.xml
@@ -36,7 +36,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>4.10.4</luceneMatchVersion>
+ <luceneMatchVersion>7.2.1</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load an Jars
identified and use them to resolve any "plugins" specified in