diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index efea67124..108bf2f74 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -48,13 +48,19 @@ jobs: run: | ./gradlew distTar distZip - export tar_file=$(ls ./build/distributions/ | grep tar) - export zip_file=$(ls ./build/distributions/ | grep zip) - echo tar_file=${tar_file} >> $GITHUB_ENV - echo zip_file=${zip_file} >> $GITHUB_ENV + export gcs_tar_file=$(ls ./gcs-sink-connector/build/distributions/ | grep tar) + export gcs_zip_file=$(ls ./gcs-sink-connector/build/distributions/ | grep zip) + echo gcs_tar_file=${gcs_tar_file} >> $GITHUB_ENV + echo gcs_zip_file=${gcs_zip_file} >> $GITHUB_ENV + echo gcs_tar_path=`realpath ./gcs-sink-connector/build/distributions/${gcs_tar_file}` >> $GITHUB_ENV + echo gcs_zip_path=`realpath ./gcs-sink-connector/build/distributions/${gcs_zip_file}` >> $GITHUB_ENV - echo tar_path=`realpath ./build/distributions/${tar_file}` >> $GITHUB_ENV - echo zip_path=`realpath ./build/distributions/${zip_file}` >> $GITHUB_ENV + export s3_tar_file=$(ls ./s3-sink-connector/build/distributions/ | grep tar) + export s3_zip_file=$(ls ./s3-sink-connector/build/distributions/ | grep zip) + echo s3_tar_file=${s3_tar_file} >> $GITHUB_ENV + echo s3_zip_file=${s3_zip_file} >> $GITHUB_ENV + echo s3_tar_path=`realpath ./s3-sink-connector/build/distributions/${s3_tar_file}` >> $GITHUB_ENV + echo s3_zip_path=`realpath ./s3-sink-connector/build/distributions/${s3_tar_file}` >> $GITHUB_ENV - name: Create tag run: | @@ -77,22 +83,42 @@ jobs: draft: true prerelease: false - - name: Upload tar + - name: Upload tar GCS uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ env.tar_path }} - asset_name: ${{ env.tar_file }} + asset_path: ${{ env.gcs_tar_path }} + asset_name: ${{ env.gcs_tar_file }} asset_content_type: application/tar - - name: Upload zip + - name: Upload zip GCS uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ env.zip_path }} - asset_name: ${{ env.zip_file }} + asset_path: ${{ env.gcs_zip_path }} + asset_name: ${{ env.gcs_zip_file }} + asset_content_type: application/zip + + - name: Upload tar S3 + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ${{ env.s3_tar_path }} + asset_name: ${{ env.s3_tar_file }} + asset_content_type: application/tar + + - name: Upload zip S3 + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ${{ env.s3_zip_path }} + asset_name: ${{ env.s3_zip_file }} asset_content_type: application/zip diff --git a/.github/workflows/release_pr_workflow.yml b/.github/workflows/release_pr_workflow.yml index 025711882..593751030 100644 --- a/.github/workflows/release_pr_workflow.yml +++ b/.github/workflows/release_pr_workflow.yml @@ -36,7 +36,7 @@ jobs: - name: Checkout main uses: actions/checkout@v4 with: - ref: main + ref: ${{ github.ref }} fetch-depth: 0 - name: Create release commits diff --git a/s3-connector/LICENSE b/LICENSE similarity index 100% rename from s3-connector/LICENSE rename to LICENSE diff --git a/README.md b/README.md index 2b25b9ba5..f51c8729e 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ # Aiven's Apache Kafka Connectors - [Aiven Connector Commons](./commons/README.md) -- [Aiven GCS Connector](./gcs-connector/README.md) -- [Aiven S3 Connector](./s3-connector/README.md) +- [Aiven GCS Sink Connector](./gcs-sink-connector/README.md) +- [Aiven S3 Sink Connector](./s3-sink-connector/README.md) # Development diff --git a/buildSrc/src/main/kotlin/aiven-apache-kafka-connectors-all.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/aiven-apache-kafka-connectors-all.java-conventions.gradle.kts index 974621d8c..d82e2e033 100644 --- a/buildSrc/src/main/kotlin/aiven-apache-kafka-connectors-all.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/aiven-apache-kafka-connectors-all.java-conventions.gradle.kts @@ -152,9 +152,21 @@ spotless { } } -val distTar by tasks.getting(Tar::class) { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE +distributions { + main { + contents { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + from(tasks.jar) + from(configurations.runtimeClasspath.get()) + + into("/") { + from("$projectDir") + include("README*", "notices/", "licenses/") + include("config/") + from("$rootDir") { + include("LICENSE*") + } + } + } + } } -val distZip by tasks.getting(Zip::class) { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE -} \ No newline at end of file diff --git a/commons/README.md b/commons/README.md index ca9be45f6..9d6a0452d 100644 --- a/commons/README.md +++ b/commons/README.md @@ -1,8 +1,8 @@ # Aiven's Common Module for Apache Kafka® connectors Shared common functionality among Aiven's connectors for Apache Kafka: -- [Aiven GCS Connector](../gcs-connector/README.md) -- [Aiven S3 Connector](../s3-connector/README.md) +- [Aiven GCS Sink Connector](../gcs-sink-connector/README.md) +- [Aiven S3 Sink Connector](../s3-sink-connector/README.md) # Usage @@ -16,7 +16,7 @@ When installing this library on Kafka Connect, use a specific plugin path, and * # License -This project is licensed under the [Apache License, Version 2.0](LICENSE). +This project is licensed under the [Apache License, Version 2.0](../LICENSE). # Trademarks diff --git a/commons/build.gradle.kts b/commons/build.gradle.kts index 219465e55..0fd80df3c 100644 --- a/commons/build.gradle.kts +++ b/commons/build.gradle.kts @@ -92,21 +92,6 @@ dependencies { testRuntimeOnly(logginglibs.logback.classic) } -distributions { - main { - contents { - from(tasks.jar) - from(configurations.runtimeClasspath.get()) - - into("/") { - from("$projectDir") - include("version.txt", "README*", "LICENSE*", "NOTICE*", "licenses/") - include("config/") - } - } - } -} - publishing { publications { create("publishMavenJavaArtifact") { @@ -142,10 +127,11 @@ publishing { } scm { - connection = "scm:git:git://github.com:aiven-open/commons-for-apache-kafka-connect.git" + connection = + "scm:git:git://github.com:Aiven-Open/cloud-storage-connectors-for-apache-kafka.git" developerConnection = - "scm:git:ssh://github.com:aiven-open/commons-for-apache-kafka-connect.git" - url = "https://github.com/aiven-open/commons-for-apache-kafka-connect" + "scm:git:ssh://github.com:Aiven-Open/cloud-storage-connectors-for-apache-kafka.git" + url = "https://github.com/Aiven-Open/cloud-storage-connectors-for-apache-kafka" } } } @@ -172,7 +158,7 @@ signing { // This results in double armored signatures, i.e. garbage. // Override the signature type provider to use unarmored output for `asc` files, which works well // with GPG. - class ASCSignatureProvider() : AbstractSignatureTypeProvider() { + class ASCSignatureProvider : AbstractSignatureTypeProvider() { val binary = object : BinarySignatureType() { override fun getExtension(): String { diff --git a/gcs-connector/gradle.properties b/gcs-connector/gradle.properties deleted file mode 100644 index 2d0e2b6c8..000000000 --- a/gcs-connector/gradle.properties +++ /dev/null @@ -1,11 +0,0 @@ -version=0.14.0-SNAPSHOT - -sonatypeUsername= -sonatypePassword= - -# https://github.com/diffplug/spotless/issues/834 -org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \ - --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \ - --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \ - --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \ - --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED diff --git a/gcs-connector/.gitignore b/gcs-sink-connector/.gitignore similarity index 100% rename from gcs-connector/.gitignore rename to gcs-sink-connector/.gitignore diff --git a/gcs-connector/README.md b/gcs-sink-connector/README.md similarity index 99% rename from gcs-connector/README.md rename to gcs-sink-connector/README.md index c46091240..778b99920 100644 --- a/gcs-connector/README.md +++ b/gcs-sink-connector/README.md @@ -533,7 +533,7 @@ Here is an example connector configuration with descriptions: # Unique name for the connector. # Attempting to register again with the same name will fail. -name=my-gcs-connector +name=my-gcs-sink-connector ## These must have exactly these values: @@ -643,7 +643,7 @@ Release JARs are available in Maven Central: ```xml io.aiven - gcs-connector-for-apache-kafka + gcs-sink-connector-for-apache-kafka x.y.z ``` @@ -704,7 +704,7 @@ TBD ## License -This project is licensed under the [Apache License, Version 2.0](LICENSE). +This project is licensed under the [Apache License, Version 2.0](../LICENSE). ## Trademarks diff --git a/gcs-connector/build.gradle.kts b/gcs-sink-connector/build.gradle.kts similarity index 91% rename from gcs-connector/build.gradle.kts rename to gcs-sink-connector/build.gradle.kts index cdb1ea4dc..446ce1a96 100644 --- a/gcs-connector/build.gradle.kts +++ b/gcs-sink-connector/build.gradle.kts @@ -18,8 +18,6 @@ import com.github.spotbugs.snom.SpotBugsTask plugins { id("aiven-apache-kafka-connectors-all.java-conventions") } -group = "io.aiven" - val kafkaVersion by extra("1.1.0") val integrationTest: SourceSet = @@ -63,7 +61,7 @@ tasks.register("integrationTest") { // Pass the GCS bucket name to the tests. systemProperty("integration-test.gcs.bucket", project.findProperty("testGcsBucket").toString()) // Pass the distribution file path to the tests. - val distTarTask = tasks.get("distTar") as Tar + val distTarTask = tasks["distTar"] as Tar val distributionFilePath = distTarTask.archiveFile.get().asFile.path systemProperty("integration-test.distribution.file.path", distributionFilePath) systemProperty("fake-gcs-server-version", "1.45.2") @@ -172,33 +170,18 @@ tasks.named("spotbugsIntegrationTest") { } tasks.processResources { - filesMatching("gcs-connector-for-apache-kafka-version.properties") { + filesMatching("gcs-sink-connector-for-apache-kafka-version.properties") { expand(mapOf("version" to version)) } } tasks.jar { manifest { attributes(mapOf("Version" to project.version)) } } -tasks.distTar { dependsOn(":commons:jar") } - -tasks.distZip { dependsOn(":commons:jar") } - -distributions { - main { - contents { - from(tasks.jar) - from(configurations.runtimeClasspath.get()) - } - } -} - -tasks.installDist { dependsOn(":commons:jar") } - publishing { publications { create("publishMavenJavaArtifact") { groupId = group.toString() - artifactId = "gcs-connector-for-apache-kafka" + artifactId = "gcs-sink-connector-for-apache-kafka" version = version.toString() from(components["java"]) @@ -206,7 +189,7 @@ publishing { pom { name = "Aiven's GCS Sink Connector for Apache Kafka" description = "Aiven's GCS Sink Connector for Apache Kafka" - url = "https://github.com/aiven/gcs-connector-for-apache-kafka" + url = "https://github.com/Aiven-Open/Aiven-Open/cloud-storage-connectors-for-apache-kafka" organization { name = "Aiven Oy" url = "https://aiven.io" @@ -229,9 +212,11 @@ publishing { } scm { - connection = "scm:git:git://github.com:aiven/gcs-connector-for-apache-kafka.git" - developerConnection = "scm:git:ssh://github.com:aiven/gcs-connector-for-apache-kafka.git" - url = "https://github.com/aiven/gcs-connector-for-apache-kafka" + connection = + "scm:git:git://github.com:Aiven-Open/cloud-storage-connectors-for-apache-kafka.git" + developerConnection = + "scm:git:ssh://github.com:Aiven-Open/cloud-storage-connectors-for-apache-kafka.git" + url = "https://github.com/Aiven-Open/cloud-storage-connectors-for-apache-kafka" } } } @@ -258,7 +243,7 @@ signing { // This results in double armored signatures, i.e. garbage. // Override the signature type provider to use unarmored output for `asc` files, which works well // with GPG. - class ASCSignatureProvider() : AbstractSignatureTypeProvider() { + class ASCSignatureProvider : AbstractSignatureTypeProvider() { val binary = object : BinarySignatureType() { override fun getExtension(): String { diff --git a/gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/AbstractIntegrationTest.java b/gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/AbstractIntegrationTest.java similarity index 97% rename from gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/AbstractIntegrationTest.java rename to gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/AbstractIntegrationTest.java index e937f3582..7b4060ac1 100644 --- a/gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/AbstractIntegrationTest.java +++ b/gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/AbstractIntegrationTest.java @@ -145,12 +145,12 @@ static void setUpAll() throws IOException, InterruptedException { testBucketAccessor = new BucketAccessor(storage, testBucketName); testBucketAccessor.ensureWorking(); - gcsPrefix = "gcs-connector-for-apache-kafka-test-" + gcsPrefix = "gcs-sink-connector-for-apache-kafka-test-" + ZonedDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME) + "/"; - final File testDir = Files.createTempDirectory("gcs-connector-for-apache-kafka-test-").toFile(); + final File testDir = Files.createTempDirectory("gcs-sink-connector-for-apache-kafka-test-").toFile(); - pluginDir = new File(testDir, "plugins/gcs-connector-for-apache-kafka/"); + pluginDir = new File(testDir, "plugins/gcs-sink-connector-for-apache-kafka/"); assert pluginDir.mkdirs(); final File distFile = new File(System.getProperty("integration-test.distribution.file.path")); diff --git a/gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/AvroIntegrationTest.java b/gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/AvroIntegrationTest.java similarity index 100% rename from gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/AvroIntegrationTest.java rename to gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/AvroIntegrationTest.java diff --git a/gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/AvroParquetIntegrationTest.java b/gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/AvroParquetIntegrationTest.java similarity index 100% rename from gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/AvroParquetIntegrationTest.java rename to gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/AvroParquetIntegrationTest.java diff --git a/gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/ConnectRunner.java b/gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/ConnectRunner.java similarity index 100% rename from gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/ConnectRunner.java rename to gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/ConnectRunner.java diff --git a/gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/IntegrationTest.java b/gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/IntegrationTest.java similarity index 100% rename from gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/IntegrationTest.java rename to gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/IntegrationTest.java diff --git a/gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/ParquetIntegrationTest.java b/gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/ParquetIntegrationTest.java similarity index 100% rename from gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/ParquetIntegrationTest.java rename to gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/ParquetIntegrationTest.java diff --git a/gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/ParquetUtils.java b/gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/ParquetUtils.java similarity index 100% rename from gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/ParquetUtils.java rename to gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/ParquetUtils.java diff --git a/gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/SchemaRegistryContainer.java b/gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/SchemaRegistryContainer.java similarity index 100% rename from gcs-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/SchemaRegistryContainer.java rename to gcs-sink-connector/src/integration-test/java/io/aiven/kafka/connect/gcs/SchemaRegistryContainer.java diff --git a/gcs-connector/src/integration-test/resources/log4j.properties b/gcs-sink-connector/src/integration-test/resources/log4j.properties similarity index 100% rename from gcs-connector/src/integration-test/resources/log4j.properties rename to gcs-sink-connector/src/integration-test/resources/log4j.properties diff --git a/gcs-connector/src/main/java/io/aiven/kafka/connect/gcs/GcsSinkConfig.java b/gcs-sink-connector/src/main/java/io/aiven/kafka/connect/gcs/GcsSinkConfig.java similarity index 100% rename from gcs-connector/src/main/java/io/aiven/kafka/connect/gcs/GcsSinkConfig.java rename to gcs-sink-connector/src/main/java/io/aiven/kafka/connect/gcs/GcsSinkConfig.java diff --git a/gcs-connector/src/main/java/io/aiven/kafka/connect/gcs/GcsSinkConfigDef.java b/gcs-sink-connector/src/main/java/io/aiven/kafka/connect/gcs/GcsSinkConfigDef.java similarity index 100% rename from gcs-connector/src/main/java/io/aiven/kafka/connect/gcs/GcsSinkConfigDef.java rename to gcs-sink-connector/src/main/java/io/aiven/kafka/connect/gcs/GcsSinkConfigDef.java diff --git a/gcs-connector/src/main/java/io/aiven/kafka/connect/gcs/GcsSinkConnector.java b/gcs-sink-connector/src/main/java/io/aiven/kafka/connect/gcs/GcsSinkConnector.java similarity index 100% rename from gcs-connector/src/main/java/io/aiven/kafka/connect/gcs/GcsSinkConnector.java rename to gcs-sink-connector/src/main/java/io/aiven/kafka/connect/gcs/GcsSinkConnector.java diff --git a/gcs-connector/src/main/java/io/aiven/kafka/connect/gcs/GcsSinkTask.java b/gcs-sink-connector/src/main/java/io/aiven/kafka/connect/gcs/GcsSinkTask.java similarity index 100% rename from gcs-connector/src/main/java/io/aiven/kafka/connect/gcs/GcsSinkTask.java rename to gcs-sink-connector/src/main/java/io/aiven/kafka/connect/gcs/GcsSinkTask.java diff --git a/gcs-connector/src/main/java/io/aiven/kafka/connect/gcs/GoogleCredentialsBuilder.java b/gcs-sink-connector/src/main/java/io/aiven/kafka/connect/gcs/GoogleCredentialsBuilder.java similarity index 100% rename from gcs-connector/src/main/java/io/aiven/kafka/connect/gcs/GoogleCredentialsBuilder.java rename to gcs-sink-connector/src/main/java/io/aiven/kafka/connect/gcs/GoogleCredentialsBuilder.java diff --git a/gcs-connector/src/main/java/io/aiven/kafka/connect/gcs/Version.java b/gcs-sink-connector/src/main/java/io/aiven/kafka/connect/gcs/Version.java similarity index 92% rename from gcs-connector/src/main/java/io/aiven/kafka/connect/gcs/Version.java rename to gcs-sink-connector/src/main/java/io/aiven/kafka/connect/gcs/Version.java index f94a4d0ee..70d74b732 100644 --- a/gcs-connector/src/main/java/io/aiven/kafka/connect/gcs/Version.java +++ b/gcs-sink-connector/src/main/java/io/aiven/kafka/connect/gcs/Version.java @@ -25,7 +25,7 @@ class Version { private static final Logger LOG = LoggerFactory.getLogger(Version.class); - private static final String PROPERTIES_FILENAME = "gcs-connector-for-apache-kafka-version.properties"; + private static final String PROPERTIES_FILENAME = "gcs-sink-connector-for-apache-kafka-version.properties"; static final String VERSION; // NOPMD field name matches class name diff --git a/gcs-connector/src/main/resources/META-INF/services/org.apache.kafka.connect.sink.SinkConnector b/gcs-sink-connector/src/main/resources/META-INF/services/org.apache.kafka.connect.sink.SinkConnector similarity index 100% rename from gcs-connector/src/main/resources/META-INF/services/org.apache.kafka.connect.sink.SinkConnector rename to gcs-sink-connector/src/main/resources/META-INF/services/org.apache.kafka.connect.sink.SinkConnector diff --git a/gcs-connector/src/main/resources/gcs-connector-for-apache-kafka-version.properties b/gcs-sink-connector/src/main/resources/gcs-sink-connector-for-apache-kafka-version.properties similarity index 100% rename from gcs-connector/src/main/resources/gcs-connector-for-apache-kafka-version.properties rename to gcs-sink-connector/src/main/resources/gcs-sink-connector-for-apache-kafka-version.properties diff --git a/gcs-connector/src/test/java/io/aiven/kafka/connect/common/grouper/GcsSinkTaskGroupByKeyPropertiesTest.java b/gcs-sink-connector/src/test/java/io/aiven/kafka/connect/common/grouper/GcsSinkTaskGroupByKeyPropertiesTest.java similarity index 100% rename from gcs-connector/src/test/java/io/aiven/kafka/connect/common/grouper/GcsSinkTaskGroupByKeyPropertiesTest.java rename to gcs-sink-connector/src/test/java/io/aiven/kafka/connect/common/grouper/GcsSinkTaskGroupByKeyPropertiesTest.java diff --git a/gcs-connector/src/test/java/io/aiven/kafka/connect/common/grouper/GcsSinkTaskGroupByTopicPartitionPropertiesTest.java b/gcs-sink-connector/src/test/java/io/aiven/kafka/connect/common/grouper/GcsSinkTaskGroupByTopicPartitionPropertiesTest.java similarity index 98% rename from gcs-connector/src/test/java/io/aiven/kafka/connect/common/grouper/GcsSinkTaskGroupByTopicPartitionPropertiesTest.java rename to gcs-sink-connector/src/test/java/io/aiven/kafka/connect/common/grouper/GcsSinkTaskGroupByTopicPartitionPropertiesTest.java index 6865768b8..2bfb25bb5 100644 --- a/gcs-connector/src/test/java/io/aiven/kafka/connect/common/grouper/GcsSinkTaskGroupByTopicPartitionPropertiesTest.java +++ b/gcs-sink-connector/src/test/java/io/aiven/kafka/connect/common/grouper/GcsSinkTaskGroupByTopicPartitionPropertiesTest.java @@ -66,7 +66,7 @@ void unlimited(@ForAll("recordBatches") final List> recordBatch } @Property - @Disabled("See https://github.com/aiven/gcs-connector-for-apache-kafka/issues/143") + @Disabled("See https://github.com/Aiven-Open/commons-for-apache-kafka-connect/issues/261") void limited(@ForAll("recordBatches") final List> recordBatches, @ForAll @IntRange(min = 1, max = 100) final int maxRecordsPerFile) { genericTry(recordBatches, maxRecordsPerFile); diff --git a/gcs-connector/src/test/java/io/aiven/kafka/connect/common/grouper/PbtBase.java b/gcs-sink-connector/src/test/java/io/aiven/kafka/connect/common/grouper/PbtBase.java similarity index 100% rename from gcs-connector/src/test/java/io/aiven/kafka/connect/common/grouper/PbtBase.java rename to gcs-sink-connector/src/test/java/io/aiven/kafka/connect/common/grouper/PbtBase.java diff --git a/gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/GcsSinkConnectorTest.java b/gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/GcsSinkConnectorTest.java similarity index 100% rename from gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/GcsSinkConnectorTest.java rename to gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/GcsSinkConnectorTest.java diff --git a/gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/GcsSinkTaskTest.java b/gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/GcsSinkTaskTest.java similarity index 100% rename from gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/GcsSinkTaskTest.java rename to gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/GcsSinkTaskTest.java diff --git a/gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/GoogleCredentialsBuilderTest.java b/gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/GoogleCredentialsBuilderTest.java similarity index 100% rename from gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/GoogleCredentialsBuilderTest.java rename to gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/GoogleCredentialsBuilderTest.java diff --git a/gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/config/GcsSinkConfigTest.java b/gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/config/GcsSinkConfigTest.java similarity index 100% rename from gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/config/GcsSinkConfigTest.java rename to gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/config/GcsSinkConfigTest.java diff --git a/gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/config/GcsSinkConfigValidationTest.java b/gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/config/GcsSinkConfigValidationTest.java similarity index 100% rename from gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/config/GcsSinkConfigValidationTest.java rename to gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/config/GcsSinkConfigValidationTest.java diff --git a/gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/config/GcsSinkCredentialsConfigTest.java b/gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/config/GcsSinkCredentialsConfigTest.java similarity index 100% rename from gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/config/GcsSinkCredentialsConfigTest.java rename to gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/config/GcsSinkCredentialsConfigTest.java diff --git a/gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/testutils/BucketAccessor.java b/gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/testutils/BucketAccessor.java similarity index 100% rename from gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/testutils/BucketAccessor.java rename to gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/testutils/BucketAccessor.java diff --git a/gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/testutils/Record.java b/gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/testutils/Record.java similarity index 100% rename from gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/testutils/Record.java rename to gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/testutils/Record.java diff --git a/gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/testutils/Utils.java b/gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/testutils/Utils.java similarity index 100% rename from gcs-connector/src/test/java/io/aiven/kafka/connect/gcs/testutils/Utils.java rename to gcs-sink-connector/src/test/java/io/aiven/kafka/connect/gcs/testutils/Utils.java diff --git a/gcs-connector/src/test/resources/blns.txt b/gcs-sink-connector/src/test/resources/blns.txt similarity index 100% rename from gcs-connector/src/test/resources/blns.txt rename to gcs-sink-connector/src/test/resources/blns.txt diff --git a/gcs-connector/src/test/resources/gcs-connector-for-apache-kafka-version.properties b/gcs-sink-connector/src/test/resources/gcs-sink-connector-for-apache-kafka-version.properties similarity index 100% rename from gcs-connector/src/test/resources/gcs-connector-for-apache-kafka-version.properties rename to gcs-sink-connector/src/test/resources/gcs-sink-connector-for-apache-kafka-version.properties diff --git a/gcs-connector/src/test/resources/log4j.properties b/gcs-sink-connector/src/test/resources/log4j.properties similarity index 100% rename from gcs-connector/src/test/resources/log4j.properties rename to gcs-sink-connector/src/test/resources/log4j.properties diff --git a/gcs-connector/src/test/resources/test_gcs_credentials.json b/gcs-sink-connector/src/test/resources/test_gcs_credentials.json similarity index 100% rename from gcs-connector/src/test/resources/test_gcs_credentials.json rename to gcs-sink-connector/src/test/resources/test_gcs_credentials.json diff --git a/s3-connector/gradle.properties b/gradle.properties similarity index 66% rename from s3-connector/gradle.properties rename to gradle.properties index acc601c9e..694951322 100644 --- a/s3-connector/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ -version=0.13.0-SNAPSHOT +version=0.14.0-SNAPSHOT sonatypeUsername= sonatypePassword= + diff --git a/s3-connector/.gitattributes b/s3-sink-connector/.gitattributes similarity index 100% rename from s3-connector/.gitattributes rename to s3-sink-connector/.gitattributes diff --git a/s3-connector/.gitignore b/s3-sink-connector/.gitignore similarity index 100% rename from s3-connector/.gitignore rename to s3-sink-connector/.gitignore diff --git a/s3-connector/README.md b/s3-sink-connector/README.md similarity index 99% rename from s3-connector/README.md rename to s3-sink-connector/README.md index 1ca008f1a..d07feec1a 100644 --- a/s3-connector/README.md +++ b/s3-sink-connector/README.md @@ -651,7 +651,7 @@ directory: ## License -This project is licensed under the [Apache License, Version 2.0](LICENSE). +This project is licensed under the [Apache License, Version 2.0](../LICENSE). ## Trademarks diff --git a/s3-connector/build.gradle.kts b/s3-sink-connector/build.gradle.kts similarity index 89% rename from s3-connector/build.gradle.kts rename to s3-sink-connector/build.gradle.kts index b8be2631c..aa9579ec5 100644 --- a/s3-connector/build.gradle.kts +++ b/s3-sink-connector/build.gradle.kts @@ -48,7 +48,7 @@ tasks.register("integrationTest") { // Run always. outputs.upToDateWhen { false } - val distTarTask = tasks.get("distTar") as Tar + val distTarTask = tasks["distTar"] as Tar val distributionFilePath = distTarTask.archiveFile.get().asFile.path systemProperty("integration-test.distribution.file.path", distributionFilePath) } @@ -157,39 +157,18 @@ tasks.named("spotbugsIntegrationTest") { } tasks.processResources { - filesMatching("s3-connector-for-apache-kafka-version.properties") { + filesMatching("s3-sink-connector-for-apache-kafka-version.properties") { expand(mapOf("version" to version)) } } tasks.jar { manifest { attributes(mapOf("Version" to project.version)) } } -tasks.distTar { dependsOn(":commons:jar") } - -tasks.distZip { dependsOn(":commons:jar") } - -tasks.installDist { dependsOn(":commons:jar") } - -distributions { - main { - contents { - from(tasks.jar) - from(configurations.runtimeClasspath.get()) - - into("/") { - from("$projectDir") - include("version.txt", "README*", "LICENSE*", "NOTICE*", "licenses/") - include("config/") - } - } - } -} - publishing { publications { create("publishMavenJavaArtifact") { groupId = group.toString() - artifactId = "s3-connector-for-apache-kafka" + artifactId = "s3-sink-connector-for-apache-kafka" version = version.toString() from(components["java"]) @@ -197,7 +176,7 @@ publishing { pom { name = "Aiven's S3 Sink Connector for Apache Kafka" description = "Aiven's S3 Sink Connector for Apache Kafka" - url = "https://github.com/aiven-open/s3-connector-for-apache-kafka" + url = "https://github.com/Aiven-Open/cloud-storage-connectors-for-apache-kafka" organization { name = "Aiven Oy" url = "https://aiven.io" @@ -220,9 +199,11 @@ publishing { } scm { - connection = "scm:git:git://github.com:aiven/s3-connector-for-apache-kafka.git" - developerConnection = "scm:git:ssh://github.com:aiven/s3-connector-for-apache-kafka.git" - url = "https://github.com/aiven-open/s3-connector-for-apache-kafka" + connection = + "scm:git:git://github.com:Aiven-Open/cloud-storage-connectors-for-apache-kafka.git" + developerConnection = + "scm:git:ssh://github.com:Aiven-Open/cloud-storage-connectors-for-apache-kafka.git" + url = "https://github.com/Aiven-Open/cloud-storage-connectors-for-apache-kafka" } } } @@ -249,7 +230,7 @@ signing { // This results in double armored signatures, i.e. garbage. // Override the signature type provider to use unarmored output for `asc` files, which works well // with GPG. - class ASCSignatureProvider() : AbstractSignatureTypeProvider() { + class ASCSignatureProvider : AbstractSignatureTypeProvider() { val binary = object : BinarySignatureType() { override fun getExtension(): String { diff --git a/s3-connector/licenses/LICENSE-aws.txt b/s3-sink-connector/licenses/LICENSE-aws.txt similarity index 100% rename from s3-connector/licenses/LICENSE-aws.txt rename to s3-sink-connector/licenses/LICENSE-aws.txt diff --git a/s3-connector/notices/NOTICE-aws.txt b/s3-sink-connector/notices/NOTICE-aws.txt similarity index 100% rename from s3-connector/notices/NOTICE-aws.txt rename to s3-sink-connector/notices/NOTICE-aws.txt diff --git a/s3-connector/src/integration-test/java/io/aiven/kafka/connect/AvroIntegrationTest.java b/s3-sink-connector/src/integration-test/java/io/aiven/kafka/connect/AvroIntegrationTest.java similarity index 100% rename from s3-connector/src/integration-test/java/io/aiven/kafka/connect/AvroIntegrationTest.java rename to s3-sink-connector/src/integration-test/java/io/aiven/kafka/connect/AvroIntegrationTest.java diff --git a/s3-connector/src/integration-test/java/io/aiven/kafka/connect/AvroParquetIntegrationTest.java b/s3-sink-connector/src/integration-test/java/io/aiven/kafka/connect/AvroParquetIntegrationTest.java similarity index 100% rename from s3-connector/src/integration-test/java/io/aiven/kafka/connect/AvroParquetIntegrationTest.java rename to s3-sink-connector/src/integration-test/java/io/aiven/kafka/connect/AvroParquetIntegrationTest.java diff --git a/s3-connector/src/integration-test/java/io/aiven/kafka/connect/ConnectRunner.java b/s3-sink-connector/src/integration-test/java/io/aiven/kafka/connect/ConnectRunner.java similarity index 100% rename from s3-connector/src/integration-test/java/io/aiven/kafka/connect/ConnectRunner.java rename to s3-sink-connector/src/integration-test/java/io/aiven/kafka/connect/ConnectRunner.java diff --git a/s3-connector/src/integration-test/java/io/aiven/kafka/connect/IntegrationBase.java b/s3-sink-connector/src/integration-test/java/io/aiven/kafka/connect/IntegrationBase.java similarity index 100% rename from s3-connector/src/integration-test/java/io/aiven/kafka/connect/IntegrationBase.java rename to s3-sink-connector/src/integration-test/java/io/aiven/kafka/connect/IntegrationBase.java diff --git a/s3-connector/src/integration-test/java/io/aiven/kafka/connect/IntegrationTest.java b/s3-sink-connector/src/integration-test/java/io/aiven/kafka/connect/IntegrationTest.java similarity index 100% rename from s3-connector/src/integration-test/java/io/aiven/kafka/connect/IntegrationTest.java rename to s3-sink-connector/src/integration-test/java/io/aiven/kafka/connect/IntegrationTest.java diff --git a/s3-connector/src/integration-test/java/io/aiven/kafka/connect/ParquetIntegrationTest.java b/s3-sink-connector/src/integration-test/java/io/aiven/kafka/connect/ParquetIntegrationTest.java similarity index 100% rename from s3-connector/src/integration-test/java/io/aiven/kafka/connect/ParquetIntegrationTest.java rename to s3-sink-connector/src/integration-test/java/io/aiven/kafka/connect/ParquetIntegrationTest.java diff --git a/s3-connector/src/integration-test/java/io/aiven/kafka/connect/ParquetUtils.java b/s3-sink-connector/src/integration-test/java/io/aiven/kafka/connect/ParquetUtils.java similarity index 100% rename from s3-connector/src/integration-test/java/io/aiven/kafka/connect/ParquetUtils.java rename to s3-sink-connector/src/integration-test/java/io/aiven/kafka/connect/ParquetUtils.java diff --git a/s3-connector/src/integration-test/java/io/aiven/kafka/connect/s3/SchemaRegistryContainer.java b/s3-sink-connector/src/integration-test/java/io/aiven/kafka/connect/s3/SchemaRegistryContainer.java similarity index 100% rename from s3-connector/src/integration-test/java/io/aiven/kafka/connect/s3/SchemaRegistryContainer.java rename to s3-sink-connector/src/integration-test/java/io/aiven/kafka/connect/s3/SchemaRegistryContainer.java diff --git a/s3-connector/src/integration-test/resources/logback-test.xml b/s3-sink-connector/src/integration-test/resources/logback-test.xml similarity index 100% rename from s3-connector/src/integration-test/resources/logback-test.xml rename to s3-sink-connector/src/integration-test/resources/logback-test.xml diff --git a/s3-connector/src/main/java/io/aiven/kafka/connect/s3/AivenKafkaConnectS3SinkConnector.java b/s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/AivenKafkaConnectS3SinkConnector.java similarity index 100% rename from s3-connector/src/main/java/io/aiven/kafka/connect/s3/AivenKafkaConnectS3SinkConnector.java rename to s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/AivenKafkaConnectS3SinkConnector.java diff --git a/s3-connector/src/main/java/io/aiven/kafka/connect/s3/OldFullKeyFormatters.java b/s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/OldFullKeyFormatters.java similarity index 100% rename from s3-connector/src/main/java/io/aiven/kafka/connect/s3/OldFullKeyFormatters.java rename to s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/OldFullKeyFormatters.java diff --git a/s3-connector/src/main/java/io/aiven/kafka/connect/s3/S3OutputStream.java b/s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/S3OutputStream.java similarity index 100% rename from s3-connector/src/main/java/io/aiven/kafka/connect/s3/S3OutputStream.java rename to s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/S3OutputStream.java diff --git a/s3-connector/src/main/java/io/aiven/kafka/connect/s3/S3SinkTask.java b/s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/S3SinkTask.java similarity index 100% rename from s3-connector/src/main/java/io/aiven/kafka/connect/s3/S3SinkTask.java rename to s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/S3SinkTask.java diff --git a/s3-connector/src/main/java/io/aiven/kafka/connect/s3/Version.java b/s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/Version.java similarity index 92% rename from s3-connector/src/main/java/io/aiven/kafka/connect/s3/Version.java rename to s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/Version.java index 4db0da345..b3c7b8890 100644 --- a/s3-connector/src/main/java/io/aiven/kafka/connect/s3/Version.java +++ b/s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/Version.java @@ -25,7 +25,7 @@ final class Version { private static final Logger LOGGER = LoggerFactory.getLogger(Version.class); - private static final String PROPERTIES_FILENAME = "s3-connector-for-apache-kafka-version.properties"; + private static final String PROPERTIES_FILENAME = "s3-sink-connector-for-apache-kafka-version.properties"; static final String VERSION; // NOPMD AvoidFieldNameMatchingTypeName diff --git a/s3-connector/src/main/java/io/aiven/kafka/connect/s3/config/AwsAccessSecret.java b/s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/config/AwsAccessSecret.java similarity index 100% rename from s3-connector/src/main/java/io/aiven/kafka/connect/s3/config/AwsAccessSecret.java rename to s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/config/AwsAccessSecret.java diff --git a/s3-connector/src/main/java/io/aiven/kafka/connect/s3/config/AwsCredentialProviderFactory.java b/s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/config/AwsCredentialProviderFactory.java similarity index 100% rename from s3-connector/src/main/java/io/aiven/kafka/connect/s3/config/AwsCredentialProviderFactory.java rename to s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/config/AwsCredentialProviderFactory.java diff --git a/s3-connector/src/main/java/io/aiven/kafka/connect/s3/config/AwsStsEndpointConfig.java b/s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/config/AwsStsEndpointConfig.java similarity index 100% rename from s3-connector/src/main/java/io/aiven/kafka/connect/s3/config/AwsStsEndpointConfig.java rename to s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/config/AwsStsEndpointConfig.java diff --git a/s3-connector/src/main/java/io/aiven/kafka/connect/s3/config/AwsStsRole.java b/s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/config/AwsStsRole.java similarity index 100% rename from s3-connector/src/main/java/io/aiven/kafka/connect/s3/config/AwsStsRole.java rename to s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/config/AwsStsRole.java diff --git a/s3-connector/src/main/java/io/aiven/kafka/connect/s3/config/S3SinkConfig.java b/s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/config/S3SinkConfig.java similarity index 100% rename from s3-connector/src/main/java/io/aiven/kafka/connect/s3/config/S3SinkConfig.java rename to s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/config/S3SinkConfig.java diff --git a/s3-connector/src/main/java/io/aiven/kafka/connect/s3/config/S3SinkConfigDef.java b/s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/config/S3SinkConfigDef.java similarity index 100% rename from s3-connector/src/main/java/io/aiven/kafka/connect/s3/config/S3SinkConfigDef.java rename to s3-sink-connector/src/main/java/io/aiven/kafka/connect/s3/config/S3SinkConfigDef.java diff --git a/s3-connector/src/main/resources/META-INF/services/org.apache.kafka.connect.sink.SinkConnector b/s3-sink-connector/src/main/resources/META-INF/services/org.apache.kafka.connect.sink.SinkConnector similarity index 100% rename from s3-connector/src/main/resources/META-INF/services/org.apache.kafka.connect.sink.SinkConnector rename to s3-sink-connector/src/main/resources/META-INF/services/org.apache.kafka.connect.sink.SinkConnector diff --git a/s3-connector/src/main/resources/s3-connector-for-apache-kafka-version.properties b/s3-sink-connector/src/main/resources/s3-sink-connector-for-apache-kafka-version.properties similarity index 100% rename from s3-connector/src/main/resources/s3-connector-for-apache-kafka-version.properties rename to s3-sink-connector/src/main/resources/s3-sink-connector-for-apache-kafka-version.properties diff --git a/s3-connector/src/test/java/io/aiven/kafka/connect/s3/AwsCredentialProviderFactoryTest.java b/s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/AwsCredentialProviderFactoryTest.java similarity index 100% rename from s3-connector/src/test/java/io/aiven/kafka/connect/s3/AwsCredentialProviderFactoryTest.java rename to s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/AwsCredentialProviderFactoryTest.java diff --git a/s3-connector/src/test/java/io/aiven/kafka/connect/s3/S3OutputStreamTest.java b/s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/S3OutputStreamTest.java similarity index 100% rename from s3-connector/src/test/java/io/aiven/kafka/connect/s3/S3OutputStreamTest.java rename to s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/S3OutputStreamTest.java diff --git a/s3-connector/src/test/java/io/aiven/kafka/connect/s3/S3SinkTaskTest.java b/s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/S3SinkTaskTest.java similarity index 100% rename from s3-connector/src/test/java/io/aiven/kafka/connect/s3/S3SinkTaskTest.java rename to s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/S3SinkTaskTest.java diff --git a/s3-connector/src/test/java/io/aiven/kafka/connect/s3/config/S3SinkConfigTest.java b/s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/config/S3SinkConfigTest.java similarity index 100% rename from s3-connector/src/test/java/io/aiven/kafka/connect/s3/config/S3SinkConfigTest.java rename to s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/config/S3SinkConfigTest.java diff --git a/s3-connector/src/test/java/io/aiven/kafka/connect/s3/config/S3SinkCredentialsConfigTest.java b/s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/config/S3SinkCredentialsConfigTest.java similarity index 100% rename from s3-connector/src/test/java/io/aiven/kafka/connect/s3/config/S3SinkCredentialsConfigTest.java rename to s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/config/S3SinkCredentialsConfigTest.java diff --git a/s3-connector/src/test/java/io/aiven/kafka/connect/s3/testutils/BucketAccessor.java b/s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/testutils/BucketAccessor.java similarity index 100% rename from s3-connector/src/test/java/io/aiven/kafka/connect/s3/testutils/BucketAccessor.java rename to s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/testutils/BucketAccessor.java diff --git a/s3-connector/src/test/java/io/aiven/kafka/connect/s3/testutils/IndexesToString.java b/s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/testutils/IndexesToString.java similarity index 100% rename from s3-connector/src/test/java/io/aiven/kafka/connect/s3/testutils/IndexesToString.java rename to s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/testutils/IndexesToString.java diff --git a/s3-connector/src/test/java/io/aiven/kafka/connect/s3/testutils/KeyValueGenerator.java b/s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/testutils/KeyValueGenerator.java similarity index 100% rename from s3-connector/src/test/java/io/aiven/kafka/connect/s3/testutils/KeyValueGenerator.java rename to s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/testutils/KeyValueGenerator.java diff --git a/s3-connector/src/test/java/io/aiven/kafka/connect/s3/testutils/KeyValueMessage.java b/s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/testutils/KeyValueMessage.java similarity index 100% rename from s3-connector/src/test/java/io/aiven/kafka/connect/s3/testutils/KeyValueMessage.java rename to s3-sink-connector/src/test/java/io/aiven/kafka/connect/s3/testutils/KeyValueMessage.java diff --git a/s3-connector/src/test/resources/blns.txt b/s3-sink-connector/src/test/resources/blns.txt similarity index 100% rename from s3-connector/src/test/resources/blns.txt rename to s3-sink-connector/src/test/resources/blns.txt diff --git a/s3-connector/src/test/resources/logback-test.xml b/s3-sink-connector/src/test/resources/logback-test.xml similarity index 100% rename from s3-connector/src/test/resources/logback-test.xml rename to s3-sink-connector/src/test/resources/logback-test.xml diff --git a/settings.gradle.kts b/settings.gradle.kts index 5c4edc60c..2f5795431 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -90,6 +90,6 @@ dependencyResolutionManagement { include("commons") -include("gcs-connector") +include("gcs-sink-connector") -include("s3-connector") +include("s3-sink-connector")