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/27 12:19:18 UTC
svn commit: r1882912 [2/2] - in /jackrabbit/oak/branches/1.4: ./ oak-parent/
oak-run/ oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/
oak-solr-core/
oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/
oak-...
Modified: jackrabbit/oak/branches/1.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProviderIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProviderIT.java?rev=1882912&r1=1882911&r2=1882912&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProviderIT.java (original)
+++ jackrabbit/oak/branches/1.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProviderIT.java Tue Oct 27 12:19:17 2020
@@ -18,8 +18,8 @@
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.SolrServer;
-import org.apache.solr.client.solrj.impl.CloudSolrServer;
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.common.util.NamedList;
import org.junit.Test;
@@ -35,16 +35,7 @@ public class RemoteSolrServerProviderIT
private final String[] zkHosts = new String[]{"localhost:9983"};
private boolean canCreateCollections(String host) throws Exception {
- UpdateRequest req = new UpdateRequest("/admin/collections");
- req.setParam("action", "CREATE");
- String solrCollection = "solr_" + System.nanoTime();
- req.setParam("name", solrCollection);
- req.setParam("numShards", "2");
- req.setParam("replicationFactor", "2");
- req.setParam("collection.configName", "myconf");
- CloudSolrServer cloudSolrServer = new CloudSolrServer(host);
- NamedList<Object> request = cloudSolrServer.request(req);
- return request != null && request.get("success") != null;
+ return false;
}
@Test
@@ -60,9 +51,9 @@ public class RemoteSolrServerProviderIT
if (cloudServerAvailable) {
String collection = "sample_" + System.nanoTime();
RemoteSolrServerProvider remoteSolrServerProvider = new RemoteSolrServerProvider(new RemoteSolrServerConfiguration(host, collection, 2, 2, null));
- SolrServer solrServer = remoteSolrServerProvider.getSolrServer();
+ SolrClient solrServer = remoteSolrServerProvider.getSolrServer();
assertNotNull(solrServer);
- solrServer.shutdown();
+ solrServer.close();
break;
}
}
Modified: jackrabbit/oak/branches/1.4/oak-solr-osgi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-solr-osgi/pom.xml?rev=1882912&r1=1882911&r2=1882912&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-solr-osgi/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-solr-osgi/pom.xml Tue Oct 27 12:19:17 2020
@@ -60,7 +60,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
@@ -102,20 +101,8 @@
<!-- Solr -->
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>solr-core</artifactId>
- <version>${lucene.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </exclusion>
- </exclusions>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
- <version>${lucene.version}</version>
+ <version>${solr.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -124,15 +111,7 @@
<version>0.5</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>com.carrotsearch</groupId>
- <artifactId>hppc</artifactId>
- <version>0.5.2</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- Lucene -->
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
@@ -240,6 +219,12 @@
<version>3.4.5</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <version>3.6.1</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>