BIGTOP-4494. Fix compilation error of TestPing.groovy of test-artifacts (#1374)
diff --git a/bigtop-tests/smoke-tests/build.gradle b/bigtop-tests/smoke-tests/build.gradle
index 2b72918..011e550 100644
--- a/bigtop-tests/smoke-tests/build.gradle
+++ b/bigtop-tests/smoke-tests/build.gradle
@@ -30,7 +30,7 @@
ext.groovyVersion = '2.5.4'
ext.hadoopVersion = '2.7.4'
ext.hbaseVersion = '1.1.9'
- ext.solrVersion = '4.6.0'
+ ext.solrVersion = '8.11.4'
ext.slf4jVersion = '1.6.6'
// itest needs be greater than or equal to = 1.0.0
ext.itestVersion = '1.0.0' // Might need to be able to read an input for alternate version?
diff --git a/bigtop-tests/test-artifacts/solr/src/main/groovy/org/apache/bigtop/itest/solr/smoke/TestIndexingSolrJ.groovy b/bigtop-tests/test-artifacts/solr/src/main/groovy/org/apache/bigtop/itest/solr/smoke/TestIndexingSolrJ.groovy
index db09e30..e86cc6f 100644
--- a/bigtop-tests/test-artifacts/solr/src/main/groovy/org/apache/bigtop/itest/solr/smoke/TestIndexingSolrJ.groovy
+++ b/bigtop-tests/test-artifacts/solr/src/main/groovy/org/apache/bigtop/itest/solr/smoke/TestIndexingSolrJ.groovy
@@ -20,7 +20,7 @@
import org.apache.solr.client.solrj.SolrQuery
import org.apache.solr.client.solrj.SolrRequest
import org.apache.solr.client.solrj.SolrServerException
-import org.apache.solr.client.solrj.impl.HttpSolrServer
+import org.apache.solr.client.solrj.impl.HttpSolrClient
import org.apache.solr.client.solrj.response.QueryResponse
import org.apache.solr.common.SolrDocument
import org.apache.solr.common.SolrDocumentList
@@ -41,18 +41,18 @@
*/
class TestIndexingSolrJ extends SolrTestBase {
- HttpSolrServer _server
+ HttpSolrClient _client
@Before
public void before2() {
- _server = new HttpSolrServer(_baseURL)
+ _client = new HttpSolrClient.Builder(_baseURL).build()
}
@After
public void after2() {
- if (_server != null) {
- _server.shutdown()
- _server = null
+ if (_client != null) {
+ _client.close()
+ _client = null
}
}
@@ -68,8 +68,8 @@
doc.addField("id", "two")
doc.addField("name", "Another document two")
docs.add(doc)
- _server.add(docs)
- _server.commit()
+ _client.add(docs)
+ _client.commit()
doQuery("*:*", "one", "two")
// Now see if we can search them.
@@ -81,7 +81,7 @@
SolrQuery query = new SolrQuery()
query.setQuery(queryString)
query.setRows(1000)
- QueryResponse qr = _server.query(query, SolrRequest.METHOD.POST)
+ QueryResponse qr = _client.query(query, SolrRequest.METHOD.POST)
Object o = qr.getHeader().get("status")
Assert.assertEquals(0, qr.getHeader().get("status"))
diff --git a/pom.xml b/pom.xml
index 50f7b54..0e599e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<hadoop.version>2.7.3</hadoop.version>
<hbase.version>1.1.9</hbase.version>
<zookeeper.version>3.4.6</zookeeper.version>
- <solr.version>4.10.4</solr.version>
+ <solr.version>8.11.4</solr.version>
<spark.version>2.1.0</spark.version>
<kafka.version>0.10.1.1</kafka.version>
<phoenix.version>4.9.0-HBase-1.1</phoenix.version>
