Skip to content

Update scalatest to 3.2.12 #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scala-steward wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update scalatest to 3.2.12 #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
645ebaa
Disable scala-steward for all library dependencies
AbeleMM Apr 24, 2022
f70d361
Upgrade multiple dependencies (#205)
AbeleMM Apr 24, 2022
ca135dd
Fix deprecation warnings
AbeleMM Apr 24, 2022
78719d5
Update scala-library to 2.12.15 (#148)
scala-steward Apr 24, 2022
df14de3
Update scalatest to 3.2.12
scala-steward Apr 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 32 additions & 38 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
name := "kafkaquery"

scalaVersion := "2.12.12"
scalaVersion := "2.12.15"

scalacOptions ++= Seq(
"-deprecation",
"-encoding", "UTF-8",
"-encoding",
"UTF-8",
"-feature",
"-unchecked",
"-language:higherKinds"
Expand All @@ -14,44 +15,37 @@ enablePlugins(PackPlugin)
packMain := Map(name.value -> "org.kafkaquery.CLI")
packExtraClasspath := Map(name.value -> Seq("${PROG_HOME}/udf_dependencies/*"))

lazy val flinkVersion = "1.12.7"
lazy val kafkaVersion = "2.8.1"
lazy val log4jVersion = "2.14.1"
lazy val scalatestVersion = "3.2.11"
lazy val flinkVersion = "1.12.7"
lazy val kafkaVersion = "3.1.0"
lazy val log4jVersion = "2.17.2"
lazy val scalatestVersion = "3.2.12"

libraryDependencies ++= Seq(
"org.apache.logging.log4j" % "log4j-api" % log4jVersion,
"org.apache.logging.log4j" % "log4j-core" % log4jVersion % Runtime,
"org.apache.logging.log4j" %% "log4j-api-scala" % "12.0",

"org.apache.flink" %% "flink-scala" % flinkVersion,
"org.apache.flink" %% "flink-streaming-scala" % flinkVersion,
"org.apache.flink" %% "flink-connector-kafka" % flinkVersion,
"org.apache.flink" %% "flink-clients" % flinkVersion,
"org.apache.flink" % "flink-core" % flinkVersion classifier "tests",

"org.apache.zookeeper" % "zookeeper" % "3.7.0",
"io.dropwizard.metrics" % "metrics-core" % "4.1.31" % Test,

"org.scalactic" %% "scalactic" % scalatestVersion % Test,
"org.scalatest" %% "scalatest" % scalatestVersion % Test,
"org.mockito" %% "mockito-scala" % "1.16.55" % Test,

"org.apache.kafka" % "kafka-clients" % kafkaVersion,
"io.github.embeddedkafka" %% "embedded-kafka" % kafkaVersion % Test,

"org.apache.avro" % "avro" % "1.10.2",

"org.apache.flink" %% "flink-table-api-scala-bridge" % flinkVersion,
"org.apache.flink" %% "flink-table-planner-blink" % flinkVersion,
"org.apache.flink" % "flink-json" % flinkVersion,

"org.apache.flink" %% "flink-test-utils" % flinkVersion % Test,
"org.apache.flink" %% "flink-runtime" % flinkVersion % Test classifier "tests",
"org.apache.flink" %% "flink-streaming-java" % flinkVersion % Test classifier "tests",

"com.github.scopt" %% "scopt" % "4.0.1",
"com.sksamuel.avro4s" %% "avro4s-core" % "4.0.12" % Test,
// scala-steward:off
"org.apache.logging.log4j" % "log4j-api" % log4jVersion,
"org.apache.logging.log4j" % "log4j-core" % log4jVersion % Runtime,
"org.apache.logging.log4j" %% "log4j-api-scala" % "12.0",
"org.apache.flink" %% "flink-scala" % flinkVersion,
"org.apache.flink" %% "flink-streaming-scala" % flinkVersion,
"org.apache.flink" %% "flink-connector-kafka" % flinkVersion,
"org.apache.flink" %% "flink-clients" % flinkVersion,
"org.apache.flink" % "flink-core" % flinkVersion classifier "tests",
"org.apache.zookeeper" % "zookeeper" % "3.7.0",
"io.dropwizard.metrics" % "metrics-core" % "4.2.9" % Test,
"org.scalactic" %% "scalactic" % scalatestVersion % Test,
"org.scalatest" %% "scalatest" % scalatestVersion % Test,
"org.mockito" %% "mockito-scala" % "1.17.5" % Test,
"org.apache.kafka" % "kafka-clients" % kafkaVersion,
"io.github.embeddedkafka" %% "embedded-kafka" % kafkaVersion % Test,
"org.apache.avro" % "avro" % "1.11.0",
"org.apache.flink" %% "flink-table-api-scala-bridge" % flinkVersion,
"org.apache.flink" %% "flink-table-planner-blink" % flinkVersion,
"org.apache.flink" % "flink-json" % flinkVersion,
"org.apache.flink" %% "flink-test-utils" % flinkVersion % Test,
"org.apache.flink" %% "flink-runtime" % flinkVersion % Test classifier "tests",
"org.apache.flink" %% "flink-streaming-java" % flinkVersion % Test classifier "tests",
"com.github.scopt" %% "scopt" % "4.0.1",
"com.sksamuel.avro4s" %% "avro4s-core" % "4.0.12" % Test
)

// Fork all tasks
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/org/kafkaquery/commands/QueryCommandTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package org.kafkaquery.commands
import java.io.{File, PrintWriter}
import java.util
import java.util.Collections
import net.manub.embeddedkafka.{EmbeddedKafka, EmbeddedKafkaConfig}
import io.github.embeddedkafka.{EmbeddedKafka, EmbeddedKafkaConfig}
import org.apache.avro.Schema
import org.apache.flink.runtime.client.JobExecutionException
import org.apache.flink.streaming.api.functions.sink.SinkFunction
Expand Down
6 changes: 3 additions & 3 deletions src/test/scala/org/kafkaquery/parsers/ParserTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package org.kafkaquery.parsers

import java.io.{ByteArrayOutputStream, File, PrintWriter}

import net.manub.embeddedkafka.{EmbeddedKafka, EmbeddedKafkaConfig}
import io.github.embeddedkafka.{EmbeddedKafka, EmbeddedKafkaConfig}
import org.apache.avro.Schema
import org.apache.commons.io.FileUtils
import org.kafkaquery.parsers.Configurations.Mode
Expand Down Expand Up @@ -80,8 +80,8 @@ class ParserTest extends AnyFunSuite with EmbeddedKafka with BeforeAndAfter {
val res = new String(outStream.toByteArray)
val otherOutStream = new java.io.ByteArrayOutputStream
Console.withOut(otherOutStream)(parser.printTopics())
val res2 = new String(outStream.toByteArray)
assert(res.equals(res2))
val res_ = new String(outStream.toByteArray)
assert(res.equals(res_))
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/scala/org/kafkaquery/transforms/QueryOutputTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.kafkaquery.transforms

import net.manub.embeddedkafka.Codecs.stringDeserializer
import net.manub.embeddedkafka.{EmbeddedKafka, EmbeddedKafkaConfig}
import io.github.embeddedkafka.Codecs.stringDeserializer
import io.github.embeddedkafka.{EmbeddedKafka, EmbeddedKafkaConfig}
import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration
import org.apache.flink.streaming.api.scala.{DataStream, StreamExecutionEnvironment, createTypeInformation}
import org.apache.flink.test.util.MiniClusterWithClientResource
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/org/kafkaquery/util/KafkaRecordRetrieverTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.kafkaquery.util

import net.manub.embeddedkafka.{EmbeddedKafka, EmbeddedKafkaConfig}
import io.github.embeddedkafka.{EmbeddedKafka, EmbeddedKafkaConfig}
import org.scalatest.{BeforeAndAfter, BeforeAndAfterAll}
import org.scalatest.funsuite.AnyFunSuite

Expand Down
2 changes: 0 additions & 2 deletions src/test/scala/org/kafkaquery/util/UserInputRetrieverTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package org.kafkaquery.util
import org.mockito.MockitoSugar
import org.scalatest.funsuite.AnyFunSuite

import scala.io.StdIn

class UserInputRetrieverTest extends AnyFunSuite with MockitoSugar {


Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/org/kafkaquery/util/ZookeeperSchemaExposerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.kafkaquery.util

import net.manub.embeddedkafka.{EmbeddedKafka, EmbeddedKafkaConfig}
import io.github.embeddedkafka.{EmbeddedKafka, EmbeddedKafkaConfig}
import org.apache.avro.Schema
import org.scalatest.funsuite.AnyFunSuite
import org.scalatest.{BeforeAndAfter, BeforeAndAfterAll}
Expand Down