You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by th...@apache.org on 2020/10/26 09:22:04 UTC

svn commit: r1882871 - in /jackrabbit/oak/branches/1.8: ./ oak-benchmarks/ oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ oak-parent/ oak-solr-core/ oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configurati...

Author: thomasm
Date: Mon Oct 26 09:22:03 2020
New Revision: 1882871

URL: http://svn.apache.org/viewvc?rev=1882871&view=rev
Log:
OAK-9261 Upgrade Apache Solr to 8.6.3 and remove Embedded Solr Server

Added:
    jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/EmbeddedSolrServerConfiguration.java
      - copied unchanged from r1882810, jackrabbit/oak/branches/1.22/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/EmbeddedSolrServerConfiguration.java
    jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/
      - copied from r1882810, jackrabbit/oak/branches/1.22/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/
    jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
      - copied unchanged from r1882810, jackrabbit/oak/branches/1.22/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
Removed:
    jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/EmbeddedSolrServerConfiguration.java
    jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java
    jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
Modified:
    jackrabbit/oak/branches/1.8/   (props changed)
    jackrabbit/oak/branches/1.8/oak-benchmarks/pom.xml
    jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
    jackrabbit/oak/branches/1.8/oak-parent/pom.xml
    jackrabbit/oak/branches/1.8/oak-solr-core/pom.xml
    jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfiguration.java
    jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerConfigurationProvider.java
    jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java
    jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java
    jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java
    jackrabbit/oak/branches/1.8/oak-solr-osgi/pom.xml

Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
  Merged /jackrabbit/oak/branches/1.22:r1882810
  Merged /jackrabbit/oak/trunk:r1882787

Modified: jackrabbit/oak/branches/1.8/oak-benchmarks/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/pom.xml?rev=1882871&r1=1882870&r2=1882871&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-benchmarks/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-benchmarks/pom.xml Mon Oct 26 09:22:03 2020
@@ -168,22 +168,9 @@
         </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>
-            <artifactId>solr-core</artifactId>
+            <artifactId>solr-solrj</artifactId>
             <version>${solr.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-fileupload</groupId>
-                    <artifactId>commons-fileupload</artifactId>
-                </exclusion>
-            </exclusions>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -191,6 +178,11 @@
             <version>2.0</version>
         </dependency>
         <dependency>
+           <groupId>commons-lang</groupId>
+           <artifactId>commons-lang</artifactId>
+           <version>2.6</version>        
+        </dependency>
+        <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
         </dependency>

Modified: jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java?rev=1882871&r1=1882870&r2=1882871&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java Mon Oct 26 09:22:03 2020
@@ -19,31 +19,23 @@
 package org.apache.jackrabbit.oak.benchmark;
 
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.StringReader;
 import javax.jcr.Repository;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
 import org.apache.jackrabbit.oak.Oak;
 import org.apache.jackrabbit.oak.fixture.JcrCreator;
 import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture;
 import org.apache.jackrabbit.oak.fixture.RepositoryFixture;
 import org.apache.jackrabbit.oak.jcr.Jcr;
 import org.apache.jackrabbit.oak.plugins.index.solr.configuration.DefaultSolrConfiguration;
-import org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration;
 import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration;
 import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationProvider;
 import org.apache.jackrabbit.oak.plugins.index.solr.configuration.RemoteSolrServerConfiguration;
 import org.apache.jackrabbit.oak.plugins.index.solr.configuration.nodestate.NodeStateSolrServersObserver;
 import org.apache.jackrabbit.oak.plugins.index.solr.index.SolrIndexEditorProvider;
 import org.apache.jackrabbit.oak.plugins.index.solr.query.SolrQueryIndexProvider;
-import org.apache.jackrabbit.oak.plugins.index.solr.server.EmbeddedSolrServerProvider;
 import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
 import org.apache.jackrabbit.oak.plugins.index.solr.util.SolrIndexInitializer;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -90,13 +82,7 @@ public class FullTextSolrSearchTest exte
     }
 
     private void initializeProvider() throws Exception {
-        if (server == null || "default".equals(server)) {
-            log.info("spawning Solr locally");
-            serverProvider = createEmbeddedSolrServerProvider(true);
-        } else if (server != null && "embedded".equals(server)) {
-            log.info("using embedded Solr");
-            serverProvider = createEmbeddedSolrServerProvider(false);
-        } else if (server != null && (server.startsWith("http") || server.matches("\\w+\\:\\d{3,5}"))) {
+        if (server != null && (server.startsWith("http") || server.matches("\\w+\\:\\d{3,5}"))) {
             log.info("using remote Solr {}", server);
             RemoteSolrServerConfiguration remoteSolrServerConfiguration = new RemoteSolrServerConfiguration(
                     server, "oak", 2, 2, null, 10, 10, server);
@@ -106,29 +92,6 @@ public class FullTextSolrSearchTest exte
         }
     }
 
-    private EmbeddedSolrServerProvider createEmbeddedSolrServerProvider(boolean http) throws Exception {
-        String tempDirectoryPath = FileUtils.getTempDirectoryPath();
-        File solrHome = new File(tempDirectoryPath, "solr" + System.nanoTime());
-        EmbeddedSolrServerConfiguration embeddedSolrServerConfiguration = new EmbeddedSolrServerConfiguration(solrHome.getAbsolutePath(), "oak");
-        if (http) {
-            embeddedSolrServerConfiguration = embeddedSolrServerConfiguration.withHttpConfiguration("/solr", 8983);
-        }
-        EmbeddedSolrServerProvider embeddedSolrServerProvider = embeddedSolrServerConfiguration.getProvider();
-        SolrClient solrServer = embeddedSolrServerProvider.getSolrServer();
-        if (storageEnabled != null && !storageEnabled) {
-            // change schema.xml and reload the core
-            File schemaXML = new File(solrHome.getAbsolutePath() + "/oak/conf", "schema.xml");
-            InputStream inputStream = getClass().getResourceAsStream("/solr/oak/conf/schema.xml");
-            String schemaString = IOUtils.toString(inputStream).replace("<dynamicField name=\"*\" type=\"text_general\" indexed=\"true\" stored=\"true\" multiValued=\"true\"/>",
-                    "<dynamicField name=\"*\" type=\"text_general\" indexed=\"true\" stored=\"false\" multiValued=\"true\"/>");
-            FileOutputStream fileOutputStream = new FileOutputStream(schemaXML);
-            IOUtils.copy(new StringReader(schemaString), fileOutputStream);
-            fileOutputStream.flush();
-            ((EmbeddedSolrServer) solrServer).getCoreContainer().reload("oak");
-        }
-        return embeddedSolrServerProvider;
-    }
-
     @Override
     protected void afterSuite() throws Exception {
         SolrClient solrServer = serverProvider.getSolrServer();

Modified: jackrabbit/oak/branches/1.8/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-parent/pom.xml?rev=1882871&r1=1882870&r2=1882871&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-parent/pom.xml Mon Oct 26 09:22:03 2020
@@ -50,7 +50,7 @@
     <mongo.db2>MongoMKDB2</mongo.db2>
     <segment.db>SegmentMK</segment.db>
     <lucene.version>4.7.1</lucene.version>
-    <solr.version>6.6.6</solr.version>
+    <solr.version>8.6.3</solr.version>
     <mongo.driver.version>3.6.4</mongo.driver.version>
     <slf4j.api.version>1.7.30</slf4j.api.version>
     <slf4j.version>1.7.30</slf4j.version> <!-- sync with logback version -->

Modified: jackrabbit/oak/branches/1.8/oak-solr-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/pom.xml?rev=1882871&r1=1882870&r2=1882871&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/pom.xml Mon Oct 26 09:22:03 2020
@@ -277,7 +277,7 @@
                     <artifactId>commons-fileupload</artifactId>
                 </exclusion>
             </exclusions>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>

Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfiguration.java?rev=1882871&r1=1882870&r2=1882871&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfiguration.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfiguration.java Mon Oct 26 09:22:03 2020
@@ -39,6 +39,10 @@ public abstract class SolrServerConfigur
         this.type = ((ParameterizedType) superclass).getActualTypeArguments()[0];
     }
 
+    public SolrServerConfiguration<S> withHttpConfiguration(String context, Integer httpPort) {
+        return this;
+    }
+
     public Type getType() {
         return this.type;
     }

Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerConfigurationProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerConfigurationProvider.java?rev=1882871&r1=1882870&r2=1882871&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerConfigurationProvider.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerConfigurationProvider.java Mon Oct 26 09:22:03 2020
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.plugin
 
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration;
 import org.apache.jackrabbit.oak.plugins.index.solr.configuration.RemoteSolrServerConfiguration;
 import org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfiguration;
 import org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationDefaults;
@@ -67,10 +66,10 @@ public class NodeStateSolrServerConfigur
             Integer httpPort = Integer.valueOf(getStringValueFor(Properties.HTTP_PORT, "0"));
 
             if (context != null && httpPort > 0) {
-                return (SolrServerConfiguration) new EmbeddedSolrServerConfiguration(solrHomePath, coreName)
+                return createEmbeddedSolrServerConfiguration(solrHomePath, coreName)
                         .withHttpConfiguration(context, httpPort);
             } else {
-                return (SolrServerConfiguration) new EmbeddedSolrServerConfiguration(solrHomePath, coreName);
+                return createEmbeddedSolrServerConfiguration(solrHomePath, coreName);
             }
         } else if ("remote".equalsIgnoreCase(type)) {
             String solrZkHost = getStringValueFor(Properties.ZK_HOST, null);
@@ -90,6 +89,16 @@ public class NodeStateSolrServerConfigur
         }
     }
 
+    @SuppressWarnings({"unchecked" })
+    private static SolrServerConfiguration<SolrServerProvider> createEmbeddedSolrServerConfiguration(String solrHomePath, String coreName) {
+        try {
+            Class<?> c = Class.forName("org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration");
+            return (SolrServerConfiguration<SolrServerProvider>) c.getConstructor(String.class, String.class).newInstance(solrHomePath, coreName);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     /**
      * Properties that may be retrieved from the configuration {@link org.apache.jackrabbit.oak.spi.state.NodeState}.
      */

Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java?rev=1882871&r1=1882870&r2=1882871&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java Mon Oct 26 09:22:03 2020
@@ -17,7 +17,6 @@
 package org.apache.jackrabbit.oak.plugins.index.solr.server;
 
 import java.io.IOException;
-import org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration;
 import org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfiguration;
 import org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationProvider;
 import org.apache.solr.client.solrj.SolrClient;
@@ -61,7 +60,7 @@ public class OakSolrServer extends SolrC
         SolrServerRegistry.Strategy strategy = isIndex ? SolrServerRegistry.Strategy.INDEXING : SolrServerRegistry.Strategy.SEARCHING;
         SolrClient solrServer = SolrServerRegistry.get(solrServerConfiguration, strategy);
         if (solrServer == null) {
-            if (solrServerConfiguration instanceof EmbeddedSolrServerConfiguration) {
+            if (solrServerConfiguration.getClass().getName().indexOf("EmbeddedSolrServerConfiguration") >= 0) {
                 solrServer = solrServerProvider.getSolrServer();
                 // the same Solr server has to be used for both
                 SolrServerRegistry.register(solrServerConfiguration, solrServer, SolrServerRegistry.Strategy.INDEXING);

Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java?rev=1882871&r1=1882870&r2=1882871&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java Mon Oct 26 09:22:03 2020
@@ -70,7 +70,10 @@ public class QueryJcrTest extends TestCa
         suite.addTestSuite(SQL2OffsetLimitTest.class);
         suite.addTestSuite(LimitAndOffsetTest.class);
         suite.addTestSuite(OrderByTest.class);
-        suite.addTestSuite(ExcerptTest.class);
+
+        // OAK-9261: can't run this test with embedded Solr
+        // suite.addTestSuite(ExcerptTest.class);
+
         suite.addTestSuite(QueryResultTest.class);
         suite.addTestSuite(ParentNodeTest.class);
         suite.addTestSuite(SimilarQueryTest.class);

Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java?rev=1882871&r1=1882870&r2=1882871&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java Mon Oct 26 09:22:03 2020
@@ -326,6 +326,7 @@ public class SolrIndexIT extends Abstrac
     }
 
     @Test
+    @Ignore("OAK-9261")
     public void testCompositeRepExcerpt() throws Exception {
         String sqlQuery = "select [jcr:path], [jcr:score], [rep:excerpt] from [nt:base] as a " +
                 "where (contains([jcr:content/*], 'square') or contains([jcr:content/jcr:title], 'square')" +
@@ -519,6 +520,7 @@ public class SolrIndexIT extends Abstrac
     }
 
     @Test
+    @Ignore("OAK-9261")
     public void testOrderByJcrScore() throws Exception {
         Tree index = root.getTree("/oak:index/" + TEST_INDEX_NAME);
         assertTrue(index.exists());

Modified: jackrabbit/oak/branches/1.8/oak-solr-osgi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-osgi/pom.xml?rev=1882871&r1=1882870&r2=1882871&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-osgi/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-osgi/pom.xml Mon Oct 26 09:22:03 2020
@@ -76,7 +76,6 @@
                             OSGI-INF/org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrQueryIndexProviderService.xml,
                             OSGI-INF/org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrServerProviderService.xml,
                             OSGI-INF/org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrIndexEditorProviderService.xml,
-                            OSGI-INF/org.apache.jackrabbit.oak.plugins.index.solr.osgi.EmbeddedSolrServerConfigurationProvider.xml,
                             OSGI-INF/org.apache.jackrabbit.oak.plugins.index.solr.osgi.RemoteSolrServerConfigurationProvider.xml,
                             OSGI-INF/org.apache.jackrabbit.oak.plugins.index.solr.osgi.OakSolrConfigurationProviderService.xml,
                             OSGI-INF/org.apache.jackrabbit.oak.plugins.index.solr.osgi.NodeStateSolrServersObserverService.xml
@@ -118,118 +117,10 @@
         <!-- Solr -->
         <dependency>
             <groupId>org.apache.solr</groupId>
-            <artifactId>solr-core</artifactId>
-            <version>${solr.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-jdk14</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-fileupload</groupId>
-                    <artifactId>commons-fileupload</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.solr</groupId>
             <artifactId>solr-solrj</artifactId>
             <version>${solr.version}</version>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.noggit</groupId>
-            <artifactId>noggit</artifactId>
-            <version>0.6</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.carrotsearch</groupId>
-            <artifactId>hppc</artifactId>
-            <version>0.7.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-
-        <!-- Lucene -->
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-core</artifactId>
-            <version>${solr.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-common</artifactId>
-            <version>${solr.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-queryparser</artifactId>
-            <version>${solr.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-queries</artifactId>
-            <version>${solr.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-misc</artifactId>
-            <version>${solr.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-highlighter</artifactId>
-            <version>${solr.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-sandbox</artifactId>
-            <version>${solr.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-grouping</artifactId>
-            <version>${solr.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-join</artifactId>
-            <version>${solr.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-suggest</artifactId>
-            <version>${solr.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-spatial</artifactId>
-            <version>${solr.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.locationtech.spatial4j</groupId>
-            <artifactId>spatial4j</artifactId>
-            <version>0.6</version>
-            <scope>runtime</scope>
-        </dependency>
 
         <dependency>
             <groupId>commons-lang</groupId>