From 645ebaa22bd22e6dc2dd324c65857688e78fd94d Mon Sep 17 00:00:00 2001 From: AbeleMM Date: Sun, 24 Apr 2022 21:35:40 +0200 Subject: [PATCH 1/5] Disable scala-steward for all library dependencies --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index 90ec3c8..5140034 100644 --- a/build.sbt +++ b/build.sbt @@ -20,6 +20,7 @@ lazy val log4jVersion = "2.14.1" lazy val scalatestVersion = "3.2.11" libraryDependencies ++= Seq( + // 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", From f70d361f9212ec0320d15c9c024da7e554377c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abele=20M=C4=83lan?= <6689720+AbeleMM@users.noreply.github.com> Date: Sun, 24 Apr 2022 22:01:23 +0200 Subject: [PATCH 2/5] Upgrade multiple dependencies (#205) --- build.sbt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 5140034..8a6add1 100644 --- a/build.sbt +++ b/build.sbt @@ -15,8 +15,8 @@ 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 kafkaVersion = "3.1.0" +lazy val log4jVersion = "2.17.2" lazy val scalatestVersion = "3.2.11" libraryDependencies ++= Seq( @@ -32,16 +32,16 @@ libraryDependencies ++= Seq( "org.apache.flink" % "flink-core" % flinkVersion classifier "tests", "org.apache.zookeeper" % "zookeeper" % "3.7.0", - "io.dropwizard.metrics" % "metrics-core" % "4.1.31" % Test, + "io.dropwizard.metrics" % "metrics-core" % "4.2.9" % Test, "org.scalactic" %% "scalactic" % scalatestVersion % Test, "org.scalatest" %% "scalatest" % scalatestVersion % Test, - "org.mockito" %% "mockito-scala" % "1.16.55" % 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.10.2", + "org.apache.avro" % "avro" % "1.11.0", "org.apache.flink" %% "flink-table-api-scala-bridge" % flinkVersion, "org.apache.flink" %% "flink-table-planner-blink" % flinkVersion, From ca135dd7f4f1e488c2121c245fb6c90424e6a67d Mon Sep 17 00:00:00 2001 From: AbeleMM Date: Sun, 24 Apr 2022 22:19:59 +0200 Subject: [PATCH 3/5] Fix deprecation warnings --- .../scala/org/kafkaquery/commands/QueryCommandTest.scala | 2 +- src/test/scala/org/kafkaquery/parsers/ParserTest.scala | 6 +++--- .../scala/org/kafkaquery/transforms/QueryOutputTest.scala | 4 ++-- .../org/kafkaquery/util/KafkaRecordRetrieverTest.scala | 2 +- .../scala/org/kafkaquery/util/UserInputRetrieverTest.scala | 2 -- .../org/kafkaquery/util/ZookeeperSchemaExposerTest.scala | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/test/scala/org/kafkaquery/commands/QueryCommandTest.scala b/src/test/scala/org/kafkaquery/commands/QueryCommandTest.scala index f41c90d..2fac7ff 100644 --- a/src/test/scala/org/kafkaquery/commands/QueryCommandTest.scala +++ b/src/test/scala/org/kafkaquery/commands/QueryCommandTest.scala @@ -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 diff --git a/src/test/scala/org/kafkaquery/parsers/ParserTest.scala b/src/test/scala/org/kafkaquery/parsers/ParserTest.scala index aeca103..a3ffc6a 100644 --- a/src/test/scala/org/kafkaquery/parsers/ParserTest.scala +++ b/src/test/scala/org/kafkaquery/parsers/ParserTest.scala @@ -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 @@ -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_)) } } diff --git a/src/test/scala/org/kafkaquery/transforms/QueryOutputTest.scala b/src/test/scala/org/kafkaquery/transforms/QueryOutputTest.scala index 55ca619..ca02806 100644 --- a/src/test/scala/org/kafkaquery/transforms/QueryOutputTest.scala +++ b/src/test/scala/org/kafkaquery/transforms/QueryOutputTest.scala @@ -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 diff --git a/src/test/scala/org/kafkaquery/util/KafkaRecordRetrieverTest.scala b/src/test/scala/org/kafkaquery/util/KafkaRecordRetrieverTest.scala index 048c6ce..37f023c 100644 --- a/src/test/scala/org/kafkaquery/util/KafkaRecordRetrieverTest.scala +++ b/src/test/scala/org/kafkaquery/util/KafkaRecordRetrieverTest.scala @@ -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 diff --git a/src/test/scala/org/kafkaquery/util/UserInputRetrieverTest.scala b/src/test/scala/org/kafkaquery/util/UserInputRetrieverTest.scala index d127ea5..d0f5b9f 100644 --- a/src/test/scala/org/kafkaquery/util/UserInputRetrieverTest.scala +++ b/src/test/scala/org/kafkaquery/util/UserInputRetrieverTest.scala @@ -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 { diff --git a/src/test/scala/org/kafkaquery/util/ZookeeperSchemaExposerTest.scala b/src/test/scala/org/kafkaquery/util/ZookeeperSchemaExposerTest.scala index 0cb459c..8aff9ce 100644 --- a/src/test/scala/org/kafkaquery/util/ZookeeperSchemaExposerTest.scala +++ b/src/test/scala/org/kafkaquery/util/ZookeeperSchemaExposerTest.scala @@ -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} From 78719d5a62b5b043b99a7bc07aa4163607381e4d Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 24 Apr 2022 22:57:50 +0200 Subject: [PATCH 4/5] Update scala-library to 2.12.15 (#148) Co-authored-by: AbeleMM --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8a6add1..3e91c76 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "kafkaquery" -scalaVersion := "2.12.12" +scalaVersion := "2.12.15" scalacOptions ++= Seq( "-deprecation", From c9ee6d427f56aebea8828bea4cdaa68dfe2c6397 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 25 Apr 2022 00:10:47 +0200 Subject: [PATCH 5/5] Update scala-library to 2.13.8 --- build.sbt | 69 +++++++++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 38 deletions(-) diff --git a/build.sbt b/build.sbt index 3e91c76..ff12541 100644 --- a/build.sbt +++ b/build.sbt @@ -1,10 +1,11 @@ name := "kafkaquery" -scalaVersion := "2.12.15" +scalaVersion := "2.13.8" scalacOptions ++= Seq( "-deprecation", - "-encoding", "UTF-8", + "-encoding", + "UTF-8", "-feature", "-unchecked", "-language:higherKinds" @@ -14,45 +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 = "3.1.0" -lazy val log4jVersion = "2.17.2" -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.11" libraryDependencies ++= Seq( // 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, + "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