[ issue #95 ] Release 7.7.2

SeaseLtd · Nov 12, 2019 · d550add · d550add
1 parent 921b572
commit d550add
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 10 deletions.
diff --git a/...n/resources/archetype-resources/src/etc/configuration_sets/v1.0/core1/conf/solrconfig.xml b/...n/resources/archetype-resources/src/etc/configuration_sets/v1.0/core1/conf/solrconfig.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <config>
-    <luceneMatchVersion>6.3.0</luceneMatchVersion>
+    <luceneMatchVersion>LATEST</luceneMatchVersion>
     <dataDir>${solr.data.dir:}/${solr.core.name:}</dataDir>
     <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
     <codecFactory class="solr.SchemaCodecFactory"/>

diff --git a/...n/resources/archetype-resources/src/etc/configuration_sets/v1.1/core1/conf/solrconfig.xml b/...n/resources/archetype-resources/src/etc/configuration_sets/v1.1/core1/conf/solrconfig.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <config>
-    <luceneMatchVersion>6.3.0</luceneMatchVersion>
+    <luceneMatchVersion>LATEST</luceneMatchVersion>
     <dataDir>${solr.data.dir:}/${solr.core.name:}</dataDir>
     <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
     <codecFactory class="solr.SchemaCodecFactory"/>

diff --git a/rre-maven-plugin/rre-maven-external-solr-plugin/pom.xml b/rre-maven-plugin/rre-maven-external-solr-plugin/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>rre-maven-external-solr-plugin</artifactId>
-    <version>7.6.0</version>
+    <version>8.3.0</version>
     <packaging>maven-plugin</packaging>
     <name>RRE - Maven External Apache Solr Plugin</name>
     <dependencies>

diff --git a/rre-maven-plugin/rre-maven-solr-plugin/pom.xml b/rre-maven-plugin/rre-maven-solr-plugin/pom.xml
@@ -27,7 +27,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>rre-maven-solr-plugin</artifactId>
-    <version>7.4.0</version>
+    <version>8.3.0</version>
     <packaging>maven-plugin</packaging>
     <name>RRE - Maven Apache Solr Plugin</name>
     <dependencies>

diff --git a/rre-search-platform/pom.xml b/rre-search-platform/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/rre-search-platform/rre-search-platform-external-solr-impl/pom.xml b/rre-search-platform/rre-search-platform-external-solr-impl/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>rre-search-platform-external-solr-impl</artifactId>
     <name>RRE - External Solr search platform binding</name>
 
-    <version>7.6.0</version>
+    <version>8.3.0</version>
 
     <dependencies>
         <dependency>

diff --git a/rre-search-platform/rre-search-platform-solr-impl/pom.xml b/rre-search-platform/rre-search-platform-solr-impl/pom.xml
@@ -27,7 +27,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>rre-search-platform-solr-impl</artifactId>
-    <version>7.4.0</version>
+    <version>8.3.0</version>
     <name>RRE - Apache Solr platform binding</name>
     <dependencies>
         <dependency>
@@ -44,6 +44,21 @@
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-core</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                        <groupId>org.eclipse.jetty</groupId>
+                        <artifactId>jetty-alpn-java-server</artifactId>
+                </exclusion>
+                <exclusion>
+                        <groupId>org.eclipse.jetty</groupId>
+                        <artifactId>jetty-alpn-java-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.9.4</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/.../rre-search-platform-solr-impl/src/main/java/io/sease/rre/search/api/impl/ApacheSolr.java b/.../rre-search-platform-solr-impl/src/main/java/io/sease/rre/search/api/impl/ApacheSolr.java
@@ -16,11 +16,11 @@
  */
 package io.sease.rre.search.api.impl;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.sease.rre.DirectoryUtils;
 import io.sease.rre.search.api.QueryOrSearchResponse;
 import io.sease.rre.search.api.SearchPlatform;
-import org.apache.htrace.fasterxml.jackson.databind.JsonNode;
-import org.apache.htrace.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.solr.client.solrj.SolrQuery;
@@ -29,7 +29,11 @@
 import org.apache.solr.common.SolrException;
 import org.apache.solr.core.CoreContainer;
 
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;