Skip to content

Commit 3948d48

Browse files
committed
chore: 13 dependency updates for mongodb-driver
* ch.qos.logback:logback-classic:test : 1.5.5 -> 1.5.11 * com.github.jsqlparser:jsqlparser : 4.9 -> 5.0 * com.github.luben:zstd-jni:provided : 1.5.6-2 -> 1.5.6-6 * io.circe:circe-core : 0.14.6 -> 0.14.10 * io.circe:circe-generic : 0.14.6 -> 0.14.10 * io.circe:circe-parser : 0.14.6 -> 0.14.10 * joda-time:joda-time : 2.12.7 -> 2.13.0 * org.apache.lucene:lucene-queryparser : 9.10.0 -> 10.0.0 * org.liquibase:liquibase-core:test : 4.28.0 -> 4.29.2 * org.mongodb.scala:mongo-scala-driver : 5.0.1 -> 5.2.0 * org.scala-lang:scala-library : 2.12.20 -> 2.13.15 * org.specs2:specs2-core:test : 4.20.5 -> 4.20.9 * org.xerial.snappy:snappy-java:provided : 1.1.10.5 -> 1.1.10.7
1 parent 08e247f commit 3948d48

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

build.sbt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html
4242

4343
crossScalaVersions := Seq("2.13.15", "2.12.20")
4444

45-
scalaVersion := crossScalaVersions.value.last
45+
scalaVersion := crossScalaVersions.value.head
4646

4747
scalacOptions += "-deprecation"
4848

@@ -61,27 +61,27 @@ resolvers += "Sonatype OSS Snapshots".at("https://oss.sonatype.org/content/repos
6161

6262
// Test
6363

64-
libraryDependencies += "org.specs2" %% "specs2-core" % "4.20.5" % Test
64+
libraryDependencies += "org.specs2" %% "specs2-core" % "4.20.9" % Test
6565

66-
libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.5.5" % Test
66+
libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.5.11" % Test
6767

68-
libraryDependencies += "joda-time" % "joda-time" % "2.12.7"
68+
libraryDependencies += "joda-time" % "joda-time" % "2.13.0"
6969

70-
val circeVersion = "0.14.6"
70+
val circeVersion = "0.14.10"
7171

7272
libraryDependencies ++= Seq(
7373
"io.circe" %% "circe-core",
7474
"io.circe" %% "circe-generic",
7575
"io.circe" %% "circe-parser"
7676
).map(_ % circeVersion)
7777

78-
libraryDependencies += "org.mongodb.scala" %% "mongo-scala-driver" % "5.0.1"
78+
libraryDependencies += "org.mongodb.scala" %% "mongo-scala-driver" % "5.2.0"
7979

80-
libraryDependencies += "org.xerial.snappy" % "snappy-java" % "1.1.10.5" % Provided
80+
libraryDependencies += "org.xerial.snappy" % "snappy-java" % "1.1.10.7" % Provided
8181

82-
libraryDependencies += "com.github.luben" % "zstd-jni" % "1.5.6-2" % Provided
82+
libraryDependencies += "com.github.luben" % "zstd-jni" % "1.5.6-6" % Provided
8383

84-
libraryDependencies += "org.apache.lucene" % "lucene-queryparser" % "9.10.0"
84+
libraryDependencies += "org.apache.lucene" % "lucene-queryparser" % "10.0.0"
8585

8686
val MongoJavaServerVersion = "1.45.0"
8787

@@ -99,9 +99,9 @@ libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "
9999

100100
libraryDependencies += "com.vdurmont" % "semver4j" % "3.1.0"
101101

102-
libraryDependencies += "com.github.jsqlparser" % "jsqlparser" % "4.9"
102+
libraryDependencies += "com.github.jsqlparser" % "jsqlparser" % "5.0"
103103

104-
libraryDependencies += "org.liquibase" % "liquibase-core" % "4.28.0" % Test
104+
libraryDependencies += "org.liquibase" % "liquibase-core" % "4.29.2" % Test
105105

106106
buildInfoPackage := "dev.mongocamp.driver.mongodb"
107107

src/main/scala/dev/mongocamp/driver/mongodb/lucene/LuceneQueryConverter.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,21 @@ object LuceneQueryConverter extends LazyLogging {
5858
val listOfOr = ArrayBuffer[Map[String, Any]]()
5959
var nextTypeAnd = true
6060
subQueries.foreach(c => {
61-
val queryMap = getMongoDbSearchMap(c.getQuery, c.isProhibited, searchWithValueAndString)
61+
val queryMap = getMongoDbSearchMap(c.query(), c.isProhibited, searchWithValueAndString)
6262
var thisTypeAnd = true
6363

64-
if (c.getOccur == Occur.MUST) {
64+
if (c.occur == Occur.MUST) {
6565
thisTypeAnd = true
6666
}
67-
else if (c.getOccur == Occur.SHOULD) {
67+
else if (c.occur == Occur.SHOULD) {
6868
thisTypeAnd = false
6969
}
70-
else if (c.getOccur == Occur.MUST_NOT) {
70+
else if (c.occur == Occur.MUST_NOT) {
7171
// searchMapResponse ++= queryMap
7272
}
7373
else {
74-
logger.error(s"Unexpected Occur <${c.getOccur.name()}>")
75-
throw new NotSupportedException(s"${c.getOccur.name()} currently not supported")
74+
logger.error(s"Unexpected Occur <${c.occur.name()}>")
75+
throw new NotSupportedException(s"${c.occur.name()} currently not supported")
7676
}
7777

7878
if (nextTypeAnd && thisTypeAnd) {

0 commit comments

Comments
 (0)