You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2025/06/23 11:38:13 UTC
(pekko-connectors-kafka) branch main updated: remove int-test usage (#333)
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-connectors-kafka.git
The following commit(s) were added to refs/heads/main by this push:
new 26d73170 remove int-test usage (#333)
26d73170 is described below
commit 26d731705100769132db89364a7fec65c4536fb4
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Mon Jun 23 12:38:09 2025 +0100
remove int-test usage (#333)
* remove int-test usage
* compile issues
* build issue
* issues
* Update build.sbt
* confluent 7.9.2
---
.github/workflows/check-build-test.yml | 8 +++---
.github/workflows/nightly-pekko.yml | 4 +--
.../pekko/kafka/benchmarks/BatchedConsumer.scala | 0
.../apache/pekko/kafka/benchmarks/Benchmarks.scala | 0
.../kafka/benchmarks/NoCommitBackpressure.scala | 0
.../PekkoConnectorsCommittableProducer.scala | 0
.../apache/pekko/kafka/benchmarks/Producer.scala | 0
.../apache/pekko/kafka/benchmarks/SpecBase.scala | 0
.../pekko/kafka/benchmarks/Transactions.scala | 0
build.sbt | 33 +++++++++++++---------
docs/src/main/paradox/serialization.md | 6 ++--
.../src/test}/resources/logback-test.xml | 0
.../src/test}/resources/reference.conf | 0
.../org/apache/pekko/kafka/IntegrationTests.scala | 0
.../kafka/PartitionedSourceFailoverSpec.scala | 0
.../pekko/kafka/PlainSourceFailoverSpec.scala | 0
.../kafka/TransactionsPartitionedSourceSpec.scala | 0
.../pekko/kafka/TransactionsSourceSpec.scala | 0
project/CopyrightHeader.scala | 2 +-
project/Dependencies.scala | 4 +--
project/ProjectSettings.scala | 4 +--
.../internal/PekkoConnectorsKafkaContainer.java | 2 +-
testkit/src/main/resources/reference.conf | 2 +-
.../pekko/kafka/scaladsl/RetentionPeriodSpec.scala | 2 +-
24 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml
index e36d9c56..4185ae2d 100644
--- a/.github/workflows/check-build-test.yml
+++ b/.github/workflows/check-build-test.yml
@@ -79,8 +79,8 @@ jobs:
uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.7
- name: Compile all code with fatal warnings for Java 11 and Scala 2.12/2.13/3
- # Run locally with: env CI=true sbt 'clean ; Test/compile ; It/compile'
- run: sbt "; +Test/compile; +It/compile"
+ # Run locally with: env CI=true sbt 'clean ; Test/compile'
+ run: sbt "; +Test/compile"
check-docs:
name: Check Docs
@@ -189,7 +189,7 @@ jobs:
uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.7
- name: Run multi-broker and long running integration tests
- run: sbt "tests/IntegrationTest/test"
+ run: sbt "int-tests/test"
- name: Print logs on failure
if: ${{ failure() }}
@@ -224,4 +224,4 @@ jobs:
uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.7
- name: "Compile benchmark tests"
- run: sbt "benchmarks/IntegrationTest/compile"
+ run: sbt "benchmarks/Test/compile"
diff --git a/.github/workflows/nightly-pekko.yml b/.github/workflows/nightly-pekko.yml
index 4befe431..e57d94c2 100644
--- a/.github/workflows/nightly-pekko.yml
+++ b/.github/workflows/nightly-pekko.yml
@@ -92,10 +92,10 @@ jobs:
key: build-target-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
- name: Compile everything
- run: sbt -Dpekko.build.pekko.version=${{ matrix.PEKKO_VERSION }} "++ ${{ matrix.SCALA_VERSION }}" tests/IntegrationTest/compile
+ run: sbt -Dpekko.build.pekko.version=${{ matrix.PEKKO_VERSION }} "++ ${{ matrix.SCALA_VERSION }}" int-tests/compile
- name: Run multi-broker and long running integration tests
- run: sbt -Dpekko.build.pekko.version=${{ matrix.PEKKO_VERSION }} "tests/IntegrationTest/test"
+ run: sbt -Dpekko.build.pekko.version=${{ matrix.PEKKO_VERSION }} "int-tests/test"
- name: Print logs on failure
if: ${{ failure() }}
diff --git a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/BatchedConsumer.scala b/benchmarks/src/test/scala/org/apache/pekko/kafka/benchmarks/BatchedConsumer.scala
similarity index 100%
rename from benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/BatchedConsumer.scala
rename to benchmarks/src/test/scala/org/apache/pekko/kafka/benchmarks/BatchedConsumer.scala
diff --git a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Benchmarks.scala b/benchmarks/src/test/scala/org/apache/pekko/kafka/benchmarks/Benchmarks.scala
similarity index 100%
rename from benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Benchmarks.scala
rename to benchmarks/src/test/scala/org/apache/pekko/kafka/benchmarks/Benchmarks.scala
diff --git a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/NoCommitBackpressure.scala b/benchmarks/src/test/scala/org/apache/pekko/kafka/benchmarks/NoCommitBackpressure.scala
similarity index 100%
rename from benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/NoCommitBackpressure.scala
rename to benchmarks/src/test/scala/org/apache/pekko/kafka/benchmarks/NoCommitBackpressure.scala
diff --git a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/PekkoConnectorsCommittableProducer.scala b/benchmarks/src/test/scala/org/apache/pekko/kafka/benchmarks/PekkoConnectorsCommittableProducer.scala
similarity index 100%
rename from benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/PekkoConnectorsCommittableProducer.scala
rename to benchmarks/src/test/scala/org/apache/pekko/kafka/benchmarks/PekkoConnectorsCommittableProducer.scala
diff --git a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Producer.scala b/benchmarks/src/test/scala/org/apache/pekko/kafka/benchmarks/Producer.scala
similarity index 100%
rename from benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Producer.scala
rename to benchmarks/src/test/scala/org/apache/pekko/kafka/benchmarks/Producer.scala
diff --git a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/SpecBase.scala b/benchmarks/src/test/scala/org/apache/pekko/kafka/benchmarks/SpecBase.scala
similarity index 100%
rename from benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/SpecBase.scala
rename to benchmarks/src/test/scala/org/apache/pekko/kafka/benchmarks/SpecBase.scala
diff --git a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Transactions.scala b/benchmarks/src/test/scala/org/apache/pekko/kafka/benchmarks/Transactions.scala
similarity index 100%
rename from benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Transactions.scala
rename to benchmarks/src/test/scala/org/apache/pekko/kafka/benchmarks/Transactions.scala
diff --git a/build.sbt b/build.sbt
index d809c2e5..b5364ac4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -35,7 +35,7 @@ lazy val `pekko-connectors-kafka` =
publish / skip := true,
ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(core, testkit, `cluster-sharding`),
onLoadMessage := ProjectSettings.onLoadMessage)
- .aggregate(core, testkit, `cluster-sharding`, tests, `java-tests`, benchmarks, docs)
+ .aggregate(core, testkit, `cluster-sharding`, tests, `java-tests`, docs)
lazy val core = project
.enablePlugins(ReproducibleBuildsPlugin)
@@ -86,11 +86,7 @@ lazy val `cluster-sharding` = project
lazy val tests = project
.dependsOn(core, testkit, `cluster-sharding`)
.disablePlugins(MimaPlugin, SitePlugin)
- .configs(IntegrationTest.extend(Test))
- .settings(inConfig(IntegrationTest)(JavaFormatterPlugin.toBeScopedSettings))
.settings(commonSettings)
- .settings(Defaults.itSettings)
- .settings(headerSettings(IntegrationTest))
.addPekkoModuleDependency("pekko-discovery", "test", PekkoCoreDependency.default)
.addPekkoModuleDependency("pekko-slf4j", "test", PekkoCoreDependency.default)
.settings(
@@ -99,8 +95,21 @@ lazy val tests = project
libraryDependencies ++= Dependencies.testDependencies,
publish / skip := true,
Test / fork := true,
- Test / parallelExecution := false,
- IntegrationTest / parallelExecution := false)
+ Test / parallelExecution := false)
+
+lazy val `int-tests` = project
+ .dependsOn(core, testkit, `cluster-sharding`, tests % "compile->compile;test->test")
+ .disablePlugins(MimaPlugin, SitePlugin)
+ .settings(commonSettings)
+ .addPekkoModuleDependency("pekko-discovery", "test", PekkoCoreDependency.default)
+ .addPekkoModuleDependency("pekko-slf4j", "test", PekkoCoreDependency.default)
+ .settings(
+ name := "pekko-connectors-kafka-int-tests",
+ resolvers ++= ResolverSettings.testSpecificResolvers,
+ libraryDependencies ++= Dependencies.testDependencies,
+ publish / skip := true,
+ Test / fork := true,
+ Test / parallelExecution := false)
lazy val `java-tests` = project
.dependsOn(core, testkit, `cluster-sharding`, tests % "compile->compile;test->test")
@@ -147,15 +156,11 @@ lazy val docs = project
lazy val benchmarks = project
.dependsOn(core, testkit)
.disablePlugins(MimaPlugin, SitePlugin)
- .configs(IntegrationTest)
- .settings(inConfig(IntegrationTest)(JavaFormatterPlugin.toBeScopedSettings))
.settings(commonSettings)
- .settings(Defaults.itSettings)
- .settings(headerSettings(IntegrationTest))
- .addPekkoModuleDependency("pekko-slf4j", "it", PekkoCoreDependency.default)
- .addPekkoModuleDependency("pekko-stream-testkit", "it", PekkoCoreDependency.default)
+ .addPekkoModuleDependency("pekko-slf4j", "test", PekkoCoreDependency.default)
+ .addPekkoModuleDependency("pekko-stream-testkit", "test", PekkoCoreDependency.default)
.settings(
name := "pekko-connectors-kafka-benchmarks",
publish / skip := true,
- IntegrationTest / parallelExecution := false,
+ Test / parallelExecution := false,
libraryDependencies ++= Dependencies.benchmarkDependencies)
diff --git a/docs/src/main/paradox/serialization.md b/docs/src/main/paradox/serialization.md
index ed0050b1..02b5b696 100644
--- a/docs/src/main/paradox/serialization.md
+++ b/docs/src/main/paradox/serialization.md
@@ -66,7 +66,7 @@ Maven
<dependency>
<groupId>io.confluent</groupId>
<artifactId>kafka-avro-serializer</artifactId>
- <version>confluent.version (eg. 7.9.0)</version>
+ <version>confluent.version (eg. 7.9.2)</version>
</dependency>
...
</dependencies>
@@ -84,14 +84,14 @@ Maven
sbt
: ```scala
- libraryDependencies += "io.confluent" % "kafka-avro-serializer" % confluentAvroVersion, // eg. 7.9.0
+ libraryDependencies += "io.confluent" % "kafka-avro-serializer" % confluentAvroVersion, // eg. 7.9.2
resolvers += "Confluent Maven Repository" at "https://packages.confluent.io/maven/",
```
Gradle
: ```gradle
dependencies {
- compile group: 'io.confluent', name: 'kafka-avro-serializer', version: confluentAvroVersion // eg. 7.9.0
+ compile group: 'io.confluent', name: 'kafka-avro-serializer', version: confluentAvroVersion // eg. 7.9.2
}
repositories {
maven {
diff --git a/tests/src/it/resources/logback-test.xml b/int-tests/src/test/resources/logback-test.xml
similarity index 100%
rename from tests/src/it/resources/logback-test.xml
rename to int-tests/src/test/resources/logback-test.xml
diff --git a/tests/src/it/resources/reference.conf b/int-tests/src/test/resources/reference.conf
similarity index 100%
rename from tests/src/it/resources/reference.conf
rename to int-tests/src/test/resources/reference.conf
diff --git a/tests/src/it/scala/org/apache/pekko/kafka/IntegrationTests.scala b/int-tests/src/test/scala/org/apache/pekko/kafka/IntegrationTests.scala
similarity index 100%
rename from tests/src/it/scala/org/apache/pekko/kafka/IntegrationTests.scala
rename to int-tests/src/test/scala/org/apache/pekko/kafka/IntegrationTests.scala
diff --git a/tests/src/it/scala/org/apache/pekko/kafka/PartitionedSourceFailoverSpec.scala b/int-tests/src/test/scala/org/apache/pekko/kafka/PartitionedSourceFailoverSpec.scala
similarity index 100%
rename from tests/src/it/scala/org/apache/pekko/kafka/PartitionedSourceFailoverSpec.scala
rename to int-tests/src/test/scala/org/apache/pekko/kafka/PartitionedSourceFailoverSpec.scala
diff --git a/tests/src/it/scala/org/apache/pekko/kafka/PlainSourceFailoverSpec.scala b/int-tests/src/test/scala/org/apache/pekko/kafka/PlainSourceFailoverSpec.scala
similarity index 100%
rename from tests/src/it/scala/org/apache/pekko/kafka/PlainSourceFailoverSpec.scala
rename to int-tests/src/test/scala/org/apache/pekko/kafka/PlainSourceFailoverSpec.scala
diff --git a/tests/src/it/scala/org/apache/pekko/kafka/TransactionsPartitionedSourceSpec.scala b/int-tests/src/test/scala/org/apache/pekko/kafka/TransactionsPartitionedSourceSpec.scala
similarity index 100%
rename from tests/src/it/scala/org/apache/pekko/kafka/TransactionsPartitionedSourceSpec.scala
rename to int-tests/src/test/scala/org/apache/pekko/kafka/TransactionsPartitionedSourceSpec.scala
diff --git a/tests/src/it/scala/org/apache/pekko/kafka/TransactionsSourceSpec.scala b/int-tests/src/test/scala/org/apache/pekko/kafka/TransactionsSourceSpec.scala
similarity index 100%
rename from tests/src/it/scala/org/apache/pekko/kafka/TransactionsSourceSpec.scala
rename to int-tests/src/test/scala/org/apache/pekko/kafka/TransactionsSourceSpec.scala
diff --git a/project/CopyrightHeader.scala b/project/CopyrightHeader.scala
index f7aab115..5e99393f 100644
--- a/project/CopyrightHeader.scala
+++ b/project/CopyrightHeader.scala
@@ -24,7 +24,7 @@ trait CopyrightHeader extends AutoPlugin {
override def trigger: PluginTrigger = allRequirements
protected def headerMappingSettings: Seq[Def.Setting[_]] =
- Seq(Compile, Test, IntegrationTest, Default).flatMap { config =>
+ Seq(Compile, Test, Default).flatMap { config =>
inConfig(config)(
Seq(
headerLicense := Some(HeaderLicense.Custom(apacheHeader)),
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index d6ecb785..7d1a26aa 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -16,8 +16,8 @@ object Dependencies {
"io.dropwizard.metrics" % "metrics-core" % "4.2.33",
"ch.qos.logback" % "logback-classic" % logbackVersion,
"org.slf4j" % "log4j-over-slf4j" % slf4jVersion,
- "org.testcontainers" % "kafka" % testcontainersVersion % IntegrationTest,
- "org.scalatest" %% "scalatest" % scalaTestVersion % IntegrationTest)
+ "org.testcontainers" % "kafka" % testcontainersVersion % Test,
+ "org.scalatest" %% "scalatest" % scalaTestVersion % Test)
lazy val coreDependencies = Seq(
"org.apache.kafka" % "kafka-clients" % kafkaVersion)
diff --git a/project/ProjectSettings.scala b/project/ProjectSettings.scala
index 3ebaa658..1f89d09b 100644
--- a/project/ProjectSettings.scala
+++ b/project/ProjectSettings.scala
@@ -54,13 +54,13 @@ object ProjectSettings extends AutoPlugin {
| test
| runs all the tests
|
- | tests/IntegrationTest/test
+ | int-tests/test
| run integration tests backed by Docker containers
|
| tests/testOnly -- -t "A consume-transform-produce cycle must complete in happy-path scenario"
| run a single test with an exact name (use -z for partial match)
|
- | benchmarks/IntegrationTest/testOnly *.PekkoConnectorsKafkaPlainConsumer
+ | benchmarks/testOnly *.PekkoConnectorsKafkaPlainConsumer
| run a single benchmark backed by Docker containers
""".stripMargin
diff --git a/testkit/src/main/java/org/apache/pekko/kafka/testkit/internal/PekkoConnectorsKafkaContainer.java b/testkit/src/main/java/org/apache/pekko/kafka/testkit/internal/PekkoConnectorsKafkaContainer.java
index f410a05a..0c5b9074 100644
--- a/testkit/src/main/java/org/apache/pekko/kafka/testkit/internal/PekkoConnectorsKafkaContainer.java
+++ b/testkit/src/main/java/org/apache/pekko/kafka/testkit/internal/PekkoConnectorsKafkaContainer.java
@@ -40,7 +40,7 @@ public class PekkoConnectorsKafkaContainer extends GenericContainer<PekkoConnect
private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
// Align these confluent platform constants with testkit/src/main/resources/reference.conf
- public static final String DEFAULT_CONFLUENT_PLATFORM_VERSION = "7.9.0";
+ public static final String DEFAULT_CONFLUENT_PLATFORM_VERSION = "7.9.2";
public static final DockerImageName DEFAULT_ZOOKEEPER_IMAGE_NAME =
DockerImageName.parse("confluentinc/cp-zookeeper")
diff --git a/testkit/src/main/resources/reference.conf b/testkit/src/main/resources/reference.conf
index 2bddf182..dcc3e6ab 100644
--- a/testkit/src/main/resources/reference.conf
+++ b/testkit/src/main/resources/reference.conf
@@ -28,7 +28,7 @@ pekko.kafka.testkit.testcontainers {
schema-registry-image = "confluentinc/cp-schema-registry"
schema-registry-image-tag = ${pekko.kafka.testkit.testcontainers.confluent-platform-version}
# See https://docs.confluent.io/platform/current/installation/versions-interoperability.html
- confluent-platform-version = "7.9.0"
+ confluent-platform-version = "7.9.2"
# the number of Kafka brokers to include in a test cluster
num-brokers = 1
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/RetentionPeriodSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/RetentionPeriodSpec.scala
index 734f1caf..2d3d6a4b 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/RetentionPeriodSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/RetentionPeriodSpec.scala
@@ -31,7 +31,7 @@ import scala.concurrent.duration._
class RetentionPeriodSpec extends SpecBase with TestcontainersKafkaPerClassLike {
// https://docs.confluent.io/current/installation/versions-interoperability.html
- private final val confluentPlatformVersion = "7.9.0"
+ private final val confluentPlatformVersion = "7.9.2"
override val testcontainersSettings = KafkaTestkitTestcontainersSettings(system)
.withKafkaImageTag(confluentPlatformVersion)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org