Author: tommaso
Date: Tue Feb 6 12:23:04 2018
New Revision: 1823318
URL: http://svn.apache.org/viewvc?rev=1823318&view=rev
Log:
OAK-4318 - fixed oak-run build
Modified:
jackrabbit/oak/branches/1.6/oak-run/pom.xml
jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
jackrabbit/oak/branches/1.6/oak-solr-core/pom.xml
Modified: jackrabbit/oak/branches/1.6/oak-run/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-run/pom.xml?rev=1823318&r1=1823317&r2=1823318&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-run/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-run/pom.xml Tue Feb 6 12:23:04 2018
@@ -226,18 +226,69 @@
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>${lucene.version}</version>
- </dependency>
- <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>
<artifactId>lucene-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-deploy</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-rewrite</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-xml</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified:
jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java?rev=1823318&r1=1823317&r2=1823318&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
Tue Feb 6 12:23:04 2018
@@ -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;
@@ -98,7 +98,8 @@ public class FullTextSolrSearchTest exte
serverProvider = createEmbeddedSolrServerProvider(false);
} else 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, server);
+ RemoteSolrServerConfiguration remoteSolrServerConfiguration = new
RemoteSolrServerConfiguration(
+ server, "oak", 2, 2, null, 10, 10, server);
serverProvider = remoteSolrServerConfiguration.getProvider();
} else {
throw new IllegalArgumentException("server parameter value must be
either 'embedded', 'default', an URL or an host:port String");
@@ -113,13 +114,13 @@ 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");
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\"/>");
+ "<dynamicField name=\"*\" type=\"text_general\"
indexed=\"true\" stored=\"false\" multiValued=\"true\"/>");
FileOutputStream fileOutputStream = new
FileOutputStream(schemaXML);
IOUtils.copy(new StringReader(schemaString), fileOutputStream);
fileOutputStream.flush();
@@ -130,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/branches/1.6/oak-solr-core/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-solr-core/pom.xml?rev=1823318&r1=1823317&r2=1823318&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-solr-core/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-solr-core/pom.xml Tue Feb 6 12:23:04 2018
@@ -187,24 +187,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${solr.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>${solr.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${solr.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
<version>${tika.version}</version>
