-
Notifications
You must be signed in to change notification settings - Fork 18
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge GCS and S3 connector repositories to single commons repository #220
Merge GCS and S3 connector repositories to single commons repository #220
Conversation
Bumps `testcontainersVersion` from 1.17.6 to 1.18.0. Updates `org.testcontainers:junit-jupiter` from 1.17.6 to 1.18.0 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.17.6...1.18.0) Updates `org.testcontainers:kafka` from 1.17.6 to 1.18.0 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.17.6...1.18.0) --- updated-dependencies: - dependency-name: org.testcontainers:junit-jupiter dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.testcontainers:kafka dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps `mockitoVersion` from 5.1.1 to 5.2.0. Updates `org.mockito:mockito-core` from 5.1.1 to 5.2.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.1.1...v5.2.0) Updates `org.mockito:mockito-inline` from 5.1.1 to 5.2.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.1.1...v5.2.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-inline dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [com.google.cloud:google-cloud-nio](https://github.com/googleapis/java-storage-nio) from 0.126.0 to 0.126.14. - [Release notes](https://github.com/googleapis/java-storage-nio/releases) - [Changelog](https://github.com/googleapis/java-storage-nio/blob/main/CHANGELOG.md) - [Commits](googleapis/java-storage-nio@v0.126.0...v0.126.14) --- updated-dependencies: - dependency-name: com.google.cloud:google-cloud-nio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.4.5 to 1.4.7. - [Release notes](https://github.com/qos-ch/logback/releases) - [Commits](qos-ch/logback@v_1.4.5...v_1.4.7) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [com.amazonaws:aws-java-sdk-sts](https://github.com/aws/aws-sdk-java) from 1.12.440 to 1.12.460. - [Release notes](https://github.com/aws/aws-sdk-java/releases) - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-java@1.12.440...1.12.460) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk-sts dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps `testcontainersVersion` from 1.17.6 to 1.18.0. Updates `org.testcontainers:junit-jupiter` from 1.17.6 to 1.18.0 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.17.6...1.18.0) Updates `org.testcontainers:kafka` from 1.17.6 to 1.18.0 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.17.6...1.18.0) --- updated-dependencies: - dependency-name: org.testcontainers:junit-jupiter dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.testcontainers:kafka dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…rsion-1.18.0 Bump testcontainersVersion from 1.17.6 to 1.18.0
…rsion-1.18.0 Bump testcontainersVersion from 1.17.6 to 1.18.0
….2.0 Bump mockitoVersion from 5.1.1 to 5.2.0
…-google-cloud-nio-0.126.14 Bump com.google.cloud:google-cloud-nio from 0.126.0 to 0.126.14
Bumps [com.google.cloud:google-cloud-storage](https://github.com/googleapis/java-storage) from 2.20.2 to 2.22.1. - [Release notes](https://github.com/googleapis/java-storage/releases) - [Changelog](https://github.com/googleapis/java-storage/blob/main/CHANGELOG.md) - [Commits](googleapis/java-storage@v2.20.2...v2.22.1) --- updated-dependencies: - dependency-name: com.google.cloud:google-cloud-storage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…-google-cloud-storage-2.22.1 Bump com.google.cloud:google-cloud-storage from 2.20.2 to 2.22.1
Bumps com.diffplug.spotless from 6.16.0 to 6.18.0. --- updated-dependencies: - dependency-name: com.diffplug.spotless dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…s-java-sdk-sts-1.12.460 Bump com.amazonaws:aws-java-sdk-sts from 1.12.440 to 1.12.460
…ogback-classic-1.4.7 Bump ch.qos.logback:logback-classic from 1.4.5 to 1.4.7
Bumps [com.amazonaws:aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.440 to 1.12.461. - [Release notes](https://github.com/aws/aws-sdk-java/releases) - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-java@1.12.440...1.12.461) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk-s3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps `mockitoVersion` from 5.2.0 to 5.3.1. Updates `org.mockito:mockito-core` from 5.2.0 to 5.3.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.2.0...v5.3.1) Updates `org.mockito:mockito-junit-jupiter` from 5.2.0 to 5.3.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.2.0...v5.3.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…s-java-sdk-s3-1.12.461 Bump com.amazonaws:aws-java-sdk-s3 from 1.12.440 to 1.12.461
….3.1 Bump mockitoVersion from 5.2.0 to 5.3.1
…tless-6.18.0 Bump com.diffplug.spotless from 6.16.0 to 6.18.0
Bump GH actions versions
Bumps `testcontainersVersion` from 1.18.0 to 1.18.3. Updates `org.testcontainers:junit-jupiter` from 1.18.0 to 1.18.3 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.18.0...1.18.3) Updates `org.testcontainers:kafka` from 1.18.0 to 1.18.3 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.18.0...1.18.3) --- updated-dependencies: - dependency-name: org.testcontainers:junit-jupiter dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.testcontainers:kafka dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps com.diffplug.spotless from 6.18.0 to 6.19.0. --- updated-dependencies: - dependency-name: com.diffplug.spotless dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [com.google.cloud:google-cloud-storage](https://github.com/googleapis/java-storage) from 2.22.1 to 2.22.3. - [Release notes](https://github.com/googleapis/java-storage/releases) - [Changelog](https://github.com/googleapis/java-storage/blob/main/CHANGELOG.md) - [Commits](googleapis/java-storage@v2.22.1...v2.22.3) --- updated-dependencies: - dependency-name: com.google.cloud:google-cloud-storage dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [com.google.guava:guava](https://github.com/google/guava) from 31.1-jre to 32.0.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [com.github.luben:zstd-jni](https://github.com/luben/zstd-jni) from 1.5.4-2 to 1.5.5-3. - [Commits](luben/zstd-jni@v1.5.4-2...v1.5.5-3) --- updated-dependencies: - dependency-name: com.github.luben:zstd-jni dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…rsion-1.18.3 Bump testcontainersVersion from 1.18.0 to 1.18.3
…tless-6.19.0 Bump com.diffplug.spotless from 6.18.0 to 6.19.0
Bumps [org.xerial.snappy:snappy-java](https://github.com/xerial/snappy-java) from 1.1.10.4 to 1.1.10.5. - [Release notes](https://github.com/xerial/snappy-java/releases) - [Commits](xerial/snappy-java@v1.1.10.4...v1.1.10.5) --- updated-dependencies: - dependency-name: org.xerial.snappy:snappy-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [net.jqwik:jqwik-engine](https://github.com/jqwik-team/jqwik) from 1.8.0 to 1.8.1. - [Release notes](https://github.com/jqwik-team/jqwik/releases) - [Commits](jqwik-team/jqwik@1.8.0...1.8.1) --- updated-dependencies: - dependency-name: net.jqwik:jqwik-engine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…ersVersion-1.19.1 chore(deps): bump testcontainersVersion from 1.19.0 to 1.19.1
…guava-guava-32.1.3-jre chore(deps): bump com.google.guava:guava from 32.1.2-jre to 32.1.3-jre
…snappy-snappy-java-1.1.10.5 chore(deps): bump org.xerial.snappy:snappy-java from 1.1.10.4 to 1.1.10.5
Bumps `mockitoVersion` from 5.5.0 to 5.6.0. Updates `org.mockito:mockito-core` from 5.5.0 to 5.6.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.5.0...v5.6.0) Updates `org.mockito:mockito-junit-jupiter` from 5.5.0 to 5.6.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.5.0...v5.6.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps `testcontainersVersion` from 1.19.0 to 1.19.1. Updates `org.testcontainers:junit-jupiter` from 1.19.0 to 1.19.1 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.19.0...1.19.1) Updates `org.testcontainers:kafka` from 1.19.0 to 1.19.1 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.19.0...1.19.1) Updates `org.testcontainers:localstack` from 1.19.0 to 1.19.1 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.19.0...1.19.1) --- updated-dependencies: - dependency-name: org.testcontainers:junit-jupiter dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.testcontainers:kafka dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.testcontainers:localstack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [com.github.luben:zstd-jni](https://github.com/luben/zstd-jni) from 1.5.5-6 to 1.5.5-10. - [Commits](https://github.com/luben/zstd-jni/commits) --- updated-dependencies: - dependency-name: com.github.luben:zstd-jni dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…ion-5.6.0 chore(deps): bump mockitoVersion from 5.5.0 to 5.6.0
…ersVersion-1.19.1 chore(deps): bump testcontainersVersion from 1.19.0 to 1.19.1
…luben-zstd-jni-1.5.5-10 chore(deps): bump com.github.luben:zstd-jni from 1.5.5-6 to 1.5.5-10
Sign using a key from GPG agent
…qwik-engine-1.8.1 chore(deps): bump net.jqwik:jqwik-engine from 1.8.0 to 1.8.1
Added convention for java libraries for reuse.
…iven-merge-connector-repositories-2023-12-11
…ven-merge-connector-repositories-2023-12-11
Changes necessary for S3 connector to build.
Changes necessary for GCS connector to build. Fails on checkstyle, which will be removed as tooling and replaced with tooling from the GCS connector already uses (spotbugs, spotless and pmd)
The submodules have existing .github, the release and pr workflows have not been adapted.
Removed unnecesary files from submodules.
- [Aiven Connector Commons](../commons/README.md) | ||
- [Aiven GCS Connector](../gcs-connector/README.md) | ||
- [Aiven S3 Connector](../s3-connector/README.md) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These links are broken, this is top level README compared to commons/README where ../
is valid prefix.
build.gradle.kts
Outdated
val parquetVersion by extra ("1.11.2") | ||
val junitVersion by extra ("5.10.0") | ||
val confluentPlatformVersion by extra ("7.2.2") | ||
val hadoopVersion by extra ("3.3.6") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was the code style to have a new line in the end of each file?
FORMAT_OUTPUT_TYPE_CONFIG, | ||
FixedSetRecommender.ofSupportedValues(FormatType.names()) | ||
); | ||
configDef.define(FORMAT_OUTPUT_FIELDS_CONFIG, ConfigDef.Type.LIST, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe having the parameters for configDef.define
each on new line is a lot more readable and that's what we are trying to maintain in most of the repositories, aren't we?
Supersedes #214, the main build.gradle has a conflict and when merging repositories resolving gets tricky due to overlapping histories.
The change and release process for the dependent repositories is hard to manage. This PR proposes to move GCS and S3 connector development to this repository.
Repository merge is done with --allow-unrelated-histories and the history of GCS and S3 repositories is available: $ git log --follow
Items not done:
[ ] Cleaning of dependencies.
[ ] Versioning of components.
[ ] Release process and GH release workflow files.
[ ] Gradle convention plugin port to Kotlin.
[ ] Multi-module Jacoco report.
[ ] Integration test convention, some duplication in GCS and S3 build files.
Items to do after merging:
[ ] Update GCS repository with link to this repository.
[ ] Set GCS repository read-only.
[ ] Update S3 repository with link to this repository.
[ ] Set S3 repository read-only.
[ ] Rename this repository.