Author: tommaso Date: Tue Dec 12 14:22:12 2017 New Revision: 1817919 URL: http://svn.apache.org/viewvc?rev=1817919&view=rev Log: OAK-4318 - upgrade to Solr index to Solr 5.5.5
Modified: jackrabbit/oak/trunk/oak-benchmarks/pom.xml jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java jackrabbit/oak/trunk/oak-parent/pom.xml jackrabbit/oak/trunk/oak-solr-core/pom.xml jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfiguration.java jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationProvider.java jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerProvider.java jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditor.java jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/DefaultSolrServerProvider.java jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerProvider.java jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerRegistry.java jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProviderIT.java jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/conf/solrconfig.xml jackrabbit/oak/trunk/oak-solr-osgi/pom.xml Modified: jackrabbit/oak/trunk/oak-benchmarks/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/pom.xml?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-benchmarks/pom.xml (original) +++ jackrabbit/oak/trunk/oak-benchmarks/pom.xml Tue Dec 12 14:22:12 2017 @@ -170,7 +170,7 @@ <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-core</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <exclusions> <exclusion> <groupId>org.apache.lucene</groupId> Modified: jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java (original) +++ jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java Tue Dec 12 14:22:12 2017 @@ -43,7 +43,7 @@ import org.apache.jackrabbit.oak.plugins 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.SolrServer; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -114,7 +114,7 @@ public class FullTextSolrSearchTest exte embeddedSolrServerConfiguration = embeddedSolrServerConfiguration.withHttpConfiguration("/solr", 8983); } EmbeddedSolrServerProvider embeddedSolrServerProvider = embeddedSolrServerConfiguration.getProvider(); - SolrServer solrServer = embeddedSolrServerProvider.getSolrServer(); + 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"); @@ -131,7 +131,7 @@ public class FullTextSolrSearchTest exte @Override protected void afterSuite() throws Exception { - SolrServer solrServer = serverProvider.getSolrServer(); + SolrClient solrServer = serverProvider.getSolrServer(); if (solrServer != null) { solrServer.shutdown(); } Modified: jackrabbit/oak/trunk/oak-parent/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-parent/pom.xml (original) +++ jackrabbit/oak/trunk/oak-parent/pom.xml Tue Dec 12 14:22:12 2017 @@ -50,6 +50,7 @@ <mongo.db2>MongoMKDB2</mongo.db2> <segment.db>SegmentMK</segment.db> <lucene.version>4.7.1</lucene.version> + <solr.version>5.5.5</solr.version> <mongo.driver.version>3.4.0</mongo.driver.version> <!-- Note that we're using SLF4J API version 1.7 when compiling --> <!-- core Oak components but more recent SLF4J and Logback versions --> Modified: jackrabbit/oak/trunk/oak-solr-core/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/pom.xml?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/pom.xml (original) +++ jackrabbit/oak/trunk/oak-solr-core/pom.xml Tue Dec 12 14:22:12 2017 @@ -99,19 +99,19 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-test-framework</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-analyzers-common</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <scope>test</scope> </dependency> <!-- TEST --> @@ -253,7 +253,7 @@ <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-core</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-solrj</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <scope>provided</scope> </dependency> Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfiguration.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfiguration.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfiguration.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfiguration.java Tue Dec 12 14:22:12 2017 @@ -24,7 +24,7 @@ import java.lang.reflect.Type; import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider; /** - * Configuration parameters for starting a {@link org.apache.solr.client.solrj.SolrServer} + * Configuration parameters for starting a {@link org.apache.solr.client.solrj.SolrClient} */ public abstract class SolrServerConfiguration<S extends SolrServerProvider> { Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationProvider.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationProvider.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationProvider.java Tue Dec 12 14:22:12 2017 @@ -21,13 +21,13 @@ import javax.annotation.Nonnull; import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider; /** - * {@link org.apache.solr.client.solrj.SolrServer} configuration provider. + * {@link org.apache.solr.client.solrj.SolrClient} configuration provider. */ public interface SolrServerConfigurationProvider<S extends SolrServerProvider> { /** * Provide a {@link SolrServerConfiguration} to be used to initialize a specific - * {@link org.apache.solr.client.solrj.SolrServer} implementation. + * {@link org.apache.solr.client.solrj.SolrClient} implementation. * * @return the {@link org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfiguration} holding the configuration parameters */ Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerProvider.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerProvider.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerProvider.java Tue Dec 12 14:22:12 2017 @@ -21,6 +21,7 @@ import java.io.IOException; import com.google.common.collect.Iterables; import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServer; /** @@ -46,19 +47,19 @@ public class NodeStateSolrServerProvider } @Override - public SolrServer getSolrServer() throws Exception { + public SolrClient getSolrServer() throws Exception { checkProviderInitialization(); return provider.getSolrServer(); } @Override - public SolrServer getIndexingSolrServer() throws Exception { + public SolrClient getIndexingSolrServer() throws Exception { checkProviderInitialization(); return provider.getIndexingSolrServer(); } @Override - public SolrServer getSearchingSolrServer() throws Exception { + public SolrClient getSearchingSolrServer() throws Exception { checkProviderInitialization(); return provider.getSearchingSolrServer(); } Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditor.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditor.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditor.java Tue Dec 12 14:22:12 2017 @@ -32,7 +32,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration; import org.apache.jackrabbit.oak.spi.commit.Editor; import org.apache.jackrabbit.oak.spi.state.NodeState; -import org.apache.solr.client.solrj.SolrServer; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.common.SolrInputDocument; import org.apache.tika.metadata.Metadata; @@ -70,7 +70,7 @@ class SolrIndexEditor implements IndexEd */ private String path; - private final SolrServer solrServer; + private final SolrClient solrServer; private final OakSolrConfiguration configuration; @@ -81,7 +81,7 @@ class SolrIndexEditor implements IndexEd private static final Parser parser = new AutoDetectParser(); SolrIndexEditor( - SolrServer solrServer, + SolrClient solrServer, OakSolrConfiguration configuration, IndexUpdateCallback callback) { this.parent = null; @@ -141,7 +141,7 @@ class SolrIndexEditor implements IndexEd } } - private void commitByPolicy(SolrServer solrServer, OakSolrConfiguration.CommitPolicy commitPolicy) throws IOException, SolrServerException { + private void commitByPolicy(SolrClient solrServer, OakSolrConfiguration.CommitPolicy commitPolicy) throws IOException, SolrServerException { switch (commitPolicy) { case HARD: { solrServer.commit(); Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java Tue Dec 12 14:22:12 2017 @@ -32,6 +32,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.spi.commit.Editor; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -68,7 +69,7 @@ public class SolrIndexEditorProvider imp NodeState nodeState = definition.getNodeState(); OakSolrConfiguration configuration = new OakSolrNodeStateConfiguration(nodeState); SolrServerConfigurationProvider configurationProvider = new NodeStateSolrServerConfigurationProvider(definition.getChildNode("server").getNodeState()); - SolrServer solrServer = new OakSolrServer(configurationProvider); + SolrClient solrServer = new OakSolrServer(configurationProvider); editor = getEditor(configuration, solrServer, callback); } else { // otherwise use the default configuration providers (e.g. defined via code or OSGi) OakSolrConfiguration configuration = oakSolrConfigurationProvider.getConfiguration(); @@ -85,7 +86,7 @@ public class SolrIndexEditorProvider imp return definition.hasChildNode("server"); } - private SolrIndexEditor getEditor(OakSolrConfiguration configuration, SolrServer solrServer, + private SolrIndexEditor getEditor(OakSolrConfiguration configuration, SolrClient solrServer, IndexUpdateCallback callback) { SolrIndexEditor editor = null; try { Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java Tue Dec 12 14:22:12 2017 @@ -34,7 +34,7 @@ import org.apache.felix.scr.annotations. import org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationProvider; import org.apache.jackrabbit.oak.plugins.index.solr.server.OakSolrServer; import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider; -import org.apache.solr.client.solrj.SolrServer; +import org.apache.solr.client.solrj.SolrClient; import org.osgi.service.component.ComponentContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -76,7 +76,7 @@ public class SolrServerProviderService i private String serverType; - private SolrServer cachedSolrServer; + private SolrClient cachedSolrServer; @Activate protected void activate(ComponentContext context) throws Exception { @@ -140,7 +140,7 @@ public class SolrServerProviderService i @CheckForNull @Override - public SolrServer getSolrServer() throws Exception { + public SolrClient getSolrServer() throws Exception { synchronized (solrServerConfigurationProviders) { if (cachedSolrServer == null) { cachedSolrServer = getServer(); @@ -151,18 +151,18 @@ public class SolrServerProviderService i @CheckForNull @Override - public SolrServer getIndexingSolrServer() throws Exception { + public SolrClient getIndexingSolrServer() throws Exception { return getSolrServer(); } @CheckForNull @Override - public SolrServer getSearchingSolrServer() throws Exception { + public SolrClient getSearchingSolrServer() throws Exception { return getSolrServer(); } - private SolrServer getServer() { - SolrServer solrServer = null; + private SolrClient getServer() { + SolrClient solrServer = null; if (serverType != null && !"none".equals(serverType)) { SolrServerConfigurationProvider solrServerConfigurationProvider = solrServerConfigurationProviders.get(serverType); if (solrServerConfigurationProvider != null) { Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java Tue Dec 12 14:22:12 2017 @@ -17,6 +17,7 @@ package org.apache.jackrabbit.oak.plugins.index.solr.query; import javax.annotation.CheckForNull; +import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -59,6 +60,7 @@ import org.apache.jackrabbit.oak.spi.que import org.apache.jackrabbit.oak.spi.query.QueryIndex.FulltextQueryIndex; import org.apache.jackrabbit.oak.spi.query.QueryLimits; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.SolrServerException; @@ -217,7 +219,7 @@ public class SolrQueryIndex implements F String path = plan.getPlanName(); OakSolrConfiguration configuration = getConfiguration(path, root); - SolrServer solrServer = getServer(path, root); + SolrClient solrServer = getServer(path, root); LMSEstimator estimator = getEstimator(path); AbstractIterator<SolrResultRow> iterator = getIterator(filter, plan, parent, parentDepth, configuration, @@ -237,7 +239,7 @@ public class SolrQueryIndex implements F return estimators.get(path); } - private SolrServer getServer(String path, NodeState root) { + private SolrClient getServer(String path, NodeState root) { NodeState node = root; for (String name : PathUtils.elements(path)) { @@ -265,7 +267,7 @@ public class SolrQueryIndex implements F private AbstractIterator<SolrResultRow> getIterator(final Filter filter, final IndexPlan plan, final String parent, final int parentDepth, - final OakSolrConfiguration configuration, final SolrServer solrServer, + final OakSolrConfiguration configuration, final SolrClient solrServer, final LMSEstimator estimator) { return new AbstractIterator<SolrResultRow>() { public Collection<FacetField> facetFields = new LinkedList<FacetField>(); @@ -457,7 +459,7 @@ public class SolrQueryIndex implements F private void putSpellChecks(SpellCheckResponse spellCheckResponse, final Deque<SolrResultRow> queue, - Filter filter, OakSolrConfiguration configuration, SolrServer solrServer) throws SolrServerException { + Filter filter, OakSolrConfiguration configuration, SolrClient solrServer) throws IOException, SolrServerException { List<SpellCheckResponse.Suggestion> suggestions = spellCheckResponse.getSuggestions(); Collection<String> alternatives = new ArrayList<String>(suggestions.size()); for (SpellCheckResponse.Suggestion suggestion : suggestions) { @@ -485,7 +487,7 @@ public class SolrQueryIndex implements F } private void putSuggestions(Set<Map.Entry<String, Object>> suggestEntries, final Deque<SolrResultRow> queue, - Filter filter, OakSolrConfiguration configuration, SolrServer solrServer) throws SolrServerException { + Filter filter, OakSolrConfiguration configuration, SolrClient solrServer) throws IOException, SolrServerException { Collection<SimpleOrderedMap<Object>> retrievedSuggestions = new HashSet<SimpleOrderedMap<Object>>(); for (Map.Entry<String, Object> suggester : suggestEntries) { SimpleOrderedMap<Object> suggestionResponses = ((SimpleOrderedMap) suggester.getValue()); @@ -547,7 +549,7 @@ public class SolrQueryIndex implements F for (String path : indexPaths) { OakSolrConfiguration configuration = getConfiguration(path, rootState); - SolrServer solrServer = getServer(path, rootState); + SolrClient solrServer = getServer(path, rootState); // only provide the plan if both valid configuration and server exist if (configuration != null && solrServer != null) { LMSEstimator estimator = getEstimator(path); @@ -666,13 +668,13 @@ public class SolrQueryIndex implements F private final Cursor pathCursor; private final IndexPlan plan; private final LMSEstimator estimator; - private final SolrServer solrServer; + private final SolrClient solrServer; private final OakSolrConfiguration configuration; SolrResultRow currentRow; SolrRowCursor(final Iterator<SolrResultRow> it, IndexPlan plan, QueryLimits settings, - LMSEstimator estimator, SolrServer solrServer, OakSolrConfiguration configuration) { + LMSEstimator estimator, SolrClient solrServer, OakSolrConfiguration configuration) { this.estimator = estimator; this.solrServer = solrServer; this.configuration = configuration; @@ -795,7 +797,7 @@ public class SolrQueryIndex implements F countQuery.setRows(0); try { estimate = this.solrServer.query(countQuery).getResults().getNumFound(); - } catch (SolrServerException e) { + } catch (IOException | SolrServerException e) { log.warn("could not perform count query {}", countQuery); } break; Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/DefaultSolrServerProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/DefaultSolrServerProvider.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/DefaultSolrServerProvider.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/DefaultSolrServerProvider.java Tue Dec 12 14:22:12 2017 @@ -20,18 +20,19 @@ import java.io.IOException; import javax.annotation.CheckForNull; import org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationDefaults; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrServer; import org.apache.solr.client.solrj.impl.HttpSolrServer; public class DefaultSolrServerProvider implements SolrServerProvider { - private SolrServer solrServer; - private SolrServer indexingSolrServer; + private SolrClient solrServer; + private SolrClient indexingSolrServer; @CheckForNull @Override - public SolrServer getSolrServer() throws Exception { + public SolrClient getSolrServer() throws Exception { if (solrServer == null) { solrServer = new HttpSolrServer(getUrl()); } @@ -40,7 +41,7 @@ public class DefaultSolrServerProvider i @CheckForNull @Override - public SolrServer getIndexingSolrServer() throws Exception { + public SolrClient getIndexingSolrServer() throws Exception { if (indexingSolrServer == null) { indexingSolrServer = new ConcurrentUpdateSolrServer(getUrl(), 1000, 4); } @@ -49,7 +50,7 @@ public class DefaultSolrServerProvider i @CheckForNull @Override - public SolrServer getSearchingSolrServer() throws Exception { + public SolrClient getSearchingSolrServer() throws Exception { return getSolrServer(); } @@ -62,14 +63,14 @@ public class DefaultSolrServerProvider i @Override public void close() throws IOException { try { - SolrServer solrServer = getSolrServer(); + SolrClient solrServer = getSolrServer(); if (solrServer != null) { solrServer.shutdown(); } } catch (Exception e) { // do nothing } try { - SolrServer indexingSolrServer = getIndexingSolrServer(); + SolrClient indexingSolrServer = getIndexingSolrServer(); if (indexingSolrServer != null) { indexingSolrServer.shutdown(); } Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java Tue Dec 12 14:22:12 2017 @@ -28,6 +28,7 @@ import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.commons.IOUtils; import org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration; import org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationDefaults; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer; import org.apache.solr.client.solrj.embedded.JettySolrRunner; @@ -50,7 +51,7 @@ public class EmbeddedSolrServerProvider this.solrServerConfiguration = solrServerConfiguration; } - private SolrServer createSolrServer() throws Exception { + private SolrClient createSolrServer() throws Exception { log.info("creating new embedded solr server with config: {}", solrServerConfiguration); @@ -75,7 +76,7 @@ public class EmbeddedSolrServerProvider if (log.isInfoEnabled()) { log.info("Jetty runner instantiated"); } - jettySolrRunner.start(true); + jettySolrRunner.start(); if (log.isInfoEnabled()) { log.info("Jetty runner started"); } @@ -235,19 +236,19 @@ public class EmbeddedSolrServerProvider @CheckForNull @Override - public SolrServer getSolrServer() throws Exception { + public SolrClient getSolrServer() throws Exception { return createSolrServer(); } @CheckForNull @Override - public SolrServer getIndexingSolrServer() throws Exception { + public SolrClient getIndexingSolrServer() throws Exception { return getSolrServer(); } @CheckForNull @Override - public SolrServer getSearchingSolrServer() throws Exception { + public SolrClient getSearchingSolrServer() throws Exception { return getSolrServer(); } Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java Tue Dec 12 14:22:12 2017 @@ -22,6 +22,7 @@ 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; import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.SolrServerException; @@ -47,10 +48,10 @@ public class OakSolrServer extends SolrS } @Override - public NamedList<Object> request(SolrRequest request) throws SolrServerException, IOException { + public NamedList<Object> request(SolrRequest request, String collection) throws SolrServerException, IOException { try { - SolrServer server = getServer(request); + SolrClient server = getServer(request); return server.request(request); } catch (Exception e) { @@ -58,10 +59,10 @@ public class OakSolrServer extends SolrS } } - private synchronized SolrServer getServer(SolrRequest request) throws Exception { + private synchronized SolrClient getServer(SolrRequest request) throws Exception { boolean isIndex = request.getPath().contains("/update"); SolrServerRegistry.Strategy strategy = isIndex ? SolrServerRegistry.Strategy.INDEXING : SolrServerRegistry.Strategy.SEARCHING; - SolrServer solrServer = SolrServerRegistry.get(solrServerConfiguration, strategy); + SolrClient solrServer = SolrServerRegistry.get(solrServerConfiguration, strategy); if (solrServer == null) { if (solrServerConfiguration instanceof EmbeddedSolrServerConfiguration) { solrServer = solrServerProvider.getSolrServer(); Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java Tue Dec 12 14:22:12 2017 @@ -18,12 +18,16 @@ package org.apache.jackrabbit.oak.plugin import java.io.File; import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; import javax.annotation.CheckForNull; import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationDefaults; import org.apache.jackrabbit.oak.plugins.index.solr.configuration.RemoteSolrServerConfiguration; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.SolrServerException; +import org.apache.solr.client.solrj.impl.CloudSolrClient; import org.apache.solr.client.solrj.impl.CloudSolrServer; import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrServer; import org.apache.solr.client.solrj.impl.HttpSolrServer; @@ -50,9 +54,9 @@ public class RemoteSolrServerProvider im @CheckForNull @Override - public SolrServer getSolrServer() throws Exception { + public SolrClient getSolrServer() throws Exception { - SolrServer solrServer = null; + SolrClient solrServer = null; if (remoteSolrServerConfiguration.getSolrZkHost() != null && remoteSolrServerConfiguration.getSolrZkHost().length() > 0) { try { solrServer = initializeWithCloudSolrServer(); @@ -77,8 +81,8 @@ public class RemoteSolrServerProvider im @CheckForNull @Override - public SolrServer getIndexingSolrServer() throws Exception { - SolrServer server = getSolrServer(); + public SolrClient getIndexingSolrServer() throws Exception { + SolrClient server = getSolrServer(); if (server instanceof HttpSolrServer) { String url = ((HttpSolrServer) server).getBaseURL(); @@ -93,11 +97,11 @@ public class RemoteSolrServerProvider im @CheckForNull @Override - public SolrServer getSearchingSolrServer() throws Exception { + public SolrClient getSearchingSolrServer() throws Exception { return getSolrServer(); } - private SolrServer initializeWithExistingHttpServer() throws IOException, SolrServerException { + private SolrClient initializeWithExistingHttpServer() throws IOException, SolrServerException { // try basic Solr HTTP client HttpSolrServer httpSolrServer = new HttpSolrServer(remoteSolrServerConfiguration.getSolrHttpUrls()[0]); httpSolrServer.setConnectionTimeout(remoteSolrServerConfiguration.getConnectionTimeout()); @@ -111,9 +115,9 @@ public class RemoteSolrServerProvider im } - private SolrServer initializeWithCloudSolrServer() throws IOException { + private SolrClient initializeWithCloudSolrServer() throws IOException { // try SolrCloud client - CloudSolrServer cloudSolrServer = new CloudSolrServer(remoteSolrServerConfiguration.getSolrZkHost()); + CloudSolrClient cloudSolrServer = new CloudSolrClient(remoteSolrServerConfiguration.getSolrZkHost()); cloudSolrServer.setZkConnectTimeout(remoteSolrServerConfiguration.getConnectionTimeout()); cloudSolrServer.setZkClientTimeout(remoteSolrServerConfiguration.getSocketTimeout()); cloudSolrServer.setIdField(OakSolrConfigurationDefaults.PATH_FIELD_NAME); @@ -162,7 +166,7 @@ public class RemoteSolrServerProvider im } - private boolean connectToZK(CloudSolrServer cloudSolrServer) { + private boolean connectToZK(CloudSolrClient cloudSolrServer) { boolean connected = false; for (int i = 0; i < 3; i++) { try { @@ -181,20 +185,20 @@ public class RemoteSolrServerProvider im return connected; } - private void createCollectionIfNeeded(CloudSolrServer cloudSolrServer) throws SolrServerException { + private void createCollectionIfNeeded(CloudSolrClient cloudSolrServer) throws SolrServerException { String solrCollection = remoteSolrServerConfiguration.getSolrCollection(); try { ZkStateReader zkStateReader = cloudSolrServer.getZkStateReader(); SolrZkClient zkClient = zkStateReader.getZkClient(); if (zkClient.isConnected() && !zkClient.exists("/configs/" + solrCollection, false)) { String solrConfDir = remoteSolrServerConfiguration.getSolrConfDir(); - File dir; + Path dir; if (solrConfDir != null && solrConfDir.length() > 0) { - dir = new File(solrConfDir); + dir = Paths.get(solrConfDir); } else { - dir = new File(getClass().getResource("/solr/oak/conf").getFile()); + dir = Paths.get(getClass().getResource("/solr/oak/conf").getFile()); } - ZkController.uploadConfigDir(zkClient, dir, solrCollection); + cloudSolrServer.uploadConfig(dir, solrCollection); UpdateRequest req = new UpdateRequest("/admin/collections"); req.setParam("action", "CREATE"); req.setParam("numShards", String.valueOf(remoteSolrServerConfiguration.getSolrShardsNo())); Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerProvider.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerProvider.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerProvider.java Tue Dec 12 14:22:12 2017 @@ -19,40 +19,40 @@ package org.apache.jackrabbit.oak.plugin import java.io.Closeable; import javax.annotation.CheckForNull; -import org.apache.solr.client.solrj.SolrServer; +import org.apache.solr.client.solrj.SolrClient; /** - * Provider of {@link org.apache.solr.client.solrj.SolrServer}s instances + * Provider of {@link org.apache.solr.client.solrj.SolrClient}s instances */ public interface SolrServerProvider extends Closeable { /** - * provides an already initialized {@link org.apache.solr.client.solrj.SolrServer} to be used for either searching or + * provides an already initialized {@link org.apache.solr.client.solrj.SolrClient} to be used for either searching or * indexing, or both. * - * @return a {@link org.apache.solr.client.solrj.SolrServer} instance - * @throws Exception if anything goes wrong while initializing the {@link org.apache.solr.client.solrj.SolrServer} + * @return a {@link org.apache.solr.client.solrj.SolrClient} instance + * @throws Exception if anything goes wrong while initializing the {@link org.apache.solr.client.solrj.SolrClient} */ @CheckForNull - SolrServer getSolrServer() throws Exception; + SolrClient getSolrServer() throws Exception; /** - * provides an already initialized {@link org.apache.solr.client.solrj.SolrServer} specifically configured to be + * provides an already initialized {@link org.apache.solr.client.solrj.SolrClient} specifically configured to be * used for indexing. * - * @return a {@link org.apache.solr.client.solrj.SolrServer} instance - * @throws Exception if anything goes wrong while initializing the {@link org.apache.solr.client.solrj.SolrServer} + * @return a {@link org.apache.solr.client.solrj.SolrClient} instance + * @throws Exception if anything goes wrong while initializing the {@link org.apache.solr.client.solrj.SolrClient} */ @CheckForNull - SolrServer getIndexingSolrServer() throws Exception; + SolrClient getIndexingSolrServer() throws Exception; /** - * provides an already initialized {@link org.apache.solr.client.solrj.SolrServer} specifically configured to be + * provides an already initialized {@link org.apache.solr.client.solrj.SolrClient} specifically configured to be * used for searching. * - * @return a {@link org.apache.solr.client.solrj.SolrServer} instance - * @throws Exception if anything goes wrong while initializing the {@link org.apache.solr.client.solrj.SolrServer} + * @return a {@link org.apache.solr.client.solrj.SolrClient} instance + * @throws Exception if anything goes wrong while initializing the {@link org.apache.solr.client.solrj.SolrClient} */ @CheckForNull - SolrServer getSearchingSolrServer() throws Exception; + SolrClient getSearchingSolrServer() throws Exception; } Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerRegistry.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerRegistry.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerRegistry.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerRegistry.java Tue Dec 12 14:22:12 2017 @@ -22,6 +22,7 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfiguration; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServer; /** @@ -29,10 +30,10 @@ import org.apache.solr.client.solrj.Solr */ public class SolrServerRegistry { - private static final Map<String, SolrServer> searchingServerRegistry = new HashMap<String, SolrServer>(); - private static final Map<String, SolrServer> indexingServerRegistry = new HashMap<String, SolrServer>(); + private static final Map<String, SolrClient> searchingServerRegistry = new HashMap<String, SolrClient>(); + private static final Map<String, SolrClient> indexingServerRegistry = new HashMap<String, SolrClient>(); - public static void register(@Nonnull SolrServerConfiguration configuration, @Nonnull SolrServer solrServer, + public static void register(@Nonnull SolrServerConfiguration configuration, @Nonnull SolrClient solrServer, @Nonnull Strategy strategy) { switch (strategy) { case INDEXING: @@ -49,7 +50,7 @@ public class SolrServerRegistry { } @CheckForNull - public static SolrServer get(@Nonnull SolrServerConfiguration configuration, @Nonnull Strategy strategy) { + public static SolrClient get(@Nonnull SolrServerConfiguration configuration, @Nonnull Strategy strategy) { switch (strategy) { case INDEXING: synchronized (indexingServerRegistry) { @@ -67,7 +68,7 @@ public class SolrServerRegistry { switch (strategy) { case INDEXING: synchronized (indexingServerRegistry) { - SolrServer removed = indexingServerRegistry.remove(configuration.toString()); + SolrClient removed = indexingServerRegistry.remove(configuration.toString()); try { removed.shutdown(); } catch (Exception e) { @@ -77,7 +78,7 @@ public class SolrServerRegistry { break; case SEARCHING: synchronized (searchingServerRegistry) { - SolrServer removed = searchingServerRegistry.remove(configuration.toString()); + SolrClient removed = searchingServerRegistry.remove(configuration.toString()); try { removed.shutdown(); } catch (Exception e) { Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml Tue Dec 12 14:22:12 2017 @@ -919,18 +919,6 @@ --> </requestHandler> - <!-- for back compat with clients using /update/json and /update/csv --> - <requestHandler name="/update/json" class="solr.UpdateRequestHandler"> - <lst name="defaults"> - <str name="stream.contentType">application/json</str> - </lst> - </requestHandler> - <requestHandler name="/update/csv" class="solr.UpdateRequestHandler"> - <lst name="defaults"> - <str name="stream.contentType">application/csv</str> - </lst> - </requestHandler> - <!-- Solr Cell Update Request Handler http://wiki.apache.org/solr/ExtractingRequestHandler Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java Tue Dec 12 14:22:12 2017 @@ -35,6 +35,7 @@ import org.apache.jackrabbit.oak.plugins 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.SolrServer; public class SolrOakRepositoryStub extends OakSegmentTarRepositoryStub { @@ -48,7 +49,7 @@ public class SolrOakRepositoryStub exten protected void preCreateRepository(Jcr jcr) { String path = getClass().getResource("/").getFile() + "/queryjcrtest" ; File f = new File(path); - final SolrServer solrServer; + final SolrClient solrServer; try { solrServer = new EmbeddedSolrServerProvider(new EmbeddedSolrServerConfiguration(f.getPath(), "oak")).getSolrServer(); } catch (Exception e) { @@ -62,17 +63,17 @@ public class SolrOakRepositoryStub exten @CheckForNull @Override - public SolrServer getSolrServer() throws Exception { + public SolrClient getSolrServer() throws Exception { return solrServer; } @Override - public SolrServer getIndexingSolrServer() throws Exception { + public SolrClient getIndexingSolrServer() throws Exception { return solrServer; } @Override - public SolrServer getSearchingSolrServer() throws Exception { + public SolrClient getSearchingSolrServer() throws Exception { return solrServer; } }; Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java Tue Dec 12 14:22:12 2017 @@ -34,6 +34,7 @@ import org.apache.jackrabbit.oak.segment import org.apache.jackrabbit.oak.spi.commit.EditorHook; import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServer; import org.junit.After; import org.junit.Before; @@ -45,7 +46,7 @@ public abstract class SolrBaseTest { protected NodeStore store; protected TestUtils provider; - protected SolrServer server; + protected SolrClient server; protected OakSolrConfiguration configuration; protected EditorHook hook; private ContentRepository repository; Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java Tue Dec 12 14:22:12 2017 @@ -28,6 +28,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationProvider; import org.apache.jackrabbit.oak.plugins.index.solr.server.EmbeddedSolrServerProvider; import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServer; import static org.junit.Assert.assertTrue; @@ -40,7 +41,7 @@ public class TestUtils static final String SOLR_HOME_PATH = "/solr"; - public static SolrServer createSolrServer() { + public static SolrClient createSolrServer() { EmbeddedSolrServerConfiguration configuration = new EmbeddedSolrServerConfiguration( TestUtils.class.getResource(SOLR_HOME_PATH).getFile(), "oak"); EmbeddedSolrServerProvider provider = new EmbeddedSolrServerProvider(configuration); @@ -84,25 +85,25 @@ public class TestUtils }; } - private final SolrServer solrServer = createSolrServer(); + private final SolrClient solrServer = createSolrServer(); private final OakSolrConfiguration configuration = getTestConfiguration(); @CheckForNull @Override - public SolrServer getSolrServer() { + public SolrClient getSolrServer() { return solrServer; } @CheckForNull @Override - public SolrServer getIndexingSolrServer() throws Exception { + public SolrClient getIndexingSolrServer() throws Exception { return solrServer; } @CheckForNull @Override - public SolrServer getSearchingSolrServer() throws Exception { + public SolrClient getSearchingSolrServer() throws Exception { return solrServer; } Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java Tue Dec 12 14:22:12 2017 @@ -56,53 +56,53 @@ public class DefaultAnalyzersConfigurati public void setUp() throws Exception { this.exactPathAnalyzer = new Analyzer() { @Override - protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - Tokenizer source = new KeywordTokenizer(reader); + protected TokenStreamComponents createComponents(String fieldName) { + Tokenizer source = new KeywordTokenizer(); return new TokenStreamComponents(source); } }; this.parentPathIndexingAnalyzer = new Analyzer() { @Override - protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - Tokenizer source = new KeywordTokenizer(reader); + protected TokenStreamComponents createComponents(String fieldName) { + Tokenizer source = new KeywordTokenizer(); return new TokenStreamComponents(source); } }; this.parentPathSearchingAnalyzer = new Analyzer() { @Override - protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - Tokenizer source = new KeywordTokenizer(reader); - TokenStream filter = new ReverseStringFilter(Version.LUCENE_47, source); + protected TokenStreamComponents createComponents(String fieldName) { + Tokenizer source = new KeywordTokenizer(); + TokenStream filter = new ReverseStringFilter(source); filter = new PatternReplaceFilter(filter, Pattern.compile("[^\\/]+\\/"), "", false); - filter = new ReverseStringFilter(Version.LUCENE_47, filter); + filter = new ReverseStringFilter(filter); return new TokenStreamComponents(source, filter); } }; this.directChildrenPathIndexingAnalyzer = new Analyzer() { @Override - protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - Tokenizer source = new KeywordTokenizer(reader); - TokenStream filter = new ReverseStringFilter(Version.LUCENE_47, source); - filter = new LengthFilter(Version.LUCENE_47, filter, 2, Integer.MAX_VALUE); + protected TokenStreamComponents createComponents(String fieldName) { + Tokenizer source = new KeywordTokenizer(); + TokenStream filter = new ReverseStringFilter(source); + filter = new LengthFilter(filter, 2, Integer.MAX_VALUE); filter = new PatternReplaceFilter(filter, Pattern.compile("([^\\/]+)(\\/)"), "$2", false); filter = new PatternReplaceFilter(filter, Pattern.compile("(\\/)(.+)"), "$2", false); - filter = new ReverseStringFilter(Version.LUCENE_47, filter); + filter = new ReverseStringFilter(filter); return new TokenStreamComponents(source, filter); } }; this.directChildrenPathSearchingAnalyzer = new Analyzer() { @Override - protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - Tokenizer source = new KeywordTokenizer(reader); + protected TokenStreamComponents createComponents(String fieldName) { + Tokenizer source = new KeywordTokenizer(); return new TokenStreamComponents(source); } }; this.allChildrenPathIndexingAnalyzer = new Analyzer() { @Override - protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - Tokenizer source = new PathHierarchyTokenizer(reader); + protected TokenStreamComponents createComponents(String fieldName) { + Tokenizer source = new PathHierarchyTokenizer(); TokenStream filter = new PatternCaptureGroupTokenFilter(source, false, Pattern.compile("((\\/).*)")); filter = new RemoveDuplicatesTokenFilter(filter); return new TokenStreamComponents(source, filter); @@ -110,8 +110,8 @@ public class DefaultAnalyzersConfigurati }; this.allChildrenPathSearchingAnalyzer = new Analyzer() { @Override - protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - Tokenizer source = new KeywordTokenizer(reader); + protected TokenStreamComponents createComponents(String fieldName) { + Tokenizer source = new KeywordTokenizer(); return new TokenStreamComponents(source); } }; Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java Tue Dec 12 14:22:12 2017 @@ -30,6 +30,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.response.QueryResponse; @@ -46,7 +47,7 @@ public class SolrIndexEditorTest { @Test public void testIndexedProperties() throws Exception { - SolrServer solrServer = TestUtils.createSolrServer(); + SolrClient solrServer = TestUtils.createSolrServer(); OakSolrConfiguration configuration = TestUtils.getTestConfiguration(); IndexUpdateCallback callback = mock(IndexUpdateCallback.class); SolrIndexEditor solrIndexEditor = new SolrIndexEditor(solrServer, configuration, callback); @@ -67,7 +68,7 @@ public class SolrIndexEditorTest { @Test public void testIgnoredPropertiesNotIndexed() throws Exception { NodeBuilder builder = mock(NodeBuilder.class); - SolrServer solrServer = TestUtils.createSolrServer(); + SolrClient solrServer = TestUtils.createSolrServer(); OakSolrConfiguration configuration = new DefaultSolrConfiguration() { @Nonnull @Override Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java Tue Dec 12 14:22:12 2017 @@ -41,7 +41,7 @@ import org.apache.jackrabbit.oak.spi.que import org.apache.jackrabbit.oak.spi.query.QueryIndex; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; -import org.apache.solr.client.solrj.SolrServer; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocumentList; @@ -349,7 +349,7 @@ public class SolrQueryIndexTest { SelectorImpl selector = newSelector(root, "a"); String sqlQuery = "select [jcr:path], [jcr:score] from [nt:base] as a where" + " contains([jcr:content/*], 'founded')"; - SolrServer solrServer = mock(SolrServer.class); + SolrClient solrServer = mock(SolrClient.class); SolrServerProvider solrServerProvider = mock(SolrServerProvider.class); when(solrServerProvider.getSearchingSolrServer()).thenReturn(solrServer); OakSolrConfigurationProvider configurationProvider = mock(OakSolrConfigurationProvider.class); @@ -396,7 +396,7 @@ public class SolrQueryIndexTest { String query = "select * from [nt:base] as a where native('solr','select?q=searchKeywords:\"foo\"^20 text:\"foo\"^1 " + "description:\"foo\"^8 something:\"foo\"^3 headline:\"foo\"^5 title:\"foo\"^10 &q.op=OR'"; String sqlQuery = "select * from [nt:base] a where native('solr','" + query + "'"; - SolrServer solrServer = mock(SolrServer.class); + SolrClient solrServer = mock(SolrClient.class); SolrServerProvider solrServerProvider = mock(SolrServerProvider.class); when(solrServerProvider.getSearchingSolrServer()).thenReturn(solrServer); OakSolrConfigurationProvider configurationProvider = mock(OakSolrConfigurationProvider.class); Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java Tue Dec 12 14:22:12 2017 @@ -16,7 +16,13 @@ */ package org.apache.jackrabbit.oak.plugins.index.solr.server; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.net.URI; + import org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.response.SolrPingResponse; import org.junit.Test; @@ -31,9 +37,11 @@ public class EmbeddedSolrServerProviderT @Test public void testEmbeddedSolrServerInitialization() throws Exception { - EmbeddedSolrServerConfiguration solrServerConfiguration = new EmbeddedSolrServerConfiguration(getClass().getResource("/solr").getFile(), "oak"); + URI uri = getClass().getResource("/solr").toURI(); + File file = new File(uri); + EmbeddedSolrServerConfiguration solrServerConfiguration = new EmbeddedSolrServerConfiguration(file.getAbsolutePath(), "oak"); EmbeddedSolrServerProvider embeddedSolrServerProvider = new EmbeddedSolrServerProvider(solrServerConfiguration); - SolrServer solrServer = embeddedSolrServerProvider.getSolrServer(); + SolrClient solrServer = embeddedSolrServerProvider.getSolrServer(); assertNotNull(solrServer); SolrPingResponse ping = solrServer.ping(); assertNotNull(ping); Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProviderIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProviderIT.java?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProviderIT.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProviderIT.java Tue Dec 12 14:22:12 2017 @@ -18,7 +18,9 @@ package org.apache.jackrabbit.oak.plugins.index.solr.server; import org.apache.jackrabbit.oak.plugins.index.solr.configuration.RemoteSolrServerConfiguration; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServer; +import org.apache.solr.client.solrj.impl.CloudSolrClient; import org.apache.solr.client.solrj.impl.CloudSolrServer; import org.apache.solr.client.solrj.request.UpdateRequest; import org.apache.solr.common.util.NamedList; @@ -42,7 +44,7 @@ public class RemoteSolrServerProviderIT req.setParam("numShards", "2"); req.setParam("replicationFactor", "2"); req.setParam("collection.configName", "myconf"); - CloudSolrServer cloudSolrServer = new CloudSolrServer(host); + CloudSolrClient cloudSolrServer = new CloudSolrClient(host); cloudSolrServer.setZkConnectTimeout(1000); NamedList<Object> request = cloudSolrServer.request(req); return request != null && request.get("success") != null; @@ -62,9 +64,9 @@ public class RemoteSolrServerProviderIT String collection = "sample_" + System.nanoTime(); RemoteSolrServerProvider remoteSolrServerProvider = new RemoteSolrServerProvider( new RemoteSolrServerConfiguration(host, collection, 2, 2, null, 10, 10, null)); - SolrServer solrServer = remoteSolrServerProvider.getSolrServer(); + SolrClient solrServer = remoteSolrServerProvider.getSolrServer(); assertNotNull(solrServer); - solrServer.shutdown(); + solrServer.close(); break; } } Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/conf/solrconfig.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/conf/solrconfig.xml?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/conf/solrconfig.xml (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/conf/solrconfig.xml Tue Dec 12 14:22:12 2017 @@ -968,18 +968,6 @@ current implementation relies on the upd --> </requestHandler> - <!-- for back compat with clients using /update/json and /update/csv --> - <requestHandler name="/update/json" class="solr.JsonUpdateRequestHandler"> - <lst name="defaults"> - <str name="stream.contentType">application/json</str> - </lst> - </requestHandler> - <requestHandler name="/update/csv" class="solr.CSVRequestHandler"> - <lst name="defaults"> - <str name="stream.contentType">application/csv</str> - </lst> - </requestHandler> - <!-- Solr Cell Update Request Handler http://wiki.apache.org/solr/ExtractingRequestHandler Modified: jackrabbit/oak/trunk/oak-solr-osgi/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-osgi/pom.xml?rev=1817919&r1=1817918&r2=1817919&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-osgi/pom.xml (original) +++ jackrabbit/oak/trunk/oak-solr-osgi/pom.xml Tue Dec 12 14:22:12 2017 @@ -53,6 +53,7 @@ org.joda.time.*;resolution:=optional, org.eclipse.*;resolution:=optional, javax.servlet.*;resolution:=optional, + com.tdunning.math.*;resolution:=optional, * </Import-Package> <Embed-Dependency>*;scope=runtime;inline=true</Embed-Dependency> @@ -103,7 +104,7 @@ <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-core</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -119,19 +120,19 @@ <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-solrj</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.noggit</groupId> <artifactId>noggit</artifactId> - <version>0.5</version> + <version>0.6</version> <scope>runtime</scope> </dependency> <dependency> <groupId>com.carrotsearch</groupId> <artifactId>hppc</artifactId> - <version>0.5.2</version> + <version>0.7.1</version> <scope>runtime</scope> </dependency> @@ -140,74 +141,74 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-analyzers-common</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-queryparser</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-queries</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-misc</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-highlighter</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-sandbox</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-grouping</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-join</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-suggest</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-spatial</artifactId> - <version>${lucene.version}</version> + <version>${solr.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>com.spatial4j</groupId> <artifactId>spatial4j</artifactId> - <version>0.4.1</version> + <version>0.5</version> <scope>runtime</scope> </dependency> @@ -226,25 +227,43 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.3.6</version> + <version>4.4.1</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.3.3</version> + <version>4.4.1</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>4.3.6</version> + <version>4.4.1</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.5</version> + <version>3.4.6</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>2.5.4</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-smile</artifactId> + <version>2.5.4</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-exec</artifactId> + <version>1.3</version> <scope>runtime</scope> </dependency> </dependencies>