This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new 040fb8963 upgrade to solr 8 (#446)
040fb8963 is described below
commit 040fb8963e6d9bb87f9a70103eeba4a89bc55cb3
Author: PJ Fanning <[email protected]>
AuthorDate: Tue Feb 6 13:54:15 2024 +0100
upgrade to solr 8 (#446)
* upgrade to solr 8
* build issue
* fields is deprecated
---
build.sbt | 8 +++++---
project/Dependencies.scala | 7 +++----
solr/src/test/java/docs/javadsl/SolrTest.java | 3 ++-
solr/src/test/scala/docs/scaladsl/SolrSpec.scala | 16 ++++++++--------
4 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/build.sbt b/build.sbt
index 09177edb7..aa2bdcaff 100644
--- a/build.sbt
+++ b/build.sbt
@@ -322,7 +322,9 @@ lazy val eventbridge =
lazy val sns = pekkoConnectorProject("sns", "aws.sns", Dependencies.Sns)
-lazy val solr = pekkoConnectorProject("solr", "solr", Dependencies.Solr)
+// Solrj has some deprecated methods
+lazy val solr = pekkoConnectorProject("solr", "solr", Dependencies.Solr,
+ fatalWarnings := false)
lazy val sqs = pekkoConnectorProject("sqs", "aws.sqs", Dependencies.Sqs)
@@ -385,8 +387,8 @@ lazy val docs = project
"extref.cassandra-driver.base_url" ->
s"https://docs.datastax.com/en/developer/java-driver/${Dependencies.CassandraDriverVersionInDocs}/%s";,
"javadoc.com.datastax.oss.base_url" ->
s"https://docs.datastax.com/en/drivers/java/${Dependencies.CassandraDriverVersionInDocs}/";,
// Solr
- "extref.solr.base_url" ->
s"https://lucene.apache.org/solr/guide/${Dependencies.SolrVersionForDocs}/%s";,
- "javadoc.org.apache.solr.base_url" ->
s"https://lucene.apache.org/solr/${Dependencies.SolrVersionForDocs}_0/solr-solrj/";,
+ "extref.solr.base_url" ->
s"https://solr.apache.org/guide/${Dependencies.SolrVersionForDocs}/%s";,
+ "javadoc.org.apache.solr.base_url" ->
s"https://solr.apache.org/docs/${Dependencies.SolrVersionForDocs}_0/solr-solrj/";,
// Java
"javadoc.base_url" -> "https://docs.oracle.com/javase/8/docs/api/";,
"javadoc.javax.jms.base_url" -> "https://docs.oracle.com/javaee/7/api/";,
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 704f0b63f..abba01c6d 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -429,16 +429,15 @@ object Dependencies {
ExclusionRule("software.amazon.awssdk", "netty-nio-client")),
"org.apache.pekko" %% "pekko-http" % PekkoHttpVersion) ++ Mockito)
- val SolrjVersion = "7.7.3"
- val SolrVersionForDocs = "7_7"
+ val SolrjVersion = "8.11.2"
+ val SolrVersionForDocs = "8_11"
val Solr = Seq(
libraryDependencies ++= Seq(
"org.apache.solr" % "solr-solrj" % SolrjVersion,
("org.apache.solr" % "solr-test-framework" % SolrjVersion %
Test).exclude("org.apache.logging.log4j",
"log4j-slf4j-impl"),
- "org.slf4j" % "log4j-over-slf4j" % log4jOverSlf4jVersion % Test),
- resolvers += "restlet".at("https://maven.restlet.talend.com";))
+ "org.slf4j" % "log4j-over-slf4j" % log4jOverSlf4jVersion % Test))
val Sqs = Seq(
libraryDependencies ++= Seq(
diff --git a/solr/src/test/java/docs/javadsl/SolrTest.java
b/solr/src/test/java/docs/javadsl/SolrTest.java
index 71b01fb61..a853a0881 100644
--- a/solr/src/test/java/docs/javadsl/SolrTest.java
+++ b/solr/src/test/java/docs/javadsl/SolrTest.java
@@ -54,6 +54,7 @@ import org.junit.Test;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.time.Duration;
import java.util.*;
import java.util.concurrent.CompletableFuture;
@@ -839,7 +840,7 @@ public class SolrTest {
File confDir = new File("solr/src/test/resources/conf");
- String zkDir =
testWorkingDir.toPath().resolve("zookeeper/server/data").toString();
+ Path zkDir = testWorkingDir.toPath().resolve("zookeeper/server/data");
zkTestServer = new ZkTestServer(zkDir, zookeeperPort);
zkTestServer.run();
diff --git a/solr/src/test/scala/docs/scaladsl/SolrSpec.scala
b/solr/src/test/scala/docs/scaladsl/SolrSpec.scala
index f38d9e1cb..e1a24c2f9 100644
--- a/solr/src/test/scala/docs/scaladsl/SolrSpec.scala
+++ b/solr/src/test/scala/docs/scaladsl/SolrSpec.scala
@@ -361,7 +361,7 @@ class SolrSpec extends AnyWordSpec with Matchers with
BeforeAndAfterAll with Sca
val deleteDocuments = SolrSource
.fromTupleStream(stream2)
.map { (tuple: Tuple) =>
- val id = tuple.fields.get("title").toString
+ val id = tuple.getFields.get("title").toString
WriteMessage.createDeleteMessage[SolrInputDocument](id)
}
.groupedWithin(5, 10.millis)
@@ -415,8 +415,8 @@ class SolrSpec extends AnyWordSpec with Matchers with
BeforeAndAfterAll with Sca
val updateCollection = SolrSource
.fromTupleStream(stream2)
.map { (tuple: Tuple) =>
- val id = tuple.fields.get("title").toString
- val comment = tuple.fields.get("comment").toString
+ val id = tuple.getFields.get("title").toString
+ val comment = tuple.getFields.get("comment").toString
WriteMessage.createUpdateMessage[SolrInputDocument](
idField = "title",
idValue = id,
@@ -483,7 +483,7 @@ class SolrSpec extends AnyWordSpec with Matchers with
BeforeAndAfterAll with Sca
val deleteElements = SolrSource
.fromTupleStream(stream2)
.map { (tuple: Tuple) =>
- val title = tuple.fields.get("title").toString
+ val title = tuple.getFields.get("title").toString
WriteMessage.createDeleteMessage[Book](title)
}
.groupedWithin(5, 10.millis)
@@ -538,8 +538,8 @@ class SolrSpec extends AnyWordSpec with Matchers with
BeforeAndAfterAll with Sca
WriteMessage
.createUpdateMessage[Book](
idField = "title",
- tuple.fields.get("title").toString,
- updates = Map("comment" -> Map("set" ->
s"${tuple.fields.get("comment")} It is a good book!!!")))
+ tuple.getFields.get("title").toString,
+ updates = Map("comment" -> Map("set" ->
s"${tuple.getFields.get("comment")} It is a good book!!!")))
.withRoutingFieldValue("router-value")
}
.groupedWithin(5, 10.millis)
@@ -602,7 +602,7 @@ class SolrSpec extends AnyWordSpec with Matchers with
BeforeAndAfterAll with Sca
val deleteByQuery = SolrSource
.fromTupleStream(stream2)
.map { (tuple: Tuple) =>
- val title = tuple.fields.get("title").toString
+ val title = tuple.getFields.get("title").toString
WriteMessage.createDeleteByQueryMessage[SolrInputDocument](
s"""title:"$title" """)
}
@@ -729,7 +729,7 @@ class SolrSpec extends AnyWordSpec with Matchers with
BeforeAndAfterAll with Sca
val confDir = new File("solr/src/test/resources/conf")
- val zkDir = testWorkingDir.toPath.resolve("zookeeper/server/data").toString
+ val zkDir = testWorkingDir.toPath.resolve("zookeeper/server/data")
zkTestServer = new ZkTestServer(zkDir, zookeeperPort)
zkTestServer.run()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
