Skip to content

Commit

Permalink
Chore/scala steward merge (#1102)
Browse files Browse the repository at this point in the history 
* Update logback-classic, logback-core to 1.5.3

* Update cassandra-driver-core to 3.11.5

* Update testcontainers-scala-cassandra, ... to 0.40.17

* Update sbt-assembly to 2.1.5

* Update google-cloud-storage to 2.36.1

* Update influxdb-client-java to 6.12.0

* Update json-path to 2.9.0

* Update avro4s-core, avro4s-json to 4.1.2

* Update elastic4s-client-esjava, ... to 7.17.4

* Update sbt-license-report to 1.6.1

* Update commons-codec to 1.16.1

* Update commons-io to 2.16.0

* Update sbt-header to 5.10.0

* Update jna to 3.3.0

* Update jna to 4.5.2

* Update activemq-broker, activemq-client to 6.1.0

* Update commons-compress to 1.26.1

* Update connect-json, kafka-clients to 3.7.0

* Update log4j-api to 2.23.1

* Update log4j-to-slf4j to 2.23.1

* Update mina-core to 2.2.3

* Update bcpg-jdk15on, bcpkix-jdk15on, ... to 1.77

* Update elasticsearch to 7.17.19

* Update jersey-common to 3.1.5

* Update mongo-java-driver to 3.12.14

* Update sbt to 1.9.9

* Update scalafmt-core to 2.6.4

* Update scalatest to 3.2.18

* Update sbt-scoverage to 2.0.11

* Update jcl-over-slf4j, log4j-over-slf4j to 2.0.12

* Update cassandra, elasticsearch, kafka, ... to 1.19.7

* Update cats-effect, cats-effect-kernel, ... to 3.4.11

* Update sbt-pack to 0.19

* Update jedis to 4.4.7

* Update s3, sts to 2.25.21

* Update wiremock to 3.5.2

* Formatting

* updating sbt sonatypeOssRepos

* Fix compile issue

* Formatting

* Fixes

* Fix branch name

---------

Co-authored-by: Scala Steward <[email protected]>
  • Loading branch information
@davidsloan @scala-steward
davidsloan and scala-steward authored Apr 2, 2024
1 parent 3ba9b9c commit bce4a33
Show file tree
Hide file tree
Showing 10 changed files with 65 additions and 59 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,10 @@ jobs:
path: ~/**/target/libs/*.jar
key: assembly-${{ matrix.module }}-${{ github.run_id }}
fail-on-cache-miss: true
- name: Extract branch name
shell: bash
run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
id: extract_branch
- name: Dependency Check
uses: dependency-check/Dependency-Check_Action@main
with:
Expand All @@ -226,7 +230,7 @@ jobs:
format: 'HTML'
args: >-
--failOnCVSS 5
--suppression https://raw.githubusercontent.com/lensesio/stream-reactor/chore/update-kafka-versions/suppression.xml
--suppression https://raw.githubusercontent.com/lensesio/stream-reactor/${{ steps.extract_branch.outputs.branch }}/suppression.xml
- name: Upload Test results
uses: actions/upload-artifact@master
with:
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=2.6.1
version=2.6.4
maxColumn = 120
preset = IntelliJ
align.preset = most
Expand Down
3 changes: 2 additions & 1 deletion kafka-connect-mqtt/src/fun/scala/io/lenses/streamreactor/connect/MqttContainer.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import _root_.io.lenses.streamreactor.connect.testcontainers.S3Authentication
import org.testcontainers.containers.GenericContainer
import org.testcontainers.containers.wait.strategy.Wait
import org.testcontainers.utility.DockerImageName
import org.testcontainers.utility.MountableFile

class MqttContainer(
dockerImage: DockerImageName,
Expand All @@ -17,7 +18,7 @@ class MqttContainer(
val identity: S3Authentication = RandomAuthentication(),
) extends GenericContainer[MqttContainer](dockerImage.withTag(dockerTag)) {

withFileSystemBind(this.getClass.getResource("/mosquitto.config").getPath, "/mosquitto/config/mosquitto.conf")
withCopyToContainer(MountableFile.forClasspathResource("/mosquitto.config"), "/mosquitto/config/mosquitto.conf")
withNetworkAliases(networkAlias)
withExposedPorts(port)
waitingFor(Wait.forListeningPort())
Expand Down
2 changes: 2 additions & 0 deletions .../scala/io/lenses/streamreactor/connect/mqtt/source/MqttManagerConnectionFailureTest.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import org.testcontainers.containers.Network

import java.util
import java.util.UUID
import scala.annotation.nowarn

class MqttManagerConnectionFailureTest extends AnyWordSpec with ForAllTestContainer with Matchers {

Expand All @@ -37,6 +38,7 @@ class MqttManagerConnectionFailureTest extends AnyWordSpec with ForAllTestContai

// mqtt broker port will be mapped to a different host network port upon restart
// using a proxy container to overcome this
@nowarn("cat=deprecation")
val proxy = toxiProxyContainer.container.getProxy(mqttContainer.container, mqttPort)

val mqttProxyUrl = s"tcp://${proxy.getContainerIpAddress}:${proxy.getProxyPort}"
Expand Down
1 change: 0 additions & 1 deletion kafka-connect-redis/project/build.properties
View file

This file was deleted.

88 changes: 44 additions & 44 deletions project/Dependencies.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,33 +24,33 @@ object Dependencies {
val scalaVersion = "2.13.13"
val supportedScalaVersions: Seq[String] = List(Dependencies.scalaVersion)

val commonResolvers: Seq[MavenRepository] = Seq(
Resolver sonatypeRepo "public",
Resolver typesafeRepo "releases",
Resolver.mavenLocal,
"confluent" at "https://packages.confluent.io/maven/",
"typesafe" at "https://repo.typesafe.com/typesafe/releases/",
"cloudera" at "https://repository.cloudera.com/artifactory/cloudera-repos/",
"jitpack" at "https://jitpack.io",
)
val commonResolvers: Seq[MavenRepository] = Resolver.sonatypeOssRepos("public") ++
Seq(
Resolver typesafeRepo "releases",
Resolver.mavenLocal,
"confluent" at "https://packages.confluent.io/maven/",
"typesafe" at "https://repo.typesafe.com/typesafe/releases/",
"cloudera" at "https://repository.cloudera.com/artifactory/cloudera-repos/",
"jitpack" at "https://jitpack.io",
)

object Versions {
// libraries versions
val scalatestVersion = "3.2.17"
val scalatestVersion = "3.2.18"
val scalatestPlusScalaCheckVersion = "3.1.0.0-RC2"
val scalaCheckVersion = "1.17.0"

val kafkaVersion: String = "3.6.1"
val kafkaVersion: String = "3.7.0"
val confluentVersion: String = "7.6.0"

val enumeratumVersion = "1.7.3"

val http4sVersion = "1.0.0-M32"
val http4sJdkVersion = "1.0.0-M1"
val avroVersion = "1.11.3"
val avro4sVersion = "4.1.1"
val avro4sVersion = "4.1.2"

val catsEffectVersion = "3.4.8"
val catsEffectVersion = "3.4.11"
val `cats-effect-testing` = "1.5.0"

val antlr4Version: String = "4.13.1"
Expand All @@ -61,21 +61,21 @@ object Dependencies {
// build plugins version
val betterMonadicForVersion = "0.3.1"

val logbackVersion = "1.4.14"
val logbackVersion = "1.5.3"
val scalaLoggingVersion = "3.9.5"

val wiremockVersion = "3.3.1"
val wiremockVersion = "3.5.2"
val parquetVersion = "1.13.1"

val jerseyCommonVersion = "3.1.1"
val jerseyCommonVersion = "3.1.5"

val calciteVersion = "1.34.0"
val awsSdkVersion = "2.25.6"
val awsSdkVersion = "2.25.21"

val azureDataLakeVersion = "12.18.3"
val azureIdentityVersion = "1.11.4"
val azureCoreVersion = "1.47.0"
val gcpStorageVersion = "2.32.1"
val gcpStorageVersion = "2.36.1"

val jacksonVersion = "2.17.0"
val json4sVersion = "4.0.7"
Expand All @@ -86,42 +86,42 @@ object Dependencies {
val xzVersion = "1.9"
val lz4Version = "1.8.0"

val bouncyCastleVersion = "1.70"
val bouncyCastleVersion = "1.77"
val nettyVersion = "4.1.108.Final"

val cassandraDriverVersion = "3.11.3"
val jsonPathVersion = "2.7.0"
val cassandraDriverVersion = "3.11.5"
val jsonPathVersion = "2.9.0"

val azureDocumentDbVersion = "2.6.5"
val testcontainersScalaVersion = "0.40.14"
val testcontainersVersion = "1.17.6"
val testcontainersScalaVersion = "0.40.17"
val testcontainersVersion = "1.19.7"

val influxVersion = "6.8.0"
val influxVersion = "6.12.0"

val jmsApiVersion = "3.1.0"
val activeMqVersion = "6.0.1"
val activeMqVersion = "6.1.0"
val protocVersion = "3.11.4"
val googleProtobufVersion = "3.25.3"

val mqttVersion = "1.2.5"

val commonsNetVersion = "3.10.0"
val commonsCodecVersion = "1.15"
val commonsCompressVersion = "1.26.0"
val commonsCodecVersion = "1.16.1"
val commonsCompressVersion = "1.26.1"
val commonsConfigVersion = "2.10.1"
val commonsIOVersion = "2.11.0"
val commonsIOVersion = "2.16.0"
val commonsHttpVersion = "4.5.14"
val commonsLang3Version = "3.14.0"
val jschVersion = "0.2.17"

val minaVersion = "2.2.1"
val minaVersion = "2.2.3"
val betterFilesVersion = "3.9.2"
val ftpServerVersion = "1.2.0"
val fakeSftpServerVersion = "2.0.0"

val mongoDbVersion = "3.12.12"
val mongoDbVersion = "3.12.14"

val jedisVersion = "4.4.0"
val jedisVersion = "4.4.7"
val gsonVersion = "2.10.1"

val nimbusJoseJwtVersion = "9.37.3"
Expand All @@ -135,13 +135,13 @@ object Dependencies {
object Elastic6Versions extends ElasticVersions() {
override val elastic4sVersion: String = "6.7.8"
override val elasticSearchVersion: String = "6.8.23"
override val jnaVersion: String = "3.0.9"
override val jnaVersion: String = "3.3.0"
}

object Elastic7Versions extends ElasticVersions {
override val elastic4sVersion: String = "7.17.2"
override val elasticSearchVersion: String = "7.17.2"
override val jnaVersion: String = "4.5.1"
override val elastic4sVersion: String = "7.17.4"
override val elasticSearchVersion: String = "7.17.19"
override val jnaVersion: String = "4.5.2"
}

}
Expand All @@ -164,8 +164,8 @@ object Dependencies {
val logback = "ch.qos.logback" % "logback-classic" % logbackVersion
lazy val logbackCore = "ch.qos.logback" % "logback-core" % logbackVersion
val scalaLogging = "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion
val log4jToSlf4j = "org.slf4j" % "log4j-over-slf4j" % "2.0.9"
val jclToSlf4j = "org.slf4j" % "jcl-over-slf4j" % "2.0.9"
val log4jToSlf4j = "org.slf4j" % "log4j-over-slf4j" % "2.0.12"
val jclToSlf4j = "org.slf4j" % "jcl-over-slf4j" % "2.0.12"

// testing
val scalatest = "org.scalatest" %% "scalatest" % scalatestVersion
Expand Down Expand Up @@ -208,11 +208,11 @@ object Dependencies {
val http4sCirce = "org.http4s" %% "http4s-circe" % http4sVersion
val http4s: Seq[ModuleID] = Seq(http4sDsl, http4sJdkClient, http4sCirce)

val bouncyProv = "org.bouncycastle" % "bcprov-jdk15on" % bouncyCastleVersion
val bouncyUtil = "org.bouncycastle" % "bcutil-jdk15on" % bouncyCastleVersion
val bouncyPkix = "org.bouncycastle" % "bcpkix-jdk15on" % bouncyCastleVersion
val bouncyBcpg = "org.bouncycastle" % "bcpg-jdk15on" % bouncyCastleVersion
val bouncyTls = "org.bouncycastle" % "bctls-jdk15on" % bouncyCastleVersion
val bouncyProv = "org.bouncycastle" % "bcprov-jdk18on" % bouncyCastleVersion
val bouncyUtil = "org.bouncycastle" % "bcutil-jdk18on" % bouncyCastleVersion
val bouncyPkix = "org.bouncycastle" % "bcpkix-jdk18on" % bouncyCastleVersion
val bouncyBcpg = "org.bouncycastle" % "bcpg-jdk18on" % bouncyCastleVersion
val bouncyTls = "org.bouncycastle" % "bctls-jdk18on" % bouncyCastleVersion
val bouncyCastle: Seq[ModuleID] = Seq(bouncyProv, bouncyUtil, bouncyPkix, bouncyBcpg, bouncyTls)

lazy val avro = "org.apache.avro" % "avro" % avroVersion
Expand Down Expand Up @@ -381,8 +381,8 @@ trait Dependencies {
import Versions._

val loggingDeps: Seq[ModuleID] = Seq(
"org.apache.logging.log4j" % "log4j-api" % "2.22.1",
"org.apache.logging.log4j" % "log4j-to-slf4j" % "2.20.0",
"org.apache.logging.log4j" % "log4j-api" % "2.23.1",
"org.apache.logging.log4j" % "log4j-to-slf4j" % "2.23.1",
log4jToSlf4j,
jclToSlf4j,
logback,
Expand Down
2 changes: 1 addition & 1 deletion project/assembly.sbt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
2 changes: 1 addition & 1 deletion project/build.properties
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.2
sbt.version=1.9.9
11 changes: 5 additions & 6 deletions project/plugins.sbt
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
// Activate the following only when needed to use specific tasks like `whatDependsOn` etc...
//addDependencyTreePlugin

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")

addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.14")
addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.19")

addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1")

addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0")
addSbtPlugin("com.github.sbt" % "sbt-license-report" % "1.6.1")

//addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.2")

Expand Down
7 changes: 4 additions & 3 deletions ...src/main/scala/io/lenses/streamreactor/connect/testcontainers/KafkaConnectContainer.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import org.testcontainers.containers.GenericContainer
import org.testcontainers.containers.KafkaContainer
import org.testcontainers.containers.wait.strategy.Wait
import org.testcontainers.utility.DockerImageName
import org.testcontainers.utility.MountableFile

import java.time.Duration

Expand Down Expand Up @@ -51,13 +52,13 @@ class KafkaConnectContainer(
}
providedJars.foreach {
jarLocation =>
withFileSystemBind(
jarLocation,
withCopyToContainer(
MountableFile.forHostPath(jarLocation),
s"/usr/share/java/kafka/${jarLocation.substring(jarLocation.lastIndexOf("/"))}",
)
}

connectPluginPath.foreach(f => withFileSystemBind(f, "/usr/share/plugins"))
connectPluginPath.foreach(f => withCopyToContainer(MountableFile.forHostPath(f), "/usr/share/plugins"))

if (schemaRegistryContainer.isDefined) {
withEnv("CONNECT_KEY_CONVERTER", "io.confluent.connect.avro.AvroConverter")
Expand Down

0 comments on commit bce4a33

Please sign in to comment.