From a7a737ff5d42d20e63f5d08201df4280c283f660 Mon Sep 17 00:00:00 2001 From: Saulius Valatka Date: Tue, 2 Apr 2024 17:23:44 +0300 Subject: [PATCH] replace com.spotify.docker with org.mandas.docker --- build.sbt | 30 ++++++++++--------- project/plugins.sbt | 2 +- .../src/test/resources/logback-test.xml | 2 +- .../streamloader/fixtures/ClickHouse.scala | 4 +-- .../adform/streamloader/fixtures/Docker.scala | 9 +++--- .../adform/streamloader/fixtures/Hdfs.scala | 2 +- .../adform/streamloader/fixtures/Kafka.scala | 4 +-- .../com/adform/streamloader/fixtures/S3.scala | 4 +-- .../streamloader/fixtures/Vertica.scala | 4 +-- .../storage/ClickHouseStorageBackend.scala | 4 +-- .../storage/HdfsStorageBackend.scala | 4 +-- .../storage/S3StorageBackend.scala | 4 +-- .../streamloader/storage/StorageBackend.scala | 2 +- .../storage/VerticaStorageBackend.scala | 4 +-- 14 files changed, 41 insertions(+), 38 deletions(-) diff --git a/build.sbt b/build.sbt index fc7b746..60f89d1 100644 --- a/build.sbt +++ b/build.sbt @@ -49,13 +49,13 @@ lazy val `stream-loader-core` = project "org.scala-lang" % "scala-reflect" % scalaVersion.value, "org.apache.kafka" % "kafka-clients" % "3.7.0", "org.log4s" %% "log4s" % "1.10.0", - "org.apache.commons" % "commons-compress" % "1.26.0", + "org.apache.commons" % "commons-compress" % "1.26.1", "org.xerial.snappy" % "snappy-java" % "1.1.10.5", "org.lz4" % "lz4-java" % "1.8.0", "com.github.luben" % "zstd-jni" % "1.5.5-6", "com.univocity" % "univocity-parsers" % "2.9.1", "org.json4s" %% "json4s-native" % "4.0.7", - "io.micrometer" % "micrometer-core" % "1.12.3", + "io.micrometer" % "micrometer-core" % "1.12.4", "org.scalatest" %% "scalatest" % scalaTestVersion % "test", "org.scalatestplus" %% "scalacheck-1-17" % scalaCheckTestVersion % "test", "org.scalacheck" %% "scalacheck" % scalaCheckVersion % "test", @@ -100,10 +100,10 @@ lazy val `stream-loader-s3` = project .settings(commonSettings) .settings( libraryDependencies ++= Seq( - "software.amazon.awssdk" % "s3" % "2.25.1", + "software.amazon.awssdk" % "s3" % "2.25.22", "org.scalatest" %% "scalatest" % scalaTestVersion % "test", - "com.amazonaws" % "aws-java-sdk-s3" % "1.12.671" % "test", - "org.gaul" % "s3proxy" % "2.1.0" % "test" + "com.amazonaws" % "aws-java-sdk-s3" % "1.12.692" % "test", + "org.gaul" % "s3proxy" % "2.2.0" % "test" ) ) @@ -141,15 +141,17 @@ lazy val `stream-loader-tests` = project .settings(commonSettings) .settings( libraryDependencies ++= Seq( - "com.typesafe" % "config" % "1.4.3", - "ch.qos.logback" % "logback-classic" % "1.5.3", - "com.zaxxer" % "HikariCP" % "5.1.0", - "com.vertica.jdbc" % "vertica-jdbc" % verticaVersion, - "org.scalacheck" %% "scalacheck" % scalaCheckVersion, - "org.scalatest" %% "scalatest" % scalaTestVersion % "test", - "org.scalatestplus" %% "scalacheck-1-17" % scalaCheckTestVersion % "test", - ("com.spotify" % "docker-client" % "8.16.0" classifier "shaded") % "test", - "org.slf4j" % "log4j-over-slf4j" % "2.0.12" % "test" + "com.typesafe" % "config" % "1.4.3", + "ch.qos.logback" % "logback-classic" % "1.5.3", + "com.zaxxer" % "HikariCP" % "5.1.0", + "com.vertica.jdbc" % "vertica-jdbc" % verticaVersion, + "org.scalacheck" %% "scalacheck" % scalaCheckVersion, + "org.scalatest" %% "scalatest" % scalaTestVersion % "test", + "org.scalatestplus" %% "scalacheck-1-17" % scalaCheckTestVersion % "test", + "org.mandas" % "docker-client" % "7.0.8" % "test", + "org.jboss.resteasy" % "resteasy-client" % "6.2.8.Final" % "test", + "com.fasterxml.jackson.jakarta.rs" % "jackson-jakarta-rs-json-provider" % "2.17.0" % "test", + "org.slf4j" % "log4j-over-slf4j" % "2.0.12" % "test" ), inConfig(IntegrationTest)(Defaults.testTasks), publish := {}, diff --git a/project/plugins.sbt b/project/plugins.sbt index 2690694..4e5dfa0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1") addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.19") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") diff --git a/stream-loader-tests/src/test/resources/logback-test.xml b/stream-loader-tests/src/test/resources/logback-test.xml index 1739ab9..e0f714b 100644 --- a/stream-loader-tests/src/test/resources/logback-test.xml +++ b/stream-loader-tests/src/test/resources/logback-test.xml @@ -7,7 +7,7 @@ - + diff --git a/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/ClickHouse.scala b/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/ClickHouse.scala index 6c70025..9730916 100644 --- a/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/ClickHouse.scala +++ b/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/ClickHouse.scala @@ -10,8 +10,8 @@ package com.adform.streamloader.fixtures import java.time.Duration -import com.spotify.docker.client.messages.ContainerConfig.Healthcheck -import com.spotify.docker.client.messages.{ContainerConfig, HostConfig} +import org.mandas.docker.client.messages.ContainerConfig.Healthcheck +import org.mandas.docker.client.messages.{ContainerConfig, HostConfig} import org.log4s.getLogger import org.scalatest.{BeforeAndAfterAll, Suite} diff --git a/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/Docker.scala b/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/Docker.scala index 35b13a6..486af63 100644 --- a/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/Docker.scala +++ b/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/Docker.scala @@ -11,9 +11,10 @@ package com.adform.streamloader.fixtures import java.time.Duration import java.util.UUID -import com.spotify.docker.client.DefaultDockerClient -import com.spotify.docker.client.DockerClient.RemoveContainerParam -import com.spotify.docker.client.messages.{ContainerConfig, NetworkConfig, PortBinding} +import org.mandas.docker.client.DefaultDockerClient +import org.mandas.docker.client.DockerClient.RemoveContainerParam +import org.mandas.docker.client.builder.resteasy.ResteasyDockerClientBuilder +import org.mandas.docker.client.messages.{ContainerConfig, NetworkConfig, PortBinding} import org.log4s.getLogger import org.scalatest.{BeforeAndAfterAll, Suite} @@ -52,7 +53,7 @@ trait Docker { private var network: DockerNetwork = _ - val docker: DefaultDockerClient = DefaultDockerClient.fromEnv().build() + val docker: DefaultDockerClient = new ResteasyDockerClientBuilder().fromEnv().build() val dockerSandboxId: String = UUID.randomUUID().toString val healthCheckTimeout: Duration = Duration.ofSeconds(60) diff --git a/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/Hdfs.scala b/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/Hdfs.scala index 43afd9a..68adca5 100644 --- a/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/Hdfs.scala +++ b/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/Hdfs.scala @@ -10,7 +10,7 @@ package com.adform.streamloader.fixtures import java.net.URI -import com.spotify.docker.client.messages.{ContainerConfig, HostConfig} +import org.mandas.docker.client.messages.{ContainerConfig, HostConfig} import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.FileSystem import org.log4s._ diff --git a/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/Kafka.scala b/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/Kafka.scala index 16f58db..1a46445 100644 --- a/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/Kafka.scala +++ b/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/Kafka.scala @@ -13,8 +13,8 @@ import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.{TimeUnit, TimeoutException} import java.util.{Properties, UUID} -import com.spotify.docker.client.messages.ContainerConfig.Healthcheck -import com.spotify.docker.client.messages.{ContainerConfig, HostConfig} +import org.mandas.docker.client.messages.ContainerConfig.Healthcheck +import org.mandas.docker.client.messages.{ContainerConfig, HostConfig} import org.apache.kafka.clients.admin.{AdminClient, AdminClientConfig, NewTopic} import org.apache.kafka.clients.consumer.{ConsumerConfig, ConsumerRecord, KafkaConsumer} import org.apache.kafka.clients.producer.{KafkaProducer, ProducerConfig} diff --git a/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/S3.scala b/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/S3.scala index ac2708d..76ea0b0 100644 --- a/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/S3.scala +++ b/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/S3.scala @@ -10,8 +10,8 @@ package com.adform.streamloader.fixtures import java.net.URI -import com.spotify.docker.client.messages.ContainerConfig.Healthcheck -import com.spotify.docker.client.messages.{ContainerConfig, HostConfig} +import org.mandas.docker.client.messages.ContainerConfig.Healthcheck +import org.mandas.docker.client.messages.{ContainerConfig, HostConfig} import org.log4s.getLogger import org.scalatest.{BeforeAndAfterAll, Suite} import software.amazon.awssdk.auth.credentials.AwsBasicCredentials diff --git a/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/Vertica.scala b/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/Vertica.scala index 3c65610..52ca9c5 100644 --- a/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/Vertica.scala +++ b/stream-loader-tests/src/test/scala/com/adform/streamloader/fixtures/Vertica.scala @@ -11,8 +11,8 @@ package com.adform.streamloader.fixtures import java.sql.DriverManager import java.time.Duration -import com.spotify.docker.client.messages.ContainerConfig.Healthcheck -import com.spotify.docker.client.messages.{ContainerConfig, HostConfig} +import org.mandas.docker.client.messages.ContainerConfig.Healthcheck +import org.mandas.docker.client.messages.{ContainerConfig, HostConfig} import org.log4s.getLogger import org.scalatest.{BeforeAndAfterAll, Suite} diff --git a/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/ClickHouseStorageBackend.scala b/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/ClickHouseStorageBackend.scala index 5009caa..27997c3 100644 --- a/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/ClickHouseStorageBackend.scala +++ b/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/ClickHouseStorageBackend.scala @@ -15,8 +15,8 @@ import com.adform.streamloader.source.KafkaContext import com.adform.streamloader.util.Retry import com.adform.streamloader.{BuildInfo, Loader} import com.clickhouse.jdbc.ClickHouseArray -import com.spotify.docker.client.DockerClient -import com.spotify.docker.client.messages.{ContainerConfig, HostConfig} +import org.mandas.docker.client.DockerClient +import org.mandas.docker.client.messages.{ContainerConfig, HostConfig} import com.zaxxer.hikari.HikariConfig import org.apache.kafka.common.TopicPartition import org.scalacheck.Arbitrary diff --git a/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/HdfsStorageBackend.scala b/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/HdfsStorageBackend.scala index 55595c0..e29081e 100644 --- a/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/HdfsStorageBackend.scala +++ b/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/HdfsStorageBackend.scala @@ -15,8 +15,8 @@ import com.adform.streamloader.model.{ExampleMessage, StreamPosition} import com.adform.streamloader.sink.file.{FilePathFormatter, TimePartitioningFilePathFormatter} import com.adform.streamloader.{BuildInfo, Loader} import com.sksamuel.avro4s.{RecordFormat, ScalePrecision} -import com.spotify.docker.client.DockerClient -import com.spotify.docker.client.messages.{ContainerConfig, HostConfig} +import org.mandas.docker.client.DockerClient +import org.mandas.docker.client.messages.{ContainerConfig, HostConfig} import org.apache.avro.generic.{GenericData, GenericRecord} import org.apache.hadoop.fs.{FileSystem, LocatedFileStatus, Path, RemoteIterator} import org.apache.kafka.common.TopicPartition diff --git a/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/S3StorageBackend.scala b/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/S3StorageBackend.scala index bd73b57..cd619af 100644 --- a/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/S3StorageBackend.scala +++ b/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/S3StorageBackend.scala @@ -13,8 +13,8 @@ import com.adform.streamloader.model.{StreamPosition, StringMessage, Timestamp} import com.adform.streamloader.s3.S3FileStorage import com.adform.streamloader.sink.file.{FilePathFormatter, TimePartitioningFilePathFormatter} import com.adform.streamloader.{BuildInfo, Loader} -import com.spotify.docker.client.DockerClient -import com.spotify.docker.client.messages.{ContainerConfig, HostConfig} +import org.mandas.docker.client.DockerClient +import org.mandas.docker.client.messages.{ContainerConfig, HostConfig} import org.apache.kafka.common.TopicPartition import org.scalacheck.Arbitrary import software.amazon.awssdk.core.ResponseInputStream diff --git a/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/StorageBackend.scala b/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/StorageBackend.scala index b824033..916bbe8 100644 --- a/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/StorageBackend.scala +++ b/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/StorageBackend.scala @@ -12,7 +12,7 @@ import java.util.Properties import com.adform.streamloader.fixtures.{Container, ContainerWithEndpoint, DockerNetwork} import com.adform.streamloader.model.{StorageMessage, StreamPosition} import com.adform.streamloader.source.{KafkaContext, LockingKafkaContext} -import com.spotify.docker.client.DockerClient +import org.mandas.docker.client.DockerClient import org.apache.kafka.clients.consumer.{ConsumerConfig, KafkaConsumer, OffsetAndMetadata, OffsetAndTimestamp} import org.apache.kafka.common.TopicPartition import org.scalacheck.rng.Seed diff --git a/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/VerticaStorageBackend.scala b/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/VerticaStorageBackend.scala index 6f1d397..3e67a30 100644 --- a/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/VerticaStorageBackend.scala +++ b/stream-loader-tests/src/test/scala/com/adform/streamloader/storage/VerticaStorageBackend.scala @@ -17,8 +17,8 @@ import com.adform.streamloader.sink.batch.storage.RecordBatchStorage import com.adform.streamloader.util.Retry import com.adform.streamloader.vertica.{ExternalOffsetVerticaFileStorage, InRowOffsetVerticaFileStorage} import com.adform.streamloader.{BuildInfo, Loader} -import com.spotify.docker.client.DockerClient -import com.spotify.docker.client.messages.{ContainerConfig, HostConfig} +import org.mandas.docker.client.DockerClient +import org.mandas.docker.client.messages.{ContainerConfig, HostConfig} import com.zaxxer.hikari.HikariConfig import javax.sql.DataSource