From 4d4bbe80af0a6ac9f1bf05aa3a816d3e0fa9bf64 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Thu, 14 Mar 2024 15:13:18 +0100 Subject: [PATCH 01/12] #90: Upgrade dependencies --- .github/workflows/ci-build.yml | 2 +- .github/workflows/dependencies_check.yml | 32 ++- .github/workflows/dependencies_update.yml | 169 ++++++++++++ ...elease_droid_prepare_original_checksum.yml | 2 +- .project-keeper.yml | 2 + .vscode/settings.json | 2 +- dependencies.md | 246 +++++++++--------- doc/changes/changelog.md | 1 + doc/changes/changes_1.7.4.md | 50 ++++ pk_generated_parent.pom | 23 +- pom.xml | 96 +++---- 11 files changed, 445 insertions(+), 180 deletions(-) create mode 100644 .github/workflows/dependencies_update.yml create mode 100644 doc/changes/changes_1.7.4.md diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 4c88810..fdf37f6 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -38,7 +38,7 @@ jobs: 17 cache: "maven" - name: Cache SonarCloud packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar diff --git a/.github/workflows/dependencies_check.yml b/.github/workflows/dependencies_check.yml index 87b64ba..6926e55 100644 --- a/.github/workflows/dependencies_check.yml +++ b/.github/workflows/dependencies_check.yml @@ -1,6 +1,6 @@ # Generated by Project Keeper # https://github.com/exasol/project-keeper/blob/main/project-keeper/src/main/resources/templates/.github/workflows/dependencies_check.yml -name: Report Security Issues for Repository +name: Report Security Issues on: workflow_dispatch: schedule: @@ -10,10 +10,13 @@ jobs: report_security_issues: runs-on: ubuntu-latest permissions: + contents: read issues: write - + outputs: + created-issues: ${{ steps.security-issues.outputs.created-issues }} steps: - uses: actions/checkout@v4 + - name: Set up JDKs uses: actions/setup-java@v4 with: @@ -25,14 +28,37 @@ jobs: - name: Generate ossindex report run: | - mvn org.sonatype.ossindex.maven:ossindex-maven-plugin:audit \ + mvn --batch-mode org.sonatype.ossindex.maven:ossindex-maven-plugin:audit \ org.sonatype.ossindex.maven:ossindex-maven-plugin:audit-aggregate \ -Dossindex.reportFile=$(pwd)/ossindex-report.json \ -Dossindex.fail=false - name: Report Security Issues + id: security-issues uses: exasol/python-toolbox/.github/actions/security-issues@main with: format: "maven" command: "cat ossindex-report.json" github-token: ${{ secrets.GITHUB_TOKEN }} + + - name: Output security issues (Debugging) + run: | + echo "$CREATED_ISSUES" > test.jsonl + cat test.jsonl + env: + CREATED_ISSUES: ${{ steps.security-issues.outputs.created-issues }} + + start_dependency_udpate: + needs: report_security_issues + if: ${{ needs.report_security_issues.outputs.created-issues }} + concurrency: + cancel-in-progress: true + group: "dependency_update" + # Workflow needs secret INTEGRATION_TEAM_SLACK_NOTIFICATION_WEBHOOK + secrets: inherit + permissions: + contents: write + pull-requests: write + uses: ./.github/workflows/dependencies_update.yml + with: + vulnerability_issues: ${{ needs.report_security_issues.outputs.created-issues }} diff --git a/.github/workflows/dependencies_update.yml b/.github/workflows/dependencies_update.yml new file mode 100644 index 0000000..58222ba --- /dev/null +++ b/.github/workflows/dependencies_update.yml @@ -0,0 +1,169 @@ +# Generated by Project Keeper +# https://github.com/exasol/project-keeper/blob/main/project-keeper/src/main/resources/templates/.github/workflows/dependencies_update.yml +name: Update dependencies +on: + workflow_call: + inputs: + vulnerability_issues: + description: "GitHub issues for vulnerable dependencies as JSONL" + required: true + type: string + workflow_dispatch: + +jobs: + update_dependencies: + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Set up JDKs + uses: actions/setup-java@v4 + with: + distribution: "temurin" + java-version: | + 11 + 17 + cache: "maven" + + - name: Print issues + run: | + echo "Issues from Action input: $ISSUES" + env: + ISSUES: ${{ inputs.vulnerability_issues }} + + - name: Fail if not running on a branch + if: ${{ !startsWith(github.ref, 'refs/heads/') }} + uses: actions/github-script@v7 + with: + script: | + core.setFailed('Not running on a branch, github.ref is ${{ github.ref }}. Please start this workflow only on main or a branch') + + - name: Update dependencies + run: | + mvn --batch-mode com.exasol:project-keeper-maven-plugin:update-dependencies --projects . \ + -Dproject-keeper:vulnerabilities="$CREATED_ISSUES" + env: + CREATED_ISSUES: ${{ inputs.vulnerability_issues }} + + - name: Project Keeper Fix + run: | + mvn --batch-mode com.exasol:project-keeper-maven-plugin:fix --projects . + + - name: Project Keeper Fix for updated Project Keeper version + # Calling PK fix a second time is necessary because the first invocation potentially updated PK itself. + # So we need to run PK fix again with the latest PK version. + # [impl->dsn~dependency-updater.workflow.start-pk-fix~1] + run: | + mvn --batch-mode com.exasol:project-keeper-maven-plugin:fix --projects . + + - name: Generate Pull Request comment + id: pr-comment + # [impl->dsn~dependency-updater.workflow.pull-request-trigger-ci-build~1] + run: | + echo 'comment<> "$GITHUB_OUTPUT" + echo 'This Pull Request was created by [`dependencies_update.yml`](https://github.com/exasol/project-keeper/blob/main/project-keeper/src/main/resources/templates/.github/workflows/dependencies_update.yml) workflow.' >> "$GITHUB_OUTPUT" + if [ -n "$CREATED_ISSUES" ]; then + echo 'It updates dependencies to fix the following vulnerabilities:' >> "$GITHUB_OUTPUT" + echo $CREATED_ISSUES | jq --raw-output '. | "* Closes " + .issue_url + " (" + .cve + ")"' >> "$GITHUB_OUTPUT" + else + echo 'It updates dependencies.' >> "$GITHUB_OUTPUT" + fi + echo >> "$GITHUB_OUTPUT" + echo '# ⚠️ This PR does not trigger CI workflows by default ⚠️' >> "$GITHUB_OUTPUT" + echo 'Please click the **Close pull request** button and then **Reopen pull request** to trigger running checks.' >> "$GITHUB_OUTPUT" + echo 'See https://github.com/exasol/project-keeper/issues/534 for details.' >> "$GITHUB_OUTPUT" + echo 'EOF' >> "$GITHUB_OUTPUT" + + cat "$GITHUB_OUTPUT" + env: + CREATED_ISSUES: ${{ inputs.vulnerability_issues }} + + - name: Generate Pull Request Title + id: pr-title + run: | + if [ -n "$CREATED_ISSUES" ]; then + echo "Security issues are available" + echo "title=🔐 Update dependencies to fix vulnerabilities" >> "$GITHUB_OUTPUT" + else + echo "Security issues are not available" + echo "title=Update dependencies" >> "$GITHUB_OUTPUT" + fi + + cat "$GITHUB_OUTPUT" + env: + CREATED_ISSUES: ${{ inputs.vulnerability_issues }} + + - name: Configure git + run: | + git config --global user.email "opensource@exasol.com" + git config --global user.name "Automatic Dependency Updater" + + - name: Create branch + if: ${{ github.ref == 'refs/heads/main' }} + run: | + branch_name="dependency-update/$(date "+%Y%m%d%H%M%S")" + echo "Creating branch $branch_name" + git checkout -b "$branch_name" + + - name: Commit changes & push + if: ${{ startsWith(github.ref, 'refs/heads/' ) }} + run: | + branch_name=$(git rev-parse --abbrev-ref HEAD) + echo "Current branch: $branch_name" + echo "git diff --stat" + git diff --stat + echo "git diff --numstat" + git diff --numstat + echo "git diff --name-status" + git diff --name-status + echo "Adding untracked files:" + git add . --verbose --all + echo "Committing changes..." + git commit --message "$TITLE" + echo "Pushing branch $branch_name..." + git push --set-upstream origin "$branch_name" + echo "Done." + env: + TITLE: ${{ steps.pr-title.outputs.title }} + + - name: Create pull request + id: create-pr + if: ${{ github.ref == 'refs/heads/main' }} + run: | + pr_url=$(gh pr create --base main --title "$TITLE" --body "$COMMENT") + echo "Created Pull Request: $pr_url" + echo "pr_url=$pr_url" >> "$GITHUB_OUTPUT" + env: + COMMENT: ${{ steps.pr-comment.outputs.comment }} + TITLE: ${{ steps.pr-title.outputs.title }} + GH_TOKEN: ${{ github.token }} + + - name: Report failure Status to Slack channel + # Also run this step in case of failures + if: ${{ always() }} + uses: ravsamhq/notify-slack-action@v2 + with: + status: ${{ job.status }} + token: ${{ secrets.GITHUB_TOKEN }} + notification_title: "Dependency check in {repo} has {status_message}" + message_format: "{emoji} *{workflow}* {status_message} in <{repo_url}|{repo}>" + notify_when: "failure,cancelled,warnings" + env: + SLACK_WEBHOOK_URL: ${{ secrets.INTEGRATION_TEAM_SLACK_NOTIFICATION_WEBHOOK }} + + - name: Report new Pull Request to Slack channel + if: ${{ steps.create-pr.outputs.pr_url }} + uses: ravsamhq/notify-slack-action@v2 + with: + status: ${{ job.status }} + token: ${{ secrets.GITHUB_TOKEN }} + notification_title: "Dependency update for {repo} created a Pull Request" + message_format: "{workflow} created Pull Request ${{ steps.create-pr.outputs.pr_url }}" + env: + SLACK_WEBHOOK_URL: ${{ secrets.INTEGRATION_TEAM_SLACK_NOTIFICATION_WEBHOOK }} diff --git a/.github/workflows/release_droid_prepare_original_checksum.yml b/.github/workflows/release_droid_prepare_original_checksum.yml index 1a3db47..8d01a06 100644 --- a/.github/workflows/release_droid_prepare_original_checksum.yml +++ b/.github/workflows/release_droid_prepare_original_checksum.yml @@ -32,7 +32,7 @@ jobs: - name: Prepare checksum run: find target -maxdepth 1 -name *.jar -exec sha256sum "{}" + > original_checksum - name: Upload checksum to the artifactory - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: original_checksum retention-days: 5 diff --git a/.project-keeper.yml b/.project-keeper.yml index 0a53112..ad7a46c 100644 --- a/.project-keeper.yml +++ b/.project-keeper.yml @@ -11,4 +11,6 @@ build: - "8.24.0" - "7.1.25" excludes: + # Custom extension artifact + - "W-PK-CORE-153: Project-keeper version 4.1.0 is outdated. Please update project-keeper to latest version 4.2.0." - "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_upload_github_release_assets.yml'" diff --git a/.vscode/settings.json b/.vscode/settings.json index b8bbe76..b03b16c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -17,7 +17,7 @@ "java.configuration.updateBuildConfiguration": "automatic", "files.watcherExclude": { "**/target": true - }, +}, "sonarlint.connectedMode.project": { "connectionId": "exasol", "projectKey": "com.exasol:kafka-connector-extension" diff --git a/dependencies.md b/dependencies.md index 9dc4085..761fca7 100644 --- a/dependencies.md +++ b/dependencies.md @@ -7,137 +7,141 @@ | ------------------------------------------- | ------------------------------------- | | [Scala Library][0] | [Apache-2.0][1] | | [Import Export UDF Common Scala][2] | [MIT License][3] | -| [error-reporting-java][4] | [MIT License][5] | -| [Apache Commons Compress][6] | [Apache-2.0][7] | -| [kafka-avro-serializer][8] | [Apache License 2.0][9] | -| [scala-collection-compat][10] | [Apache-2.0][1] | -| [Guava: Google Core Libraries for Java][11] | [Apache License, Version 2.0][12] | -| [Apache Kafka][13] | [The Apache License, Version 2.0][12] | -| [snappy-java][14] | [Apache-2.0][15] | +| [Apache Avro][4] | [Apache-2.0][5] | +| [error-reporting-java][6] | [MIT License][7] | +| [Apache Commons Compress][8] | [Apache-2.0][5] | +| [kafka-avro-serializer][9] | [Apache License 2.0][10] | +| [scala-collection-compat][11] | [Apache-2.0][1] | +| [Guava: Google Core Libraries for Java][12] | [Apache License, Version 2.0][13] | +| [Confluent Server][14] | [The Apache License, Version 2.0][13] | +| [snappy-java][15] | [Apache-2.0][16] | ## Test Dependencies -| Dependency | License | -| ------------------------------------------ | ----------------------------------------------------------------------------- | -| [scalatest][16] | [the Apache License, ASL Version 2.0][17] | -| [scalatestplus-mockito][18] | [Apache-2.0][17] | -| [mockito-core][19] | [MIT][20] | -| [Test containers for Exasol on Docker][21] | [MIT License][22] | -| [Test Database Builder for Java][23] | [MIT License][24] | -| [Matcher for SQL Result Sets][25] | [MIT License][26] | -| [Extension integration tests library][27] | [MIT License][28] | -| [embedded-kafka-schema-registry][29] | [MIT][20] | -| [JSON in Java][30] | [Public Domain][31] | -| [Apache ZooKeeper - Server][32] | [Apache License, Version 2.0][7] | -| [Logback Core Module][33] | [Eclipse Public License - v 1.0][34]; [GNU Lesser General Public License][35] | -| [Logback Classic Module][36] | [Eclipse Public License - v 1.0][34]; [GNU Lesser General Public License][35] | -| [kafka-streams-avro-serde][37] | [Apache License 2.0][9] | -| [avro4s-core][38] | [MIT][20] | -| [Apache Avro][39] | [Apache-2.0][7] | -| [Testcontainers :: Kafka][40] | [MIT][41] | +| Dependency | License | +| ------------------------------------------ | -------------------------------------------------------------------------------------- | +| [scalatest][17] | [the Apache License, ASL Version 2.0][18] | +| [scalatestplus-mockito][19] | [Apache-2.0][18] | +| [mockito-core][20] | [MIT][21] | +| [Test containers for Exasol on Docker][22] | [MIT License][23] | +| [Test Database Builder for Java][24] | [MIT License][25] | +| [Matcher for SQL Result Sets][26] | [MIT License][27] | +| [Extension integration tests library][28] | [MIT License][29] | +| [embedded-kafka-schema-registry][30] | [MIT][21] | +| [JSON in Java][31] | [Public Domain][32] | +| [Apache ZooKeeper - Server][33] | [Apache License, Version 2.0][5] | +| [jose4j][34] | [The Apache Software License, Version 2.0][13] | +| [Jetty :: HTTP2 :: Common][35] | [Eclipse Public License - Version 2.0][36]; [Apache Software License - Version 2.0][1] | +| [Logback Core Module][37] | [Eclipse Public License - v 1.0][38]; [GNU Lesser General Public License][39] | +| [Logback Classic Module][40] | [Eclipse Public License - v 1.0][38]; [GNU Lesser General Public License][39] | +| [kafka-streams-avro-serde][41] | [Apache License 2.0][10] | +| [avro4s-core][42] | [MIT][21] | +| [Testcontainers :: Kafka][43] | [MIT][44] | ## Plugin Dependencies | Dependency | License | | ------------------------------------------------------- | --------------------------------------------- | -| [SonarQube Scanner for Maven][42] | [GNU LGPL 3][43] | -| [Apache Maven Toolchains Plugin][44] | [Apache License, Version 2.0][7] | -| [Apache Maven Compiler Plugin][45] | [Apache-2.0][7] | -| [Apache Maven Enforcer Plugin][46] | [Apache-2.0][7] | -| [Maven Flatten Plugin][47] | [Apache Software Licenese][7] | -| [org.sonatype.ossindex.maven:ossindex-maven-plugin][48] | [ASL2][12] | -| [scala-maven-plugin][49] | [Public domain (Unlicense)][50] | -| [ScalaTest Maven Plugin][51] | [the Apache License, ASL Version 2.0][17] | -| [Apache Maven Javadoc Plugin][52] | [Apache-2.0][7] | -| [Maven Surefire Plugin][53] | [Apache-2.0][7] | -| [Versions Maven Plugin][54] | [Apache License, Version 2.0][7] | -| [duplicate-finder-maven-plugin Maven Mojo][55] | [Apache License 2.0][9] | -| [Apache Maven Assembly Plugin][56] | [Apache-2.0][7] | -| [Apache Maven JAR Plugin][57] | [Apache License, Version 2.0][7] | -| [Artifact reference checker and unifier][58] | [MIT License][59] | -| [Maven Failsafe Plugin][60] | [Apache-2.0][7] | -| [JaCoCo :: Maven Plugin][61] | [Eclipse Public License 2.0][62] | -| [error-code-crawler-maven-plugin][63] | [MIT License][64] | -| [Reproducible Build Maven Plugin][65] | [Apache 2.0][12] | -| [Project Keeper Maven plugin][66] | [The MIT License][67] | -| [OpenFastTrace Maven Plugin][68] | [GNU General Public License v3.0][69] | -| [Scalastyle Maven Plugin][70] | [Apache 2.0][9] | -| [spotless-maven-plugin][71] | [The Apache Software License, Version 2.0][7] | -| [scalafix-maven-plugin][72] | [BSD-3-Clause][73] | -| [Exec Maven Plugin][74] | [Apache License 2][7] | +| [SonarQube Scanner for Maven][45] | [GNU LGPL 3][46] | +| [Apache Maven Toolchains Plugin][47] | [Apache License, Version 2.0][5] | +| [Apache Maven Compiler Plugin][48] | [Apache-2.0][5] | +| [Apache Maven Enforcer Plugin][49] | [Apache-2.0][5] | +| [Maven Flatten Plugin][50] | [Apache Software Licenese][5] | +| [org.sonatype.ossindex.maven:ossindex-maven-plugin][51] | [ASL2][13] | +| [scala-maven-plugin][52] | [Public domain (Unlicense)][53] | +| [ScalaTest Maven Plugin][54] | [the Apache License, ASL Version 2.0][18] | +| [Apache Maven Javadoc Plugin][55] | [Apache-2.0][5] | +| [Maven Surefire Plugin][56] | [Apache-2.0][5] | +| [Versions Maven Plugin][57] | [Apache License, Version 2.0][5] | +| [duplicate-finder-maven-plugin Maven Mojo][58] | [Apache License 2.0][10] | +| [Apache Maven Assembly Plugin][59] | [Apache-2.0][5] | +| [Apache Maven JAR Plugin][60] | [Apache License, Version 2.0][5] | +| [Artifact reference checker and unifier][61] | [MIT License][62] | +| [Maven Failsafe Plugin][63] | [Apache-2.0][5] | +| [JaCoCo :: Maven Plugin][64] | [Eclipse Public License 2.0][36] | +| [error-code-crawler-maven-plugin][65] | [MIT License][66] | +| [Reproducible Build Maven Plugin][67] | [Apache 2.0][13] | +| [Project Keeper Maven plugin][68] | [The MIT License][69] | +| [OpenFastTrace Maven Plugin][70] | [GNU General Public License v3.0][71] | +| [Scalastyle Maven Plugin][72] | [Apache 2.0][10] | +| [spotless-maven-plugin][73] | [The Apache Software License, Version 2.0][5] | +| [scalafix-maven-plugin][74] | [BSD-3-Clause][75] | +| [Exec Maven Plugin][76] | [Apache License 2][5] | [0]: https://www.scala-lang.org/ [1]: https://www.apache.org/licenses/LICENSE-2.0 [2]: https://github.com/exasol/import-export-udf-common-scala/ [3]: https://github.com/exasol/import-export-udf-common-scala/blob/main/LICENSE -[4]: https://github.com/exasol/error-reporting-java/ -[5]: https://github.com/exasol/error-reporting-java/blob/main/LICENSE -[6]: https://commons.apache.org/proper/commons-compress/ -[7]: https://www.apache.org/licenses/LICENSE-2.0.txt -[8]: http://confluent.io/kafka-avro-serializer -[9]: http://www.apache.org/licenses/LICENSE-2.0.html -[10]: http://www.scala-lang.org/ -[11]: https://github.com/google/guava -[12]: http://www.apache.org/licenses/LICENSE-2.0.txt -[13]: https://kafka.apache.org -[14]: https://github.com/xerial/snappy-java -[15]: https://www.apache.org/licenses/LICENSE-2.0.html -[16]: http://www.scalatest.org -[17]: http://www.apache.org/licenses/LICENSE-2.0 -[18]: https://github.com/scalatest/scalatestplus-mockito -[19]: https://github.com/mockito/mockito -[20]: https://opensource.org/licenses/MIT -[21]: https://github.com/exasol/exasol-testcontainers/ -[22]: https://github.com/exasol/exasol-testcontainers/blob/main/LICENSE -[23]: https://github.com/exasol/test-db-builder-java/ -[24]: https://github.com/exasol/test-db-builder-java/blob/main/LICENSE -[25]: https://github.com/exasol/hamcrest-resultset-matcher/ -[26]: https://github.com/exasol/hamcrest-resultset-matcher/blob/main/LICENSE -[27]: https://github.com/exasol/extension-manager/ -[28]: https://github.com/exasol/extension-manager/blob/main/LICENSE -[29]: https://github.com/embeddedkafka/embedded-kafka-schema-registry -[30]: https://github.com/douglascrockford/JSON-java -[31]: https://github.com/stleary/JSON-java/blob/master/LICENSE -[32]: http://zookeeper.apache.org/zookeeper -[33]: http://logback.qos.ch/logback-core -[34]: http://www.eclipse.org/legal/epl-v10.html -[35]: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html -[36]: http://logback.qos.ch/logback-classic -[37]: http://confluent.io/kafka-streams-avro-serde -[38]: https://github.com/sksamuel/avro4s -[39]: https://avro.apache.org -[40]: https://java.testcontainers.org -[41]: http://opensource.org/licenses/MIT -[42]: http://sonarsource.github.io/sonar-scanner-maven/ -[43]: http://www.gnu.org/licenses/lgpl.txt -[44]: https://maven.apache.org/plugins/maven-toolchains-plugin/ -[45]: https://maven.apache.org/plugins/maven-compiler-plugin/ -[46]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ -[47]: https://www.mojohaus.org/flatten-maven-plugin/ -[48]: https://sonatype.github.io/ossindex-maven/maven-plugin/ -[49]: http://github.com/davidB/scala-maven-plugin -[50]: http://unlicense.org/ -[51]: https://www.scalatest.org/user_guide/using_the_scalatest_maven_plugin -[52]: https://maven.apache.org/plugins/maven-javadoc-plugin/ -[53]: https://maven.apache.org/surefire/maven-surefire-plugin/ -[54]: https://www.mojohaus.org/versions/versions-maven-plugin/ -[55]: https://basepom.github.io/duplicate-finder-maven-plugin -[56]: https://maven.apache.org/plugins/maven-assembly-plugin/ -[57]: https://maven.apache.org/plugins/maven-jar-plugin/ -[58]: https://github.com/exasol/artifact-reference-checker-maven-plugin/ -[59]: https://github.com/exasol/artifact-reference-checker-maven-plugin/blob/main/LICENSE -[60]: https://maven.apache.org/surefire/maven-failsafe-plugin/ -[61]: https://www.jacoco.org/jacoco/trunk/doc/maven.html -[62]: https://www.eclipse.org/legal/epl-2.0/ -[63]: https://github.com/exasol/error-code-crawler-maven-plugin/ -[64]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE -[65]: http://zlika.github.io/reproducible-build-maven-plugin -[66]: https://github.com/exasol/project-keeper/ -[67]: https://github.com/exasol/project-keeper/blob/main/LICENSE -[68]: https://github.com/itsallcode/openfasttrace-maven-plugin -[69]: https://www.gnu.org/licenses/gpl-3.0.html -[70]: http://www.scalastyle.org -[71]: https://github.com/diffplug/spotless -[72]: https://github.com/evis/scalafix-maven-plugin -[73]: https://opensource.org/licenses/BSD-3-Clause -[74]: https://www.mojohaus.org/exec-maven-plugin +[4]: https://avro.apache.org +[5]: https://www.apache.org/licenses/LICENSE-2.0.txt +[6]: https://github.com/exasol/error-reporting-java/ +[7]: https://github.com/exasol/error-reporting-java/blob/main/LICENSE +[8]: https://commons.apache.org/proper/commons-compress/ +[9]: http://confluent.io/kafka-avro-serializer +[10]: http://www.apache.org/licenses/LICENSE-2.0.html +[11]: http://www.scala-lang.org/ +[12]: https://github.com/google/guava +[13]: http://www.apache.org/licenses/LICENSE-2.0.txt +[14]: https://kafka.apache.org +[15]: https://github.com/xerial/snappy-java +[16]: https://www.apache.org/licenses/LICENSE-2.0.html +[17]: http://www.scalatest.org +[18]: http://www.apache.org/licenses/LICENSE-2.0 +[19]: https://github.com/scalatest/scalatestplus-mockito +[20]: https://github.com/mockito/mockito +[21]: https://opensource.org/licenses/MIT +[22]: https://github.com/exasol/exasol-testcontainers/ +[23]: https://github.com/exasol/exasol-testcontainers/blob/main/LICENSE +[24]: https://github.com/exasol/test-db-builder-java/ +[25]: https://github.com/exasol/test-db-builder-java/blob/main/LICENSE +[26]: https://github.com/exasol/hamcrest-resultset-matcher/ +[27]: https://github.com/exasol/hamcrest-resultset-matcher/blob/main/LICENSE +[28]: https://github.com/exasol/extension-manager/ +[29]: https://github.com/exasol/extension-manager/blob/main/LICENSE +[30]: https://github.com/embeddedkafka/embedded-kafka-schema-registry +[31]: https://github.com/douglascrockford/JSON-java +[32]: https://github.com/stleary/JSON-java/blob/master/LICENSE +[33]: http://zookeeper.apache.org/zookeeper +[34]: https://bitbucket.org/b_c/jose4j/ +[35]: https://eclipse.dev/jetty/http2-parent/http2-common +[36]: https://www.eclipse.org/legal/epl-2.0/ +[37]: http://logback.qos.ch/logback-core +[38]: http://www.eclipse.org/legal/epl-v10.html +[39]: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html +[40]: http://logback.qos.ch/logback-classic +[41]: http://confluent.io/kafka-streams-avro-serde +[42]: https://github.com/sksamuel/avro4s +[43]: https://java.testcontainers.org +[44]: http://opensource.org/licenses/MIT +[45]: http://sonarsource.github.io/sonar-scanner-maven/ +[46]: http://www.gnu.org/licenses/lgpl.txt +[47]: https://maven.apache.org/plugins/maven-toolchains-plugin/ +[48]: https://maven.apache.org/plugins/maven-compiler-plugin/ +[49]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ +[50]: https://www.mojohaus.org/flatten-maven-plugin/ +[51]: https://sonatype.github.io/ossindex-maven/maven-plugin/ +[52]: http://github.com/davidB/scala-maven-plugin +[53]: http://unlicense.org/ +[54]: https://www.scalatest.org/user_guide/using_the_scalatest_maven_plugin +[55]: https://maven.apache.org/plugins/maven-javadoc-plugin/ +[56]: https://maven.apache.org/surefire/maven-surefire-plugin/ +[57]: https://www.mojohaus.org/versions/versions-maven-plugin/ +[58]: https://basepom.github.io/duplicate-finder-maven-plugin +[59]: https://maven.apache.org/plugins/maven-assembly-plugin/ +[60]: https://maven.apache.org/plugins/maven-jar-plugin/ +[61]: https://github.com/exasol/artifact-reference-checker-maven-plugin/ +[62]: https://github.com/exasol/artifact-reference-checker-maven-plugin/blob/main/LICENSE +[63]: https://maven.apache.org/surefire/maven-failsafe-plugin/ +[64]: https://www.jacoco.org/jacoco/trunk/doc/maven.html +[65]: https://github.com/exasol/error-code-crawler-maven-plugin/ +[66]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE +[67]: http://zlika.github.io/reproducible-build-maven-plugin +[68]: https://github.com/exasol/project-keeper/ +[69]: https://github.com/exasol/project-keeper/blob/main/LICENSE +[70]: https://github.com/itsallcode/openfasttrace-maven-plugin +[71]: https://www.gnu.org/licenses/gpl-3.0.html +[72]: http://www.scalastyle.org +[73]: https://github.com/diffplug/spotless +[74]: https://github.com/evis/scalafix-maven-plugin +[75]: https://opensource.org/licenses/BSD-3-Clause +[76]: https://www.mojohaus.org/exec-maven-plugin diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index f027c51..40d2811 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,5 +1,6 @@ # Changes +* [1.7.4](changes_1.7.4.md) * [1.7.3](changes_1.7.3.md) * [1.7.2](changes_1.7.2.md) * [1.7.1](changes_1.7.1.md) diff --git a/doc/changes/changes_1.7.4.md b/doc/changes/changes_1.7.4.md new file mode 100644 index 0000000..1c5d723 --- /dev/null +++ b/doc/changes/changes_1.7.4.md @@ -0,0 +1,50 @@ +# Exasol Kafka Connector Extension 1.7.4, released 2024-??-?? + +Code name: + +## Summary + +## Features + +* ISSUE_NUMBER: description + +## Dependency Updates + +### Compile Dependency Updates + +* Updated `com.exasol:import-export-udf-common-scala_2.13:1.1.1` to `2.0.0` +* Updated `com.google.guava:guava:33.0.0-jre` to `33.1.0-jre` +* Updated `io.confluent:kafka-avro-serializer:7.5.2` to `7.6.0` +* Added `org.apache.avro:avro:1.11.3` +* Updated `org.apache.commons:commons-compress:1.26.0` to `1.26.1` +* Updated `org.apache.kafka:kafka-clients:3.5.1` to `7.6.0-ce` + +### Test Dependency Updates + +* Updated `ch.qos.logback:logback-classic:1.4.14` to `1.5.3` +* Updated `ch.qos.logback:logback-core:1.4.14` to `1.5.3` +* Updated `com.exasol:exasol-testcontainers:7.0.0` to `7.0.1` +* Updated `com.exasol:extension-manager-integration-test-java:0.5.7` to `0.5.8` +* Updated `com.exasol:hamcrest-resultset-matcher:1.6.3` to `1.6.5` +* Updated `com.exasol:test-db-builder-java:3.5.3` to `3.5.4` +* Updated `com.sksamuel.avro4s:avro4s-core_2.13:4.1.1` to `4.1.2` +* Updated `io.confluent:kafka-streams-avro-serde:7.5.2` to `7.6.0` +* Updated `io.github.embeddedkafka:embedded-kafka-schema-registry_2.13:7.5.2` to `7.6.0` +* Removed `org.apache.avro:avro:1.11.3` +* Updated `org.apache.zookeeper:zookeeper:3.9.1` to `3.9.2` +* Added `org.bitbucket.b_c:jose4j:0.9.6` +* Added `org.eclipse.jetty.http2:http2-common:11.0.20` +* Updated `org.json:json:20231013` to `20240303` +* Updated `org.mockito:mockito-core:5.8.0` to `5.11.0` +* Updated `org.testcontainers:kafka:1.19.3` to `1.19.7` + +### Plugin Dependency Updates + +* Updated `com.exasol:error-code-crawler-maven-plugin:1.3.1` to `2.0.0` +* Updated `com.exasol:project-keeper-maven-plugin:3.0.1` to `4.1.0` +* Updated `org.apache.maven.plugins:maven-compiler-plugin:3.11.0` to `3.12.1` +* Updated `org.apache.maven.plugins:maven-failsafe-plugin:3.2.3` to `3.2.5` +* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.6.2` to `3.6.3` +* Updated `org.apache.maven.plugins:maven-surefire-plugin:3.2.3` to `3.2.5` +* Updated `org.codehaus.mojo:flatten-maven-plugin:1.5.0` to `1.6.0` +* Updated `org.itsallcode:openfasttrace-maven-plugin:1.6.2` to `1.8.0` diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom index 80b010d..947b28b 100644 --- a/pk_generated_parent.pom +++ b/pk_generated_parent.pom @@ -3,7 +3,7 @@ 4.0.0 com.exasol kafka-connector-extension-generated-parent - 1.7.3 + 1.7.4 pom UTF-8 @@ -63,7 +63,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.1 ${java.version} ${java.version} @@ -101,7 +101,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.5.0 + 1.6.0 true oss @@ -140,7 +140,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.3 + 3.2.5 @@ -164,6 +164,17 @@ file:///${project.basedir}/versionsMavenPluginRules.xml + false + true + true + true + false + true + true + true + false + true + true @@ -244,7 +255,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.2.3 + 3.2.5 -Djava.util.logging.config.file=src/test/resources/logging.properties ${argLine} @@ -305,7 +316,7 @@ com.exasol error-code-crawler-maven-plugin - 1.3.1 + 2.0.0 verify diff --git a/pom.xml b/pom.xml index b907898..ae3c65f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.exasol kafka-connector-extension - 1.7.3 + 1.7.4 Exasol Kafka Connector Extension Exasol Kafka Extension for accessing Apache Kafka https://github.com/exasol/kafka-connector-extension/ @@ -35,22 +35,19 @@ com.exasol import-export-udf-common-scala_${scala.compat.version} - 1.1.1 + 2.0.0 - - org.slf4j - slf4j-simple - - - org.apache.avro - avro - org.apache.commons commons-compress + + org.apache.avro + avro + 1.11.3 + com.exasol error-reporting-java @@ -59,12 +56,12 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 io.confluent kafka-avro-serializer - 7.5.2 + 7.6.0 org.slf4j @@ -104,7 +101,7 @@ com.google.guava guava - 33.0.0-jre + 33.1.0-jre @@ -122,37 +119,44 @@ org.mockito mockito-core - 5.8.0 + 5.11.0 test com.exasol exasol-testcontainers - 7.0.0 + 7.0.1 test com.exasol test-db-builder-java - 3.5.3 + 3.5.4 test com.exasol hamcrest-resultset-matcher - 1.6.3 + 1.6.5 test com.exasol extension-manager-integration-test-java - 0.5.7 + 0.5.8 test + + + + xerces + xercesImpl + + io.github.embeddedkafka embedded-kafka-schema-registry_${scala.compat.version} - 7.5.2 + 7.6.0 test @@ -181,34 +185,48 @@ org.json json - 20231013 + 20240303 test org.apache.zookeeper zookeeper - 3.9.1 + 3.9.2 + test + + + + org.bitbucket.b_c + jose4j + 0.9.6 + test + + + + org.eclipse.jetty.http2 + http2-common + 11.0.20 test ch.qos.logback logback-core - 1.4.14 + 1.5.3 test ch.qos.logback logback-classic - 1.4.14 + 1.5.3 test io.confluent kafka-streams-avro-serde - 7.5.2 + 7.6.0 test @@ -220,26 +238,19 @@ com.sksamuel.avro4s avro4s-core_${scala.compat.version} - 4.1.1 - test - - - - org.apache.avro - avro - 1.11.3 + 4.1.2 test org.testcontainers kafka - 1.19.3 + 1.19.7 test org.apache.kafka kafka-clients - 3.5.1 + 7.6.0-ce @@ -359,7 +370,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.2 + 3.6.3 attach-javadocs @@ -405,22 +416,13 @@ org.sonatype.ossindex.maven ossindex-maven-plugin - ${ossindex.skip} CVE-2022-36944 - - CVE-2020-36641 - - CVE-2023-40167 - - CVE-2023-44487 CVE-2023-36479 - - CVE-2023-36478 @@ -444,7 +446,7 @@ com.exasol project-keeper-maven-plugin - 3.0.1 + 4.1.0 @@ -456,7 +458,7 @@ org.itsallcode openfasttrace-maven-plugin - 1.6.2 + 1.8.0 trace-requirements @@ -602,7 +604,7 @@ kafka-connector-extension-generated-parent com.exasol - 1.7.3 + 1.7.4 pk_generated_parent.pom From 0d3656fedd11399c95e5231a388ae185a5dd35bc Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Thu, 14 Mar 2024 15:16:43 +0100 Subject: [PATCH 02/12] Cleanup --- .gitattributes | 1 + .vscode/settings.json | 2 +- doc/user_guide/user_guide.md | 12 ++++++------ pom.xml | 4 ++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitattributes b/.gitattributes index 9789f92..91e835d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,6 +8,7 @@ doc/changes/changelog.md linguist-genera .github/workflows/broken_links_checker.yml linguist-generated=true .github/workflows/ci-build-next-java.yml linguist-generated=true .github/workflows/dependencies_check.yml linguist-generated=true +.github/workflows/dependencies_update.yml linguist-generated=true .github/workflows/release_droid_prepare_original_checksum.yml linguist-generated=true .github/workflows/release_droid_print_quick_checksum.yml linguist-generated=true .settings/org.eclipse.jdt.core.prefs linguist-generated=true diff --git a/.vscode/settings.json b/.vscode/settings.json index b03b16c..b8bbe76 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -17,7 +17,7 @@ "java.configuration.updateBuildConfiguration": "automatic", "files.watcherExclude": { "**/target": true -}, + }, "sonarlint.connectedMode.project": { "connectionId": "exasol", "projectKey": "com.exasol:kafka-connector-extension" diff --git a/doc/user_guide/user_guide.md b/doc/user_guide/user_guide.md index 2b8d90e..b239a45 100644 --- a/doc/user_guide/user_guide.md +++ b/doc/user_guide/user_guide.md @@ -61,7 +61,7 @@ checksum provided together with the jar file. To check the SHA256 sum of the downloaded jar, run the command: ```sh -sha256sum exasol-kafka-connector-extension-1.7.3.jar +sha256sum exasol-kafka-connector-extension-1.7.4.jar ``` ### Building From Source @@ -84,7 +84,7 @@ sbt assembly ``` The packaged jar file should be located at -`target/scala-2.12/exasol-kafka-connector-extension-1.7.3.jar`. +`target/scala-2.12/exasol-kafka-connector-extension-1.7.4.jar`. ### Create an Exasol BucketFS Bucket @@ -106,7 +106,7 @@ jar, please make sure the BucketFS ports are open. Upload the jar file using the `curl` command: ```bash -curl -X PUT -T exasol-kafka-connector-extension-1.7.3.jar \ +curl -X PUT -T exasol-kafka-connector-extension-1.7.4.jar \ http://w:@:2580// ``` @@ -135,12 +135,12 @@ OPEN SCHEMA KAFKA_EXTENSION; CREATE OR REPLACE JAVA SET SCRIPT KAFKA_CONSUMER(...) EMITS (...) AS %scriptclass com.exasol.cloudetl.kafka.KafkaConsumerQueryGenerator; - %jar /buckets/bfsdefault//exasol-kafka-connector-extension-1.7.3.jar; + %jar /buckets/bfsdefault//exasol-kafka-connector-extension-1.7.4.jar; / CREATE OR REPLACE JAVA SET SCRIPT KAFKA_IMPORT(...) EMITS (...) AS %scriptclass com.exasol.cloudetl.kafka.KafkaTopicDataImporter; - %jar /buckets/bfsdefault//exasol-kafka-connector-extension-1.7.3.jar; + %jar /buckets/bfsdefault//exasol-kafka-connector-extension-1.7.4.jar; / CREATE OR REPLACE JAVA SET SCRIPT KAFKA_METADATA( @@ -150,7 +150,7 @@ CREATE OR REPLACE JAVA SET SCRIPT KAFKA_METADATA( ) EMITS (partition_index DECIMAL(18, 0), max_offset DECIMAL(36,0)) AS %scriptclass com.exasol.cloudetl.kafka.KafkaTopicMetadataReader; - %jar /buckets/bfsdefault//exasol-kafka-connector-extension-1.7.3.jar; + %jar /buckets/bfsdefault//exasol-kafka-connector-extension-1.7.4.jar; / ``` diff --git a/pom.xml b/pom.xml index ae3c65f..16cda2d 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,10 @@ import-export-udf-common-scala_${scala.compat.version} 2.0.0 + + org.slf4j + slf4j-simple + org.apache.commons commons-compress From 4be7486673fc765e7909f034d43287f146d3ea2a Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Thu, 14 Mar 2024 15:20:39 +0100 Subject: [PATCH 03/12] Add changelog --- doc/changes/changes_1.7.4.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/doc/changes/changes_1.7.4.md b/doc/changes/changes_1.7.4.md index 1c5d723..d6231f7 100644 --- a/doc/changes/changes_1.7.4.md +++ b/doc/changes/changes_1.7.4.md @@ -1,12 +1,19 @@ -# Exasol Kafka Connector Extension 1.7.4, released 2024-??-?? +# Exasol Kafka Connector Extension 1.7.4, released 2024-03-14 -Code name: +Code name: Fix CVE-2024-25710 in compile dependency ## Summary -## Features +This release fixes the following vulnerabilities in dependencies: +* CVE-2024-25710 in `org.apache.commons:commons-compress:jar:1.21:compile` +* CVE-2024-22201 in `org.eclipse.jetty.http2:http2-common:jar:9.4.53.v20231009:test` +* CVE-2023-51775 in `org.bitbucket.b_c:jose4j:jar:0.9.3:test` -* ISSUE_NUMBER: description +## Security + +* #88: Fixed CVE-2024-25710 in `org.apache.commons:commons-compress:jar:1.21:compile` +* #89: Fixed CVE-2024-22201 in `org.eclipse.jetty.http2:http2-common:jar:9.4.53.v20231009:test` +* #90: Fixed CVE-2023-51775 in `org.bitbucket.b_c:jose4j:jar:0.9.3:test` ## Dependency Updates From 8375bc7eb6a1a465d41cfec2583fcf73780e4e2c Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Thu, 14 Mar 2024 16:07:06 +0100 Subject: [PATCH 04/12] Fix build --- dependencies.md | 252 +++++++++--------- doc/changes/changes_1.7.4.md | 2 + pom.xml | 38 +-- .../ittests/RecordFieldSpecificationIT.scala | 2 +- .../ittests/serde/AvroRecordFormat.scala | 3 +- .../kafka/ittests/serde/PrimitiveSerdes.scala | 2 +- 6 files changed, 152 insertions(+), 147 deletions(-) diff --git a/dependencies.md b/dependencies.md index 761fca7..4818e68 100644 --- a/dependencies.md +++ b/dependencies.md @@ -3,70 +3,71 @@ ## Compile Dependencies -| Dependency | License | -| ------------------------------------------- | ------------------------------------- | -| [Scala Library][0] | [Apache-2.0][1] | -| [Import Export UDF Common Scala][2] | [MIT License][3] | -| [Apache Avro][4] | [Apache-2.0][5] | -| [error-reporting-java][6] | [MIT License][7] | -| [Apache Commons Compress][8] | [Apache-2.0][5] | -| [kafka-avro-serializer][9] | [Apache License 2.0][10] | -| [scala-collection-compat][11] | [Apache-2.0][1] | -| [Guava: Google Core Libraries for Java][12] | [Apache License, Version 2.0][13] | -| [Confluent Server][14] | [The Apache License, Version 2.0][13] | -| [snappy-java][15] | [Apache-2.0][16] | +| Dependency | License | +| ------------------------------------------- | --------------------------------------------- | +| [Scala Library][0] | [Apache-2.0][1] | +| [Import Export UDF Common Scala][2] | [MIT License][3] | +| [Apache Avro][4] | [Apache-2.0][5] | +| [Jackson-core][6] | [The Apache Software License, Version 2.0][5] | +| [error-reporting-java][7] | [MIT License][8] | +| [Apache Commons Compress][9] | [Apache-2.0][5] | +| [kafka-avro-serializer][10] | [Apache License 2.0][11] | +| [scala-collection-compat][12] | [Apache-2.0][1] | +| [Guava: Google Core Libraries for Java][13] | [Apache License, Version 2.0][14] | +| [Confluent Server][15] | [The Apache License, Version 2.0][14] | +| [snappy-java][16] | [Apache-2.0][17] | ## Test Dependencies | Dependency | License | | ------------------------------------------ | -------------------------------------------------------------------------------------- | -| [scalatest][17] | [the Apache License, ASL Version 2.0][18] | -| [scalatestplus-mockito][19] | [Apache-2.0][18] | -| [mockito-core][20] | [MIT][21] | -| [Test containers for Exasol on Docker][22] | [MIT License][23] | -| [Test Database Builder for Java][24] | [MIT License][25] | -| [Matcher for SQL Result Sets][26] | [MIT License][27] | -| [Extension integration tests library][28] | [MIT License][29] | -| [embedded-kafka-schema-registry][30] | [MIT][21] | -| [JSON in Java][31] | [Public Domain][32] | -| [Apache ZooKeeper - Server][33] | [Apache License, Version 2.0][5] | -| [jose4j][34] | [The Apache Software License, Version 2.0][13] | -| [Jetty :: HTTP2 :: Common][35] | [Eclipse Public License - Version 2.0][36]; [Apache Software License - Version 2.0][1] | -| [Logback Core Module][37] | [Eclipse Public License - v 1.0][38]; [GNU Lesser General Public License][39] | -| [Logback Classic Module][40] | [Eclipse Public License - v 1.0][38]; [GNU Lesser General Public License][39] | -| [kafka-streams-avro-serde][41] | [Apache License 2.0][10] | -| [avro4s-core][42] | [MIT][21] | -| [Testcontainers :: Kafka][43] | [MIT][44] | +| [scalatest][18] | [the Apache License, ASL Version 2.0][19] | +| [scalatestplus-mockito][20] | [Apache-2.0][19] | +| [mockito-core][21] | [MIT][22] | +| [Test containers for Exasol on Docker][23] | [MIT License][24] | +| [Test Database Builder for Java][25] | [MIT License][26] | +| [Matcher for SQL Result Sets][27] | [MIT License][28] | +| [Extension integration tests library][29] | [MIT License][30] | +| [embedded-kafka-schema-registry][31] | [MIT][22] | +| [JSON in Java][32] | [Public Domain][33] | +| [Apache ZooKeeper - Server][34] | [Apache License, Version 2.0][5] | +| [jose4j][35] | [The Apache Software License, Version 2.0][14] | +| [Jetty :: HTTP2 :: Common][36] | [Eclipse Public License - Version 2.0][37]; [Apache Software License - Version 2.0][1] | +| [Logback Core Module][38] | [Eclipse Public License - v 1.0][39]; [GNU Lesser General Public License][40] | +| [Logback Classic Module][41] | [Eclipse Public License - v 1.0][39]; [GNU Lesser General Public License][40] | +| [kafka-streams-avro-serde][42] | [Apache License 2.0][11] | +| [avro4s-core][43] | [MIT][22] | +| [Testcontainers :: Kafka][44] | [MIT][45] | ## Plugin Dependencies | Dependency | License | | ------------------------------------------------------- | --------------------------------------------- | -| [SonarQube Scanner for Maven][45] | [GNU LGPL 3][46] | -| [Apache Maven Toolchains Plugin][47] | [Apache License, Version 2.0][5] | -| [Apache Maven Compiler Plugin][48] | [Apache-2.0][5] | -| [Apache Maven Enforcer Plugin][49] | [Apache-2.0][5] | -| [Maven Flatten Plugin][50] | [Apache Software Licenese][5] | -| [org.sonatype.ossindex.maven:ossindex-maven-plugin][51] | [ASL2][13] | -| [scala-maven-plugin][52] | [Public domain (Unlicense)][53] | -| [ScalaTest Maven Plugin][54] | [the Apache License, ASL Version 2.0][18] | -| [Apache Maven Javadoc Plugin][55] | [Apache-2.0][5] | -| [Maven Surefire Plugin][56] | [Apache-2.0][5] | -| [Versions Maven Plugin][57] | [Apache License, Version 2.0][5] | -| [duplicate-finder-maven-plugin Maven Mojo][58] | [Apache License 2.0][10] | -| [Apache Maven Assembly Plugin][59] | [Apache-2.0][5] | -| [Apache Maven JAR Plugin][60] | [Apache License, Version 2.0][5] | -| [Artifact reference checker and unifier][61] | [MIT License][62] | -| [Maven Failsafe Plugin][63] | [Apache-2.0][5] | -| [JaCoCo :: Maven Plugin][64] | [Eclipse Public License 2.0][36] | -| [error-code-crawler-maven-plugin][65] | [MIT License][66] | -| [Reproducible Build Maven Plugin][67] | [Apache 2.0][13] | -| [Project Keeper Maven plugin][68] | [The MIT License][69] | -| [OpenFastTrace Maven Plugin][70] | [GNU General Public License v3.0][71] | -| [Scalastyle Maven Plugin][72] | [Apache 2.0][10] | -| [spotless-maven-plugin][73] | [The Apache Software License, Version 2.0][5] | -| [scalafix-maven-plugin][74] | [BSD-3-Clause][75] | -| [Exec Maven Plugin][76] | [Apache License 2][5] | +| [SonarQube Scanner for Maven][46] | [GNU LGPL 3][47] | +| [Apache Maven Toolchains Plugin][48] | [Apache License, Version 2.0][5] | +| [Apache Maven Compiler Plugin][49] | [Apache-2.0][5] | +| [Apache Maven Enforcer Plugin][50] | [Apache-2.0][5] | +| [Maven Flatten Plugin][51] | [Apache Software Licenese][5] | +| [org.sonatype.ossindex.maven:ossindex-maven-plugin][52] | [ASL2][14] | +| [scala-maven-plugin][53] | [Public domain (Unlicense)][54] | +| [ScalaTest Maven Plugin][55] | [the Apache License, ASL Version 2.0][19] | +| [Apache Maven Javadoc Plugin][56] | [Apache-2.0][5] | +| [Maven Surefire Plugin][57] | [Apache-2.0][5] | +| [Versions Maven Plugin][58] | [Apache License, Version 2.0][5] | +| [duplicate-finder-maven-plugin Maven Mojo][59] | [Apache License 2.0][11] | +| [Apache Maven Assembly Plugin][60] | [Apache-2.0][5] | +| [Apache Maven JAR Plugin][61] | [Apache License, Version 2.0][5] | +| [Artifact reference checker and unifier][62] | [MIT License][63] | +| [Maven Failsafe Plugin][64] | [Apache-2.0][5] | +| [JaCoCo :: Maven Plugin][65] | [Eclipse Public License 2.0][37] | +| [error-code-crawler-maven-plugin][66] | [MIT License][67] | +| [Reproducible Build Maven Plugin][68] | [Apache 2.0][14] | +| [Project Keeper Maven plugin][69] | [The MIT License][70] | +| [OpenFastTrace Maven Plugin][71] | [GNU General Public License v3.0][72] | +| [Scalastyle Maven Plugin][73] | [Apache 2.0][11] | +| [spotless-maven-plugin][74] | [The Apache Software License, Version 2.0][5] | +| [scalafix-maven-plugin][75] | [BSD-3-Clause][76] | +| [Exec Maven Plugin][77] | [Apache License 2][5] | [0]: https://www.scala-lang.org/ [1]: https://www.apache.org/licenses/LICENSE-2.0 @@ -74,74 +75,75 @@ [3]: https://github.com/exasol/import-export-udf-common-scala/blob/main/LICENSE [4]: https://avro.apache.org [5]: https://www.apache.org/licenses/LICENSE-2.0.txt -[6]: https://github.com/exasol/error-reporting-java/ -[7]: https://github.com/exasol/error-reporting-java/blob/main/LICENSE -[8]: https://commons.apache.org/proper/commons-compress/ -[9]: http://confluent.io/kafka-avro-serializer -[10]: http://www.apache.org/licenses/LICENSE-2.0.html -[11]: http://www.scala-lang.org/ -[12]: https://github.com/google/guava -[13]: http://www.apache.org/licenses/LICENSE-2.0.txt -[14]: https://kafka.apache.org -[15]: https://github.com/xerial/snappy-java -[16]: https://www.apache.org/licenses/LICENSE-2.0.html -[17]: http://www.scalatest.org -[18]: http://www.apache.org/licenses/LICENSE-2.0 -[19]: https://github.com/scalatest/scalatestplus-mockito -[20]: https://github.com/mockito/mockito -[21]: https://opensource.org/licenses/MIT -[22]: https://github.com/exasol/exasol-testcontainers/ -[23]: https://github.com/exasol/exasol-testcontainers/blob/main/LICENSE -[24]: https://github.com/exasol/test-db-builder-java/ -[25]: https://github.com/exasol/test-db-builder-java/blob/main/LICENSE -[26]: https://github.com/exasol/hamcrest-resultset-matcher/ -[27]: https://github.com/exasol/hamcrest-resultset-matcher/blob/main/LICENSE -[28]: https://github.com/exasol/extension-manager/ -[29]: https://github.com/exasol/extension-manager/blob/main/LICENSE -[30]: https://github.com/embeddedkafka/embedded-kafka-schema-registry -[31]: https://github.com/douglascrockford/JSON-java -[32]: https://github.com/stleary/JSON-java/blob/master/LICENSE -[33]: http://zookeeper.apache.org/zookeeper -[34]: https://bitbucket.org/b_c/jose4j/ -[35]: https://eclipse.dev/jetty/http2-parent/http2-common -[36]: https://www.eclipse.org/legal/epl-2.0/ -[37]: http://logback.qos.ch/logback-core -[38]: http://www.eclipse.org/legal/epl-v10.html -[39]: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html -[40]: http://logback.qos.ch/logback-classic -[41]: http://confluent.io/kafka-streams-avro-serde -[42]: https://github.com/sksamuel/avro4s -[43]: https://java.testcontainers.org -[44]: http://opensource.org/licenses/MIT -[45]: http://sonarsource.github.io/sonar-scanner-maven/ -[46]: http://www.gnu.org/licenses/lgpl.txt -[47]: https://maven.apache.org/plugins/maven-toolchains-plugin/ -[48]: https://maven.apache.org/plugins/maven-compiler-plugin/ -[49]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ -[50]: https://www.mojohaus.org/flatten-maven-plugin/ -[51]: https://sonatype.github.io/ossindex-maven/maven-plugin/ -[52]: http://github.com/davidB/scala-maven-plugin -[53]: http://unlicense.org/ -[54]: https://www.scalatest.org/user_guide/using_the_scalatest_maven_plugin -[55]: https://maven.apache.org/plugins/maven-javadoc-plugin/ -[56]: https://maven.apache.org/surefire/maven-surefire-plugin/ -[57]: https://www.mojohaus.org/versions/versions-maven-plugin/ -[58]: https://basepom.github.io/duplicate-finder-maven-plugin -[59]: https://maven.apache.org/plugins/maven-assembly-plugin/ -[60]: https://maven.apache.org/plugins/maven-jar-plugin/ -[61]: https://github.com/exasol/artifact-reference-checker-maven-plugin/ -[62]: https://github.com/exasol/artifact-reference-checker-maven-plugin/blob/main/LICENSE -[63]: https://maven.apache.org/surefire/maven-failsafe-plugin/ -[64]: https://www.jacoco.org/jacoco/trunk/doc/maven.html -[65]: https://github.com/exasol/error-code-crawler-maven-plugin/ -[66]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE -[67]: http://zlika.github.io/reproducible-build-maven-plugin -[68]: https://github.com/exasol/project-keeper/ -[69]: https://github.com/exasol/project-keeper/blob/main/LICENSE -[70]: https://github.com/itsallcode/openfasttrace-maven-plugin -[71]: https://www.gnu.org/licenses/gpl-3.0.html -[72]: http://www.scalastyle.org -[73]: https://github.com/diffplug/spotless -[74]: https://github.com/evis/scalafix-maven-plugin -[75]: https://opensource.org/licenses/BSD-3-Clause -[76]: https://www.mojohaus.org/exec-maven-plugin +[6]: https://github.com/FasterXML/jackson-core +[7]: https://github.com/exasol/error-reporting-java/ +[8]: https://github.com/exasol/error-reporting-java/blob/main/LICENSE +[9]: https://commons.apache.org/proper/commons-compress/ +[10]: http://confluent.io/kafka-avro-serializer +[11]: http://www.apache.org/licenses/LICENSE-2.0.html +[12]: http://www.scala-lang.org/ +[13]: https://github.com/google/guava +[14]: http://www.apache.org/licenses/LICENSE-2.0.txt +[15]: https://kafka.apache.org +[16]: https://github.com/xerial/snappy-java +[17]: https://www.apache.org/licenses/LICENSE-2.0.html +[18]: http://www.scalatest.org +[19]: http://www.apache.org/licenses/LICENSE-2.0 +[20]: https://github.com/scalatest/scalatestplus-mockito +[21]: https://github.com/mockito/mockito +[22]: https://opensource.org/licenses/MIT +[23]: https://github.com/exasol/exasol-testcontainers/ +[24]: https://github.com/exasol/exasol-testcontainers/blob/main/LICENSE +[25]: https://github.com/exasol/test-db-builder-java/ +[26]: https://github.com/exasol/test-db-builder-java/blob/main/LICENSE +[27]: https://github.com/exasol/hamcrest-resultset-matcher/ +[28]: https://github.com/exasol/hamcrest-resultset-matcher/blob/main/LICENSE +[29]: https://github.com/exasol/extension-manager/ +[30]: https://github.com/exasol/extension-manager/blob/main/LICENSE +[31]: https://github.com/embeddedkafka/embedded-kafka-schema-registry +[32]: https://github.com/douglascrockford/JSON-java +[33]: https://github.com/stleary/JSON-java/blob/master/LICENSE +[34]: http://zookeeper.apache.org/zookeeper +[35]: https://bitbucket.org/b_c/jose4j/ +[36]: https://eclipse.dev/jetty/http2-parent/http2-common +[37]: https://www.eclipse.org/legal/epl-2.0/ +[38]: http://logback.qos.ch/logback-core +[39]: http://www.eclipse.org/legal/epl-v10.html +[40]: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html +[41]: http://logback.qos.ch/logback-classic +[42]: http://confluent.io/kafka-streams-avro-serde +[43]: https://github.com/sksamuel/avro4s +[44]: https://java.testcontainers.org +[45]: http://opensource.org/licenses/MIT +[46]: http://sonarsource.github.io/sonar-scanner-maven/ +[47]: http://www.gnu.org/licenses/lgpl.txt +[48]: https://maven.apache.org/plugins/maven-toolchains-plugin/ +[49]: https://maven.apache.org/plugins/maven-compiler-plugin/ +[50]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ +[51]: https://www.mojohaus.org/flatten-maven-plugin/ +[52]: https://sonatype.github.io/ossindex-maven/maven-plugin/ +[53]: http://github.com/davidB/scala-maven-plugin +[54]: http://unlicense.org/ +[55]: https://www.scalatest.org/user_guide/using_the_scalatest_maven_plugin +[56]: https://maven.apache.org/plugins/maven-javadoc-plugin/ +[57]: https://maven.apache.org/surefire/maven-surefire-plugin/ +[58]: https://www.mojohaus.org/versions/versions-maven-plugin/ +[59]: https://basepom.github.io/duplicate-finder-maven-plugin +[60]: https://maven.apache.org/plugins/maven-assembly-plugin/ +[61]: https://maven.apache.org/plugins/maven-jar-plugin/ +[62]: https://github.com/exasol/artifact-reference-checker-maven-plugin/ +[63]: https://github.com/exasol/artifact-reference-checker-maven-plugin/blob/main/LICENSE +[64]: https://maven.apache.org/surefire/maven-failsafe-plugin/ +[65]: https://www.jacoco.org/jacoco/trunk/doc/maven.html +[66]: https://github.com/exasol/error-code-crawler-maven-plugin/ +[67]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE +[68]: http://zlika.github.io/reproducible-build-maven-plugin +[69]: https://github.com/exasol/project-keeper/ +[70]: https://github.com/exasol/project-keeper/blob/main/LICENSE +[71]: https://github.com/itsallcode/openfasttrace-maven-plugin +[72]: https://www.gnu.org/licenses/gpl-3.0.html +[73]: http://www.scalastyle.org +[74]: https://github.com/diffplug/spotless +[75]: https://github.com/evis/scalafix-maven-plugin +[76]: https://opensource.org/licenses/BSD-3-Clause +[77]: https://www.mojohaus.org/exec-maven-plugin diff --git a/doc/changes/changes_1.7.4.md b/doc/changes/changes_1.7.4.md index d6231f7..a800901 100644 --- a/doc/changes/changes_1.7.4.md +++ b/doc/changes/changes_1.7.4.md @@ -20,11 +20,13 @@ This release fixes the following vulnerabilities in dependencies: ### Compile Dependency Updates * Updated `com.exasol:import-export-udf-common-scala_2.13:1.1.1` to `2.0.0` +* Added `com.fasterxml.jackson.core:jackson-core:2.17.0` * Updated `com.google.guava:guava:33.0.0-jre` to `33.1.0-jre` * Updated `io.confluent:kafka-avro-serializer:7.5.2` to `7.6.0` * Added `org.apache.avro:avro:1.11.3` * Updated `org.apache.commons:commons-compress:1.26.0` to `1.26.1` * Updated `org.apache.kafka:kafka-clients:3.5.1` to `7.6.0-ce` +* Updated `org.scala-lang:scala-library:2.13.3` to `2.13.12` ### Test Dependency Updates diff --git a/pom.xml b/pom.xml index 16cda2d..93cf4ac 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 11 - 2.13.3 + 2.13.12 2.13 . src/main/** @@ -52,6 +52,14 @@ avro 1.11.3 + + + com.fasterxml.jackson.core + jackson-core + 2.17.0 + com.exasol error-reporting-java @@ -91,10 +99,6 @@ io.swagger swagger-models - - com.fasterxml.jackson.core - jackson-databind - @@ -171,18 +175,6 @@ org.jetbrains.kotlin kotlin-reflect - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - @@ -265,6 +257,16 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + + -Xlint:all,-path + -Werror + + + net.alchim31.maven scala-maven-plugin @@ -331,7 +333,7 @@ org.scalameta semanticdb-scalac_${scala.version} - 4.8.0 + 4.9.2 diff --git a/src/test/scala/com/exasol/cloudetl/kafka/ittests/RecordFieldSpecificationIT.scala b/src/test/scala/com/exasol/cloudetl/kafka/ittests/RecordFieldSpecificationIT.scala index e37416a..44b2016 100644 --- a/src/test/scala/com/exasol/cloudetl/kafka/ittests/RecordFieldSpecificationIT.scala +++ b/src/test/scala/com/exasol/cloudetl/kafka/ittests/RecordFieldSpecificationIT.scala @@ -23,7 +23,7 @@ import org.mockito.stubbing.Answer class RecordFieldSpecificationIT extends KafkaTopicDataImporterAvroIT { private[this] val customRecord = AvroRecord("abc", 3, 13) - implicit val stringSerializer = new StringSerializer + implicit val stringSerializer: StringSerializer = new StringSerializer test("default must be 'value.*': All fields from the record") { createCustomTopic(topic) diff --git a/src/test/scala/com/exasol/cloudetl/kafka/ittests/serde/AvroRecordFormat.scala b/src/test/scala/com/exasol/cloudetl/kafka/ittests/serde/AvroRecordFormat.scala index 6089660..1c67643 100644 --- a/src/test/scala/com/exasol/cloudetl/kafka/ittests/serde/AvroRecordFormat.scala +++ b/src/test/scala/com/exasol/cloudetl/kafka/ittests/serde/AvroRecordFormat.scala @@ -3,10 +3,9 @@ package com.exasol.cloudetl.kafka.serde import com.sksamuel.avro4s.Decoder import com.sksamuel.avro4s.Encoder import com.sksamuel.avro4s.RecordFormat -import com.sksamuel.avro4s.SchemaFor trait AvroRecordFormat { - implicit def avroRecordFormat[T: Encoder: Decoder: SchemaFor]: RecordFormat[T] = RecordFormat[T] + implicit def avroRecordFormat[T: Encoder: Decoder]: RecordFormat[T] = RecordFormat[T] } object AvroRecordFormat { diff --git a/src/test/scala/com/exasol/cloudetl/kafka/ittests/serde/PrimitiveSerdes.scala b/src/test/scala/com/exasol/cloudetl/kafka/ittests/serde/PrimitiveSerdes.scala index 5a928a6..769375e 100644 --- a/src/test/scala/com/exasol/cloudetl/kafka/ittests/serde/PrimitiveSerdes.scala +++ b/src/test/scala/com/exasol/cloudetl/kafka/ittests/serde/PrimitiveSerdes.scala @@ -3,7 +3,7 @@ package com.exasol.cloudetl.kafka.serde import org.apache.kafka.common.serialization.Serdes trait PrimitiveSerdes { - implicit val stringValueSerde = Serdes.String().asInstanceOf[ValueSerde[String]] + implicit val stringValueSerde: ValueSerde[String] = Serdes.String().asInstanceOf[ValueSerde[String]] // Other types (int, long, float, double) can be added similarly when required } From 7e53542fa25da11e07ee2a8cca8ccc0945f4087c Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Thu, 14 Mar 2024 16:08:48 +0100 Subject: [PATCH 05/12] Update default Exasol version --- .../com/exasol/cloudetl/kafka/IntegrationTestConstants.java | 2 +- .../kafka/ittests/docker/BaseDockerIntegrationTest.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/exasol/cloudetl/kafka/IntegrationTestConstants.java b/src/test/java/com/exasol/cloudetl/kafka/IntegrationTestConstants.java index 050f5c9..41a5a60 100644 --- a/src/test/java/com/exasol/cloudetl/kafka/IntegrationTestConstants.java +++ b/src/test/java/com/exasol/cloudetl/kafka/IntegrationTestConstants.java @@ -6,7 +6,7 @@ public class IntegrationTestConstants { public static final String PROJECT_VERSION = MavenProjectVersionGetter.getCurrentProjectVersion(); public static String JAR_FILE_NAME = "exasol-kafka-connector-extension-" + PROJECT_VERSION + ".jar"; public static String TEST_SCHEMA_NAME = "kafka_schema"; - public static String DEFAULT_EXASOL_DOCKER_IMAGE = "7.1.24"; + public static String DEFAULT_EXASOL_DOCKER_IMAGE = "8.24.0"; public static String LOCALSTACK_DOCKER_IMAGE = "localstack/localstack:2.2"; public static String DOCKER_IP_ADDRESS = "172.17.0.1"; } diff --git a/src/test/scala/com/exasol/cloudetl/kafka/ittests/docker/BaseDockerIntegrationTest.scala b/src/test/scala/com/exasol/cloudetl/kafka/ittests/docker/BaseDockerIntegrationTest.scala index 3cf5930..bd488a5 100644 --- a/src/test/scala/com/exasol/cloudetl/kafka/ittests/docker/BaseDockerIntegrationTest.scala +++ b/src/test/scala/com/exasol/cloudetl/kafka/ittests/docker/BaseDockerIntegrationTest.scala @@ -15,7 +15,7 @@ import org.scalatest.funsuite.AnyFunSuite trait BaseDockerIntegrationTest extends AnyFunSuite with BeforeAndAfterAll { private[this] val JAR_NAME_PATTERN = "exasol-kafka-connector-extension-" - private[this] val DEFAULT_EXASOL_DOCKER_IMAGE = "7.1.25" + private[this] val DEFAULT_EXASOL_DOCKER_IMAGE = "8.24.0" val network = DockerNamedNetwork("kafka-it-tests", true) val exasolContainer = { From 3dc67af0a58f593410436a673b3b48a27891ca9e Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Thu, 14 Mar 2024 16:11:14 +0100 Subject: [PATCH 06/12] Update plugin dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 93cf4ac..2659d47 100644 --- a/pom.xml +++ b/pom.xml @@ -529,7 +529,7 @@ com.geirsson metaconfig-pprint_${scala.compat.version} - 0.11.1 + 0.12.0 com.github.vovapolu From d0be28fb98af23d35ee56058fe088dc584f58913 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Thu, 14 Mar 2024 16:27:03 +0100 Subject: [PATCH 07/12] Downgrade kafka client to fix incompatibility --- dependencies.md | 2 +- doc/changes/changes_1.7.4.md | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.md b/dependencies.md index 4818e68..bc23b88 100644 --- a/dependencies.md +++ b/dependencies.md @@ -14,7 +14,7 @@ | [kafka-avro-serializer][10] | [Apache License 2.0][11] | | [scala-collection-compat][12] | [Apache-2.0][1] | | [Guava: Google Core Libraries for Java][13] | [Apache License, Version 2.0][14] | -| [Confluent Server][15] | [The Apache License, Version 2.0][14] | +| [Apache Kafka][15] | [The Apache License, Version 2.0][14] | | [snappy-java][16] | [Apache-2.0][17] | ## Test Dependencies diff --git a/doc/changes/changes_1.7.4.md b/doc/changes/changes_1.7.4.md index a800901..26d0991 100644 --- a/doc/changes/changes_1.7.4.md +++ b/doc/changes/changes_1.7.4.md @@ -25,7 +25,7 @@ This release fixes the following vulnerabilities in dependencies: * Updated `io.confluent:kafka-avro-serializer:7.5.2` to `7.6.0` * Added `org.apache.avro:avro:1.11.3` * Updated `org.apache.commons:commons-compress:1.26.0` to `1.26.1` -* Updated `org.apache.kafka:kafka-clients:3.5.1` to `7.6.0-ce` +* Updated `org.apache.kafka:kafka-clients:3.5.1` to `3.6.0` * Updated `org.scala-lang:scala-library:2.13.3` to `2.13.12` ### Test Dependency Updates diff --git a/pom.xml b/pom.xml index 2659d47..f1bbd40 100644 --- a/pom.xml +++ b/pom.xml @@ -246,7 +246,7 @@ org.apache.kafka kafka-clients - 7.6.0-ce + 3.6.0 From d598bd138c0314fb249a16835d3a680043776851 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Fri, 15 Mar 2024 08:40:49 +0100 Subject: [PATCH 08/12] Fix incompatible classes --- dependencies.md | 85 ++++++++++++++++++------------------ doc/changes/changes_1.7.4.md | 2 +- pom.xml | 10 ++--- 3 files changed, 47 insertions(+), 50 deletions(-) diff --git a/dependencies.md b/dependencies.md index bc23b88..abd7423 100644 --- a/dependencies.md +++ b/dependencies.md @@ -19,25 +19,25 @@ ## Test Dependencies -| Dependency | License | -| ------------------------------------------ | -------------------------------------------------------------------------------------- | -| [scalatest][18] | [the Apache License, ASL Version 2.0][19] | -| [scalatestplus-mockito][20] | [Apache-2.0][19] | -| [mockito-core][21] | [MIT][22] | -| [Test containers for Exasol on Docker][23] | [MIT License][24] | -| [Test Database Builder for Java][25] | [MIT License][26] | -| [Matcher for SQL Result Sets][27] | [MIT License][28] | -| [Extension integration tests library][29] | [MIT License][30] | -| [embedded-kafka-schema-registry][31] | [MIT][22] | -| [JSON in Java][32] | [Public Domain][33] | -| [Apache ZooKeeper - Server][34] | [Apache License, Version 2.0][5] | -| [jose4j][35] | [The Apache Software License, Version 2.0][14] | -| [Jetty :: HTTP2 :: Common][36] | [Eclipse Public License - Version 2.0][37]; [Apache Software License - Version 2.0][1] | -| [Logback Core Module][38] | [Eclipse Public License - v 1.0][39]; [GNU Lesser General Public License][40] | -| [Logback Classic Module][41] | [Eclipse Public License - v 1.0][39]; [GNU Lesser General Public License][40] | -| [kafka-streams-avro-serde][42] | [Apache License 2.0][11] | -| [avro4s-core][43] | [MIT][22] | -| [Testcontainers :: Kafka][44] | [MIT][45] | +| Dependency | License | +| ------------------------------------------ | --------------------------------------------------------------------------------------- | +| [scalatest][18] | [the Apache License, ASL Version 2.0][19] | +| [scalatestplus-mockito][20] | [Apache-2.0][19] | +| [mockito-core][21] | [MIT][22] | +| [Test containers for Exasol on Docker][23] | [MIT License][24] | +| [Test Database Builder for Java][25] | [MIT License][26] | +| [Matcher for SQL Result Sets][27] | [MIT License][28] | +| [Extension integration tests library][29] | [MIT License][30] | +| [embedded-kafka-schema-registry][31] | [MIT][22] | +| [JSON in Java][32] | [Public Domain][33] | +| [Apache ZooKeeper - Server][34] | [Apache License, Version 2.0][5] | +| [jose4j][35] | [The Apache Software License, Version 2.0][14] | +| [Jetty :: HTTP2 :: Server][36] | [Apache Software License - Version 2.0][19]; [Eclipse Public License - Version 1.0][37] | +| [Logback Core Module][38] | [Eclipse Public License - v 1.0][39]; [GNU Lesser General Public License][40] | +| [Logback Classic Module][41] | [Eclipse Public License - v 1.0][39]; [GNU Lesser General Public License][40] | +| [kafka-streams-avro-serde][42] | [Apache License 2.0][11] | +| [avro4s-core][43] | [MIT][22] | +| [Testcontainers :: Kafka][44] | [MIT][45] | ## Plugin Dependencies @@ -59,15 +59,15 @@ | [Apache Maven JAR Plugin][61] | [Apache License, Version 2.0][5] | | [Artifact reference checker and unifier][62] | [MIT License][63] | | [Maven Failsafe Plugin][64] | [Apache-2.0][5] | -| [JaCoCo :: Maven Plugin][65] | [Eclipse Public License 2.0][37] | -| [error-code-crawler-maven-plugin][66] | [MIT License][67] | -| [Reproducible Build Maven Plugin][68] | [Apache 2.0][14] | -| [Project Keeper Maven plugin][69] | [The MIT License][70] | -| [OpenFastTrace Maven Plugin][71] | [GNU General Public License v3.0][72] | -| [Scalastyle Maven Plugin][73] | [Apache 2.0][11] | -| [spotless-maven-plugin][74] | [The Apache Software License, Version 2.0][5] | -| [scalafix-maven-plugin][75] | [BSD-3-Clause][76] | -| [Exec Maven Plugin][77] | [Apache License 2][5] | +| [JaCoCo :: Maven Plugin][65] | [Eclipse Public License 2.0][66] | +| [error-code-crawler-maven-plugin][67] | [MIT License][68] | +| [Reproducible Build Maven Plugin][69] | [Apache 2.0][14] | +| [Project Keeper Maven plugin][70] | [The MIT License][71] | +| [OpenFastTrace Maven Plugin][72] | [GNU General Public License v3.0][73] | +| [Scalastyle Maven Plugin][74] | [Apache 2.0][11] | +| [spotless-maven-plugin][75] | [The Apache Software License, Version 2.0][5] | +| [scalafix-maven-plugin][76] | [BSD-3-Clause][77] | +| [Exec Maven Plugin][78] | [Apache License 2][5] | [0]: https://www.scala-lang.org/ [1]: https://www.apache.org/licenses/LICENSE-2.0 @@ -105,8 +105,8 @@ [33]: https://github.com/stleary/JSON-java/blob/master/LICENSE [34]: http://zookeeper.apache.org/zookeeper [35]: https://bitbucket.org/b_c/jose4j/ -[36]: https://eclipse.dev/jetty/http2-parent/http2-common -[37]: https://www.eclipse.org/legal/epl-2.0/ +[36]: https://eclipse.org/jetty/http2-parent/http2-server +[37]: https://www.eclipse.org/org/documents/epl-v10.php [38]: http://logback.qos.ch/logback-core [39]: http://www.eclipse.org/legal/epl-v10.html [40]: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html @@ -135,15 +135,16 @@ [63]: https://github.com/exasol/artifact-reference-checker-maven-plugin/blob/main/LICENSE [64]: https://maven.apache.org/surefire/maven-failsafe-plugin/ [65]: https://www.jacoco.org/jacoco/trunk/doc/maven.html -[66]: https://github.com/exasol/error-code-crawler-maven-plugin/ -[67]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE -[68]: http://zlika.github.io/reproducible-build-maven-plugin -[69]: https://github.com/exasol/project-keeper/ -[70]: https://github.com/exasol/project-keeper/blob/main/LICENSE -[71]: https://github.com/itsallcode/openfasttrace-maven-plugin -[72]: https://www.gnu.org/licenses/gpl-3.0.html -[73]: http://www.scalastyle.org -[74]: https://github.com/diffplug/spotless -[75]: https://github.com/evis/scalafix-maven-plugin -[76]: https://opensource.org/licenses/BSD-3-Clause -[77]: https://www.mojohaus.org/exec-maven-plugin +[66]: https://www.eclipse.org/legal/epl-2.0/ +[67]: https://github.com/exasol/error-code-crawler-maven-plugin/ +[68]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE +[69]: http://zlika.github.io/reproducible-build-maven-plugin +[70]: https://github.com/exasol/project-keeper/ +[71]: https://github.com/exasol/project-keeper/blob/main/LICENSE +[72]: https://github.com/itsallcode/openfasttrace-maven-plugin +[73]: https://www.gnu.org/licenses/gpl-3.0.html +[74]: http://www.scalastyle.org +[75]: https://github.com/diffplug/spotless +[76]: https://github.com/evis/scalafix-maven-plugin +[77]: https://opensource.org/licenses/BSD-3-Clause +[78]: https://www.mojohaus.org/exec-maven-plugin diff --git a/doc/changes/changes_1.7.4.md b/doc/changes/changes_1.7.4.md index 26d0991..a76d4e1 100644 --- a/doc/changes/changes_1.7.4.md +++ b/doc/changes/changes_1.7.4.md @@ -42,7 +42,7 @@ This release fixes the following vulnerabilities in dependencies: * Removed `org.apache.avro:avro:1.11.3` * Updated `org.apache.zookeeper:zookeeper:3.9.1` to `3.9.2` * Added `org.bitbucket.b_c:jose4j:0.9.6` -* Added `org.eclipse.jetty.http2:http2-common:11.0.20` +* Added `org.eclipse.jetty.http2:http2-server:9.4.54.v20240208` * Updated `org.json:json:20231013` to `20240303` * Updated `org.mockito:mockito-core:5.8.0` to `5.11.0` * Updated `org.testcontainers:kafka:1.19.3` to `1.19.7` diff --git a/pom.xml b/pom.xml index f1bbd40..2e75eca 100644 --- a/pom.xml +++ b/pom.xml @@ -199,10 +199,10 @@ test - + org.eclipse.jetty.http2 - http2-common - 11.0.20 + http2-server + 9.4.54.v20240208 test @@ -423,10 +423,6 @@ ossindex-maven-plugin - - - - CVE-2022-36944 CVE-2023-36479 From 2a5831b44bda939a123c132a83073a14e0ffef67 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Fri, 15 Mar 2024 08:44:35 +0100 Subject: [PATCH 09/12] Pin dependency versions --- doc/changes/changes_1.7.4.md | 2 ++ pom.xml | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/doc/changes/changes_1.7.4.md b/doc/changes/changes_1.7.4.md index a76d4e1..61b5b26 100644 --- a/doc/changes/changes_1.7.4.md +++ b/doc/changes/changes_1.7.4.md @@ -49,11 +49,13 @@ This release fixes the following vulnerabilities in dependencies: ### Plugin Dependency Updates +* Updated `com.diffplug.spotless:spotless-maven-plugin:2.40.0` to `2.43.0` * Updated `com.exasol:error-code-crawler-maven-plugin:1.3.1` to `2.0.0` * Updated `com.exasol:project-keeper-maven-plugin:3.0.1` to `4.1.0` * Updated `org.apache.maven.plugins:maven-compiler-plugin:3.11.0` to `3.12.1` * Updated `org.apache.maven.plugins:maven-failsafe-plugin:3.2.3` to `3.2.5` * Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.6.2` to `3.6.3` * Updated `org.apache.maven.plugins:maven-surefire-plugin:3.2.3` to `3.2.5` +* Updated `org.codehaus.mojo:exec-maven-plugin:3.1.0` to `3.2.0` * Updated `org.codehaus.mojo:flatten-maven-plugin:1.5.0` to `1.6.0` * Updated `org.itsallcode:openfasttrace-maven-plugin:1.6.2` to `1.8.0` diff --git a/pom.xml b/pom.xml index 2e75eca..af2118e 100644 --- a/pom.xml +++ b/pom.xml @@ -418,6 +418,20 @@ exasol-${project.artifactId}-${project.version} + + org.codehaus.mojo + versions-maven-plugin + + + + org.apache.kafka:kafka-clients:jar:*:* + + org.eclipse.jetty.http2:http2-server:jar:*:* + + org.scala-lang:scala-library:jar:*:* + + + org.sonatype.ossindex.maven ossindex-maven-plugin @@ -501,7 +515,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.40.0 + 2.43.0 @@ -545,7 +559,7 @@ org.codehaus.mojo exec-maven-plugin - 3.1.0 + 3.2.0 npm-ci From 4ff60c4ff9bc2eda28334c89b3199138c02680d7 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Fri, 15 Mar 2024 08:54:53 +0100 Subject: [PATCH 10/12] Update dependencies of extension --- .project-keeper.yml | 4 + dependencies.md | 17 +- doc/changes/changes_1.7.4.md | 21 +- extension/package-lock.json | 468 ++++++++++++++++++++--------------- extension/package.json | 16 +- 5 files changed, 307 insertions(+), 219 deletions(-) diff --git a/.project-keeper.yml b/.project-keeper.yml index ad7a46c..86a94c5 100644 --- a/.project-keeper.yml +++ b/.project-keeper.yml @@ -4,6 +4,10 @@ sources: modules: - jar_artifact - integration_tests + - type: npm + path: extension/package.json +version: + fromSource: pom.xml build: runnerOs: ubuntu-20.04 freeDiskSpace: true diff --git a/dependencies.md b/dependencies.md index abd7423..3e8bfde 100644 --- a/dependencies.md +++ b/dependencies.md @@ -1,7 +1,9 @@ # Dependencies -## Compile Dependencies +## Exasol Kafka Connector Extension + +### Compile Dependencies | Dependency | License | | ------------------------------------------- | --------------------------------------------- | @@ -17,7 +19,7 @@ | [Apache Kafka][15] | [The Apache License, Version 2.0][14] | | [snappy-java][16] | [Apache-2.0][17] | -## Test Dependencies +### Test Dependencies | Dependency | License | | ------------------------------------------ | --------------------------------------------------------------------------------------- | @@ -39,7 +41,7 @@ | [avro4s-core][43] | [MIT][22] | | [Testcontainers :: Kafka][44] | [MIT][45] | -## Plugin Dependencies +### Plugin Dependencies | Dependency | License | | ------------------------------------------------------- | --------------------------------------------- | @@ -69,6 +71,14 @@ | [scalafix-maven-plugin][76] | [BSD-3-Clause][77] | | [Exec Maven Plugin][78] | [Apache License 2][5] | +## Extension + +### Compile Dependencies + +| Dependency | License | +| ----------------------------------------- | ------- | +| [@exasol/extension-manager-interface][79] | MIT | + [0]: https://www.scala-lang.org/ [1]: https://www.apache.org/licenses/LICENSE-2.0 [2]: https://github.com/exasol/import-export-udf-common-scala/ @@ -148,3 +158,4 @@ [76]: https://github.com/evis/scalafix-maven-plugin [77]: https://opensource.org/licenses/BSD-3-Clause [78]: https://www.mojohaus.org/exec-maven-plugin +[79]: https://registry.npmjs.org/@exasol/extension-manager-interface/-/extension-manager-interface-0.4.1.tgz diff --git a/doc/changes/changes_1.7.4.md b/doc/changes/changes_1.7.4.md index 61b5b26..5b22b2a 100644 --- a/doc/changes/changes_1.7.4.md +++ b/doc/changes/changes_1.7.4.md @@ -17,7 +17,9 @@ This release fixes the following vulnerabilities in dependencies: ## Dependency Updates -### Compile Dependency Updates +### Exasol Kafka Connector Extension + +#### Compile Dependency Updates * Updated `com.exasol:import-export-udf-common-scala_2.13:1.1.1` to `2.0.0` * Added `com.fasterxml.jackson.core:jackson-core:2.17.0` @@ -28,7 +30,7 @@ This release fixes the following vulnerabilities in dependencies: * Updated `org.apache.kafka:kafka-clients:3.5.1` to `3.6.0` * Updated `org.scala-lang:scala-library:2.13.3` to `2.13.12` -### Test Dependency Updates +#### Test Dependency Updates * Updated `ch.qos.logback:logback-classic:1.4.14` to `1.5.3` * Updated `ch.qos.logback:logback-core:1.4.14` to `1.5.3` @@ -47,7 +49,7 @@ This release fixes the following vulnerabilities in dependencies: * Updated `org.mockito:mockito-core:5.8.0` to `5.11.0` * Updated `org.testcontainers:kafka:1.19.3` to `1.19.7` -### Plugin Dependency Updates +#### Plugin Dependency Updates * Updated `com.diffplug.spotless:spotless-maven-plugin:2.40.0` to `2.43.0` * Updated `com.exasol:error-code-crawler-maven-plugin:1.3.1` to `2.0.0` @@ -59,3 +61,16 @@ This release fixes the following vulnerabilities in dependencies: * Updated `org.codehaus.mojo:exec-maven-plugin:3.1.0` to `3.2.0` * Updated `org.codehaus.mojo:flatten-maven-plugin:1.5.0` to `1.6.0` * Updated `org.itsallcode:openfasttrace-maven-plugin:1.6.2` to `1.8.0` + +### Extension + +#### Development Dependency Updates + +* Updated `eslint:^8.53.0` to `^8.57.0` +* Updated `@types/node:^20.9.0` to `^20.11.28` +* Updated `@typescript-eslint/parser:^6.10.0` to `^7.2.0` +* Updated `ts-jest:^29.1.1` to `^29.1.2` +* Updated `typescript:^5.2.2` to `^5.4.2` +* Updated `@typescript-eslint/eslint-plugin:^6.10.0` to `^7.2.0` +* Updated `ts-node:^10.9.1` to `^10.9.2` +* Updated `esbuild:^0.19.5` to `^0.20.2` diff --git a/extension/package-lock.json b/extension/package-lock.json index 71fdf31..60d33cc 100644 --- a/extension/package-lock.json +++ b/extension/package-lock.json @@ -13,15 +13,15 @@ }, "devDependencies": { "@jest/globals": "^29.7.0", - "@types/node": "^20.9.0", - "@typescript-eslint/eslint-plugin": "^6.10.0", - "@typescript-eslint/parser": "^6.10.0", - "esbuild": "^0.19.5", - "eslint": "^8.53.0", + "@types/node": "^20.11.28", + "@typescript-eslint/eslint-plugin": "^7.2.0", + "@typescript-eslint/parser": "^7.2.0", + "esbuild": "^0.20.2", + "eslint": "^8.57.0", "jest": "29.7.0", - "ts-jest": "^29.1.1", - "ts-node": "^10.9.1", - "typescript": "^5.2.2" + "ts-jest": "^29.1.2", + "ts-node": "^10.9.2", + "typescript": "^5.4.2" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -723,10 +723,26 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz", + "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@esbuild/android-arm": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.5.tgz", - "integrity": "sha512-bhvbzWFF3CwMs5tbjf3ObfGqbl/17ict2/uwOSfr3wmxDE6VdS2GqY/FuzIPe0q0bdhj65zQsvqfArI9MY6+AA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz", + "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==", "cpu": [ "arm" ], @@ -740,9 +756,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.5.tgz", - "integrity": "sha512-5d1OkoJxnYQfmC+Zd8NBFjkhyCNYwM4n9ODrycTFY6Jk1IGiZ+tjVJDDSwDt77nK+tfpGP4T50iMtVi4dEGzhQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz", + "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==", "cpu": [ "arm64" ], @@ -756,9 +772,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.5.tgz", - "integrity": "sha512-9t+28jHGL7uBdkBjL90QFxe7DVA+KGqWlHCF8ChTKyaKO//VLuoBricQCgwhOjA1/qOczsw843Fy4cbs4H3DVA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz", + "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==", "cpu": [ "x64" ], @@ -772,9 +788,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.5.tgz", - "integrity": "sha512-mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz", + "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==", "cpu": [ "arm64" ], @@ -788,9 +804,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.5.tgz", - "integrity": "sha512-Ly8cn6fGLNet19s0X4unjcniX24I0RqjPv+kurpXabZYSXGM4Pwpmf85WHJN3lAgB8GSth7s5A0r856S+4DyiA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz", + "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==", "cpu": [ "x64" ], @@ -804,9 +820,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.5.tgz", - "integrity": "sha512-GGDNnPWTmWE+DMchq1W8Sd0mUkL+APvJg3b11klSGUDvRXh70JqLAO56tubmq1s2cgpVCSKYywEiKBfju8JztQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz", + "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==", "cpu": [ "arm64" ], @@ -820,9 +836,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.5.tgz", - "integrity": "sha512-1CCwDHnSSoA0HNwdfoNY0jLfJpd7ygaLAp5EHFos3VWJCRX9DMwWODf96s9TSse39Br7oOTLryRVmBoFwXbuuQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz", + "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==", "cpu": [ "x64" ], @@ -836,9 +852,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.5.tgz", - "integrity": "sha512-lrWXLY/vJBzCPC51QN0HM71uWgIEpGSjSZZADQhq7DKhPcI6NH1IdzjfHkDQws2oNpJKpR13kv7/pFHBbDQDwQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz", + "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==", "cpu": [ "arm" ], @@ -852,9 +868,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.5.tgz", - "integrity": "sha512-o3vYippBmSrjjQUCEEiTZ2l+4yC0pVJD/Dl57WfPwwlvFkrxoSO7rmBZFii6kQB3Wrn/6GwJUPLU5t52eq2meA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz", + "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==", "cpu": [ "arm64" ], @@ -868,9 +884,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.5.tgz", - "integrity": "sha512-MkjHXS03AXAkNp1KKkhSKPOCYztRtK+KXDNkBa6P78F8Bw0ynknCSClO/ztGszILZtyO/lVKpa7MolbBZ6oJtQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz", + "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==", "cpu": [ "ia32" ], @@ -884,9 +900,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.5.tgz", - "integrity": "sha512-42GwZMm5oYOD/JHqHska3Jg0r+XFb/fdZRX+WjADm3nLWLcIsN27YKtqxzQmGNJgu0AyXg4HtcSK9HuOk3v1Dw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz", + "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==", "cpu": [ "loong64" ], @@ -900,9 +916,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.5.tgz", - "integrity": "sha512-kcjndCSMitUuPJobWCnwQ9lLjiLZUR3QLQmlgaBfMX23UEa7ZOrtufnRds+6WZtIS9HdTXqND4yH8NLoVVIkcg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz", + "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==", "cpu": [ "mips64el" ], @@ -916,9 +932,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.5.tgz", - "integrity": "sha512-yJAxJfHVm0ZbsiljbtFFP1BQKLc8kUF6+17tjQ78QjqjAQDnhULWiTA6u0FCDmYT1oOKS9PzZ2z0aBI+Mcyj7Q==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz", + "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==", "cpu": [ "ppc64" ], @@ -932,9 +948,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.5.tgz", - "integrity": "sha512-5u8cIR/t3gaD6ad3wNt1MNRstAZO+aNyBxu2We8X31bA8XUNyamTVQwLDA1SLoPCUehNCymhBhK3Qim1433Zag==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz", + "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==", "cpu": [ "riscv64" ], @@ -948,9 +964,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.5.tgz", - "integrity": "sha512-Z6JrMyEw/EmZBD/OFEFpb+gao9xJ59ATsoTNlj39jVBbXqoZm4Xntu6wVmGPB/OATi1uk/DB+yeDPv2E8PqZGw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz", + "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==", "cpu": [ "s390x" ], @@ -964,9 +980,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.5.tgz", - "integrity": "sha512-psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz", + "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==", "cpu": [ "x64" ], @@ -980,9 +996,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.5.tgz", - "integrity": "sha512-kL2l+xScnAy/E/3119OggX8SrWyBEcqAh8aOY1gr4gPvw76la2GlD4Ymf832UCVbmuWeTf2adkZDK+h0Z/fB4g==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz", + "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==", "cpu": [ "x64" ], @@ -996,9 +1012,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.5.tgz", - "integrity": "sha512-sPOfhtzFufQfTBgRnE1DIJjzsXukKSvZxloZbkJDG383q0awVAq600pc1nfqBcl0ice/WN9p4qLc39WhBShRTA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz", + "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==", "cpu": [ "x64" ], @@ -1012,9 +1028,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.5.tgz", - "integrity": "sha512-dGZkBXaafuKLpDSjKcB0ax0FL36YXCvJNnztjKV+6CO82tTYVDSH2lifitJ29jxRMoUhgkg9a+VA/B03WK5lcg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz", + "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==", "cpu": [ "x64" ], @@ -1028,9 +1044,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.5.tgz", - "integrity": "sha512-dWVjD9y03ilhdRQ6Xig1NWNgfLtf2o/STKTS+eZuF90fI2BhbwD6WlaiCGKptlqXlURVB5AUOxUj09LuwKGDTg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz", + "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==", "cpu": [ "arm64" ], @@ -1044,9 +1060,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.5.tgz", - "integrity": "sha512-4liggWIA4oDgUxqpZwrDhmEfAH4d0iljanDOK7AnVU89T6CzHon/ony8C5LeOdfgx60x5cnQJFZwEydVlYx4iw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz", + "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==", "cpu": [ "ia32" ], @@ -1060,9 +1076,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.5.tgz", - "integrity": "sha512-czTrygUsB/jlM8qEW5MD8bgYU2Xg14lo6kBDXW6HdxKjh8M5PzETGiSHaz9MtbXBYDloHNUAUW2tMiKW4KM9Mw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz", + "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==", "cpu": [ "x64" ], @@ -1091,18 +1107,18 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.7.0.tgz", - "integrity": "sha512-+HencqxU7CFJnQb7IKtuNBqS6Yx3Tz4kOL8BJXo+JyeiBm5MEX6pO8onXDkjrkCRlfYXS1Axro15ZjVFe9YgsA==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", - "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -1123,9 +1139,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.53.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz", - "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==", + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", + "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1137,13 +1153,13 @@ "integrity": "sha512-jzYwDXQMwzp7FS9TuSgyEniMMkEGYmLTq4wiswURYsNxVZWlpo7epyPLk6m4ytm8zvdz2qHSbSH/x8uURMdY+w==" }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.13", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", - "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", + "version": "0.11.14", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", + "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^2.0.1", - "debug": "^4.1.1", + "@humanwhocodes/object-schema": "^2.0.2", + "debug": "^4.3.1", "minimatch": "^3.0.5" }, "engines": { @@ -1164,9 +1180,9 @@ } }, "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", - "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz", + "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==", "dev": true }, "node_modules/@istanbuljs/load-nyc-config": { @@ -1767,18 +1783,18 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.9.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz", - "integrity": "sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==", + "version": "20.11.28", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.28.tgz", + "integrity": "sha512-M/GPWVS2wLkSkNHVeLkrF2fD5Lx5UC4PxA0uZcKc6QqbIQUJyW1jVjueJYi1z8n0I5PxYrtpnPnWglE+y9A0KA==", "dev": true, "dependencies": { "undici-types": "~5.26.4" } }, "node_modules/@types/semver": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.5.tgz", - "integrity": "sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==", + "version": "7.5.8", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", + "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", "dev": true }, "node_modules/@types/stack-utils": { @@ -1803,16 +1819,16 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.10.0.tgz", - "integrity": "sha512-uoLj4g2OTL8rfUQVx2AFO1hp/zja1wABJq77P6IclQs6I/m9GLrm7jCdgzZkvWdDCQf1uEvoa8s8CupsgWQgVg==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.2.0.tgz", + "integrity": "sha512-mdekAHOqS9UjlmyF/LSs6AIEvfceV749GFxoBAjwAv0nkevfKHWQFDMcBZWUiIC5ft6ePWivXoS36aKQ0Cy3sw==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.10.0", - "@typescript-eslint/type-utils": "6.10.0", - "@typescript-eslint/utils": "6.10.0", - "@typescript-eslint/visitor-keys": "6.10.0", + "@typescript-eslint/scope-manager": "7.2.0", + "@typescript-eslint/type-utils": "7.2.0", + "@typescript-eslint/utils": "7.2.0", + "@typescript-eslint/visitor-keys": "7.2.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -1828,8 +1844,8 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", - "eslint": "^7.0.0 || ^8.0.0" + "@typescript-eslint/parser": "^7.0.0", + "eslint": "^8.56.0" }, "peerDependenciesMeta": { "typescript": { @@ -1838,15 +1854,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.10.0.tgz", - "integrity": "sha512-+sZwIj+s+io9ozSxIWbNB5873OSdfeBEH/FR0re14WLI6BaKuSOnnwCJ2foUiu8uXf4dRp1UqHP0vrZ1zXGrog==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.2.0.tgz", + "integrity": "sha512-5FKsVcHTk6TafQKQbuIVkXq58Fnbkd2wDL4LB7AURN7RUOu1utVP+G8+6u3ZhEroW3DF6hyo3ZEXxgKgp4KeCg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.10.0", - "@typescript-eslint/types": "6.10.0", - "@typescript-eslint/typescript-estree": "6.10.0", - "@typescript-eslint/visitor-keys": "6.10.0", + "@typescript-eslint/scope-manager": "7.2.0", + "@typescript-eslint/types": "7.2.0", + "@typescript-eslint/typescript-estree": "7.2.0", + "@typescript-eslint/visitor-keys": "7.2.0", "debug": "^4.3.4" }, "engines": { @@ -1857,7 +1873,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" + "eslint": "^8.56.0" }, "peerDependenciesMeta": { "typescript": { @@ -1866,13 +1882,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.10.0.tgz", - "integrity": "sha512-TN/plV7dzqqC2iPNf1KrxozDgZs53Gfgg5ZHyw8erd6jd5Ta/JIEcdCheXFt9b1NYb93a1wmIIVW/2gLkombDg==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz", + "integrity": "sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.10.0", - "@typescript-eslint/visitor-keys": "6.10.0" + "@typescript-eslint/types": "7.2.0", + "@typescript-eslint/visitor-keys": "7.2.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -1883,13 +1899,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.10.0.tgz", - "integrity": "sha512-wYpPs3hgTFblMYwbYWPT3eZtaDOjbLyIYuqpwuLBBqhLiuvJ+9sEp2gNRJEtR5N/c9G1uTtQQL5AhV0fEPJYcg==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.2.0.tgz", + "integrity": "sha512-xHi51adBHo9O9330J8GQYQwrKBqbIPJGZZVQTHHmy200hvkLZFWJIFtAG/7IYTWUyun6DE6w5InDReePJYJlJA==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.10.0", - "@typescript-eslint/utils": "6.10.0", + "@typescript-eslint/typescript-estree": "7.2.0", + "@typescript-eslint/utils": "7.2.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -1901,7 +1917,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" + "eslint": "^8.56.0" }, "peerDependenciesMeta": { "typescript": { @@ -1910,9 +1926,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.10.0.tgz", - "integrity": "sha512-36Fq1PWh9dusgo3vH7qmQAj5/AZqARky1Wi6WpINxB6SkQdY5vQoT2/7rW7uBIsPDcvvGCLi4r10p0OJ7ITAeg==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.2.0.tgz", + "integrity": "sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -1923,16 +1939,17 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.10.0.tgz", - "integrity": "sha512-ek0Eyuy6P15LJVeghbWhSrBCj/vJpPXXR+EpaRZqou7achUWL8IdYnMSC5WHAeTWswYQuP2hAZgij/bC9fanBg==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz", + "integrity": "sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.10.0", - "@typescript-eslint/visitor-keys": "6.10.0", + "@typescript-eslint/types": "7.2.0", + "@typescript-eslint/visitor-keys": "7.2.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", + "minimatch": "9.0.3", "semver": "^7.5.4", "ts-api-utils": "^1.0.1" }, @@ -1949,18 +1966,42 @@ } } }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/@typescript-eslint/utils": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.10.0.tgz", - "integrity": "sha512-v+pJ1/RcVyRc0o4wAGux9x42RHmAjIGzPRo538Z8M1tVx6HOnoQBCX/NoadHQlZeC+QO2yr4nNSFWOoraZCAyg==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.2.0.tgz", + "integrity": "sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.10.0", - "@typescript-eslint/types": "6.10.0", - "@typescript-eslint/typescript-estree": "6.10.0", + "@typescript-eslint/scope-manager": "7.2.0", + "@typescript-eslint/types": "7.2.0", + "@typescript-eslint/typescript-estree": "7.2.0", "semver": "^7.5.4" }, "engines": { @@ -1971,16 +2012,16 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" + "eslint": "^8.56.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.10.0.tgz", - "integrity": "sha512-xMGluxQIEtOM7bqFCo+rCMh5fqI+ZxV5RUUOa29iVPz1OgCZrtc7rFnz5cLUazlkPKYqX+75iuDq7m0HQ48nCg==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz", + "integrity": "sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.10.0", + "@typescript-eslint/types": "7.2.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -2647,9 +2688,9 @@ } }, "node_modules/esbuild": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.5.tgz", - "integrity": "sha512-bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz", + "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==", "dev": true, "hasInstallScript": true, "bin": { @@ -2659,28 +2700,29 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.19.5", - "@esbuild/android-arm64": "0.19.5", - "@esbuild/android-x64": "0.19.5", - "@esbuild/darwin-arm64": "0.19.5", - "@esbuild/darwin-x64": "0.19.5", - "@esbuild/freebsd-arm64": "0.19.5", - "@esbuild/freebsd-x64": "0.19.5", - "@esbuild/linux-arm": "0.19.5", - "@esbuild/linux-arm64": "0.19.5", - "@esbuild/linux-ia32": "0.19.5", - "@esbuild/linux-loong64": "0.19.5", - "@esbuild/linux-mips64el": "0.19.5", - "@esbuild/linux-ppc64": "0.19.5", - "@esbuild/linux-riscv64": "0.19.5", - "@esbuild/linux-s390x": "0.19.5", - "@esbuild/linux-x64": "0.19.5", - "@esbuild/netbsd-x64": "0.19.5", - "@esbuild/openbsd-x64": "0.19.5", - "@esbuild/sunos-x64": "0.19.5", - "@esbuild/win32-arm64": "0.19.5", - "@esbuild/win32-ia32": "0.19.5", - "@esbuild/win32-x64": "0.19.5" + "@esbuild/aix-ppc64": "0.20.2", + "@esbuild/android-arm": "0.20.2", + "@esbuild/android-arm64": "0.20.2", + "@esbuild/android-x64": "0.20.2", + "@esbuild/darwin-arm64": "0.20.2", + "@esbuild/darwin-x64": "0.20.2", + "@esbuild/freebsd-arm64": "0.20.2", + "@esbuild/freebsd-x64": "0.20.2", + "@esbuild/linux-arm": "0.20.2", + "@esbuild/linux-arm64": "0.20.2", + "@esbuild/linux-ia32": "0.20.2", + "@esbuild/linux-loong64": "0.20.2", + "@esbuild/linux-mips64el": "0.20.2", + "@esbuild/linux-ppc64": "0.20.2", + "@esbuild/linux-riscv64": "0.20.2", + "@esbuild/linux-s390x": "0.20.2", + "@esbuild/linux-x64": "0.20.2", + "@esbuild/netbsd-x64": "0.20.2", + "@esbuild/openbsd-x64": "0.20.2", + "@esbuild/sunos-x64": "0.20.2", + "@esbuild/win32-arm64": "0.20.2", + "@esbuild/win32-ia32": "0.20.2", + "@esbuild/win32-x64": "0.20.2" } }, "node_modules/escalade": { @@ -2705,16 +2747,16 @@ } }, "node_modules/eslint": { - "version": "8.53.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz", - "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==", + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", + "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.3", - "@eslint/js": "8.53.0", - "@humanwhocodes/config-array": "^0.11.13", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.0", + "@humanwhocodes/config-array": "^0.11.14", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", "@ungap/structured-clone": "^1.2.0", @@ -2954,9 +2996,9 @@ "dev": true }, "node_modules/fastq": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", - "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -3012,12 +3054,13 @@ } }, "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", "dev": true, "dependencies": { - "flatted": "^3.1.0", + "flatted": "^3.2.9", + "keyv": "^4.5.3", "rimraf": "^3.0.2" }, "engines": { @@ -3025,9 +3068,9 @@ } }, "node_modules/flatted": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", "dev": true }, "node_modules/fs.realpath": { @@ -3131,9 +3174,9 @@ } }, "node_modules/globals": { - "version": "13.23.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", - "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -3214,9 +3257,9 @@ } }, "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", "dev": true, "engines": { "node": ">= 4" @@ -4026,6 +4069,12 @@ "node": ">=4" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -4056,6 +4105,15 @@ "node": ">=6" } }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/kleur": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", @@ -4970,21 +5028,21 @@ } }, "node_modules/ts-api-utils": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.2.tgz", - "integrity": "sha512-Cbu4nIqnEdd+THNEsBdkolnOXhg0I8XteoHaEKgvsxpsbWda4IsUut2c187HxywQCvveojow0Dgw/amxtSKVkQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", + "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==", "dev": true, "engines": { - "node": ">=16.13.0" + "node": ">=16" }, "peerDependencies": { "typescript": ">=4.2.0" } }, "node_modules/ts-jest": { - "version": "29.1.1", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.1.tgz", - "integrity": "sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==", + "version": "29.1.2", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.2.tgz", + "integrity": "sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==", "dev": true, "dependencies": { "bs-logger": "0.x", @@ -5000,7 +5058,7 @@ "ts-jest": "cli.js" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^16.10.0 || ^18.0.0 || >=20.0.0" }, "peerDependencies": { "@babel/core": ">=7.0.0-beta.0 <8", @@ -5025,9 +5083,9 @@ } }, "node_modules/ts-node": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", - "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dev": true, "dependencies": { "@cspotcode/source-map-support": "^0.8.0", @@ -5101,9 +5159,9 @@ } }, "node_modules/typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "version": "5.4.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz", + "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/extension/package.json b/extension/package.json index 020d85c..9cedddb 100644 --- a/extension/package.json +++ b/extension/package.json @@ -18,14 +18,14 @@ }, "devDependencies": { "@jest/globals": "^29.7.0", - "@types/node": "^20.9.0", - "@typescript-eslint/eslint-plugin": "^6.10.0", - "@typescript-eslint/parser": "^6.10.0", - "esbuild": "^0.19.5", - "eslint": "^8.53.0", + "@types/node": "^20.11.28", + "@typescript-eslint/eslint-plugin": "^7.2.0", + "@typescript-eslint/parser": "^7.2.0", + "esbuild": "^0.20.2", + "eslint": "^8.57.0", "jest": "29.7.0", - "ts-jest": "^29.1.1", - "ts-node": "^10.9.1", - "typescript": "^5.2.2" + "ts-jest": "^29.1.2", + "ts-node": "^10.9.2", + "typescript": "^5.4.2" } } \ No newline at end of file From 19c2a8c401ebd2749722fb1cc05e6ee04cc89048 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Fri, 15 Mar 2024 09:02:03 +0100 Subject: [PATCH 11/12] Update Kafka container version --- src/test/java/com/exasol/cloudetl/kafka/KafkaTestSetup.java | 5 +++-- .../ittests/docker/BaseKafkaDockerIntegrationTest.scala | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/exasol/cloudetl/kafka/KafkaTestSetup.java b/src/test/java/com/exasol/cloudetl/kafka/KafkaTestSetup.java index b27b8aa..e84e7e4 100644 --- a/src/test/java/com/exasol/cloudetl/kafka/KafkaTestSetup.java +++ b/src/test/java/com/exasol/cloudetl/kafka/KafkaTestSetup.java @@ -11,8 +11,9 @@ import org.testcontainers.containers.KafkaContainer; import org.testcontainers.utility.DockerImageName; -class KafkaTestSetup implements AutoCloseable { +public class KafkaTestSetup implements AutoCloseable { private static final Logger LOG = Logger.getLogger(KafkaTestSetup.class.getName()); + public static final String DEFAULT_CONFLUENT_PLATFORM_VERSION = "7.6.0"; private final KafkaContainer container; private KafkaTestSetup(final KafkaContainer container) { @@ -27,7 +28,7 @@ public String getBootstrapServers() { static KafkaTestSetup create() throws ExecutionException, InterruptedException { @SuppressWarnings("resource") final KafkaContainer kafkaContainer = new KafkaContainerTweaked( - DockerImageName.parse("confluentinc/cp-kafka:7.4.1"))// + DockerImageName.parse("confluentinc/cp-kafka:" + DEFAULT_CONFLUENT_PLATFORM_VERSION))// .withEmbeddedZookeeper()// .withReuse(true); kafkaContainer.start(); diff --git a/src/test/scala/com/exasol/cloudetl/kafka/ittests/docker/BaseKafkaDockerIntegrationTest.scala b/src/test/scala/com/exasol/cloudetl/kafka/ittests/docker/BaseKafkaDockerIntegrationTest.scala index 74fcb76..f7a18d7 100644 --- a/src/test/scala/com/exasol/cloudetl/kafka/ittests/docker/BaseKafkaDockerIntegrationTest.scala +++ b/src/test/scala/com/exasol/cloudetl/kafka/ittests/docker/BaseKafkaDockerIntegrationTest.scala @@ -17,7 +17,7 @@ import org.testcontainers.containers.wait.strategy.Wait import org.testcontainers.utility.DockerImageName trait BaseKafkaDockerIntegrationTest extends BaseDockerIntegrationTest { - private[this] val DEFAULT_CONFLUENT_PLATFORM_VERSION = "7.4.1" + private[this] val DEFAULT_CONFLUENT_PLATFORM_VERSION = KafkaTestSetup.DEFAULT_CONFLUENT_PLATFORM_VERSION private[this] val ZOOKEEPER_PORT = 2181 private[this] val KAFKA_EXTERNAL_PORT = 29092 private[this] val SCHEMA_REGISTRY_PORT = 8081 From 14260338beb34aefbcebfb183de0647f8e18d013 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Fri, 15 Mar 2024 09:03:42 +0100 Subject: [PATCH 12/12] Update release date --- doc/changes/changes_1.7.4.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changes/changes_1.7.4.md b/doc/changes/changes_1.7.4.md index 5b22b2a..2a2daf7 100644 --- a/doc/changes/changes_1.7.4.md +++ b/doc/changes/changes_1.7.4.md @@ -1,4 +1,4 @@ -# Exasol Kafka Connector Extension 1.7.4, released 2024-03-14 +# Exasol Kafka Connector Extension 1.7.4, released 2024-03-15 Code name: Fix CVE-2024-25710 in compile dependency