thanks Amit! Il giorno ven 1 dic 2017 alle ore 12:15 <am...@apache.org> ha scritto:
> Author: amitj > Date: Fri Dec 1 11:15:23 2017 > New Revision: 1816834 > > URL: http://svn.apache.org/viewvc?rev=1816834&view=rev > Log: > OAK-4318: Upgrade oak-solr to Solr 5.x > > - Tentatively fixed with updating solr-core dependency to solr.version and > converting SolrServer to SolrClient > > Modified: > jackrabbit/oak/trunk/oak-benchmarks/pom.xml > > jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java > > Modified: jackrabbit/oak/trunk/oak-benchmarks/pom.xml > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/pom.xml?rev=1816834&r1=1816833&r2=1816834&view=diff > > ============================================================================== > --- jackrabbit/oak/trunk/oak-benchmarks/pom.xml (original) > +++ jackrabbit/oak/trunk/oak-benchmarks/pom.xml Fri Dec 1 11:15:23 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=1816834&r1=1816833&r2=1816834&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 > Fri Dec 1 11:15:23 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(); > } > > >