From 2a2131ffcbeda118805c6b7d9000c4500dbde36f Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Fri, 29 Sep 2023 09:46:36 +0200 Subject: [PATCH] #74: Upgrade dependencies --- .github/workflows/broken_links_checker.yml | 8 ++-- .github/workflows/ci-build-next-java.yml | 6 +-- .github/workflows/ci-build.yml | 24 +++++++---- .github/workflows/dependencies_check.yml | 8 ++-- ...elease_droid_prepare_original_checksum.yml | 12 ++++-- .../release_droid_print_quick_checksum.yml | 7 ++-- ...ase_droid_upload_github_release_assets.yml | 8 ++-- .settings/org.eclipse.jdt.core.prefs | 2 +- dependencies.md | 6 +-- doc/changes/changelog.md | 1 + doc/changes/changes_2.2.2.md | 41 +++++++++++++++++++ doc/user_guide/postgresql_user_guide.md | 2 +- pk_generated_parent.pom | 21 +++++----- pom.xml | 38 ++++++----------- ...gresVirtualSchemaIntegrationTestSetup.java | 2 +- 15 files changed, 113 insertions(+), 73 deletions(-) create mode 100644 doc/changes/changes_2.2.2.md diff --git a/.github/workflows/broken_links_checker.yml b/.github/workflows/broken_links_checker.yml index c4ff3be..82ec1cd 100644 --- a/.github/workflows/broken_links_checker.yml +++ b/.github/workflows/broken_links_checker.yml @@ -15,16 +15,18 @@ jobs: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Configure broken links checker run: | mkdir -p ./target echo '{"aliveStatusCodes": [429, 200], "ignorePatterns": [' \ '{"pattern": "^https?://(www|dev).mysql.com/"},' \ '{"pattern": "^https?://(www.)?opensource.org"}' \ + '{"pattern": "^https?://(www.)?eclipse.org"}' \ + '{"pattern": "^https?://projects.eclipse.org"}' \ ']}' > ./target/broken_links_checker.json - uses: gaurav-nelson/github-action-markdown-link-check@v1 with: - use-quiet-mode: 'yes' - use-verbose-mode: 'yes' + use-quiet-mode: "yes" + use-verbose-mode: "yes" config-file: ./target/broken_links_checker.json diff --git a/.github/workflows/ci-build-next-java.yml b/.github/workflows/ci-build-next-java.yml index e0c15cf..7cbab08 100644 --- a/.github/workflows/ci-build-next-java.yml +++ b/.github/workflows/ci-build-next-java.yml @@ -14,15 +14,15 @@ jobs: cancel-in-progress: true steps: - name: Checkout the repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK 17 uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: "temurin" java-version: 17 - cache: 'maven' + cache: "maven" - name: Run tests and build with Maven run: | mvn --batch-mode --update-snapshots clean package -DtrimStackTrace=false \ diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index e520870..7c42d6d 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -13,16 +13,22 @@ jobs: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true steps: + - name: Free Disk Space + run: | + sudo rm -rf /usr/local/lib/android + sudo rm -rf /usr/share/dotnet - name: Checkout the repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Set up JDK 11 + - name: Set up JDK 11 & 17 uses: actions/setup-java@v3 with: - distribution: 'temurin' - java-version: 11 - cache: 'maven' + distribution: "temurin" + java-version: | + 17 + 11 + cache: "maven" - name: Cache SonarCloud packages uses: actions/cache@v3 with: @@ -33,7 +39,7 @@ jobs: run: echo 'testcontainers.reuse.enable=true' > "$HOME/.testcontainers.properties" - name: Run tests and build with Maven run: | - mvn --batch-mode clean verify \ + JAVA_HOME=$JAVA_HOME_11_X64 mvn --batch-mode clean verify \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -DtrimStackTrace=false - name: Publish Test Report @@ -44,12 +50,12 @@ jobs: - name: Sonar analysis if: ${{ env.SONAR_TOKEN != null }} run: | - mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \ + JAVA_HOME=$JAVA_HOME_17_X64 mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -DtrimStackTrace=false \ -Dsonar.organization=exasol \ -Dsonar.host.url=https://sonarcloud.io \ - -Dsonar.login=$SONAR_TOKEN + -Dsonar.token=$SONAR_TOKEN env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} \ No newline at end of file + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/dependencies_check.yml b/.github/workflows/dependencies_check.yml index b2ab231..3059964 100644 --- a/.github/workflows/dependencies_check.yml +++ b/.github/workflows/dependencies_check.yml @@ -9,12 +9,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 11 uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: "temurin" java-version: 11 - cache: 'maven' + cache: "maven" - name: Checking dependencies for vulnerabilities - run: mvn --batch-mode org.sonatype.ossindex.maven:ossindex-maven-plugin:audit -f pom.xml \ No newline at end of file + run: mvn --batch-mode org.sonatype.ossindex.maven:ossindex-maven-plugin:audit -f pom.xml diff --git a/.github/workflows/release_droid_prepare_original_checksum.yml b/.github/workflows/release_droid_prepare_original_checksum.yml index 4a980f8..aa0f78f 100644 --- a/.github/workflows/release_droid_prepare_original_checksum.yml +++ b/.github/workflows/release_droid_prepare_original_checksum.yml @@ -7,16 +7,20 @@ jobs: build: runs-on: ubuntu-latest steps: + - name: Free Disk Space + run: | + sudo rm -rf /usr/local/lib/android + sudo rm -rf /usr/share/dotnet - name: Checkout the repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK 11 uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: "temurin" java-version: 11 - cache: 'maven' + cache: "maven" - name: Enable testcontainer reuse run: echo 'testcontainers.reuse.enable=true' > "$HOME/.testcontainers.properties" - name: Run tests and build with Maven @@ -28,4 +32,4 @@ jobs: with: name: original_checksum retention-days: 5 - path: original_checksum \ No newline at end of file + path: original_checksum diff --git a/.github/workflows/release_droid_print_quick_checksum.yml b/.github/workflows/release_droid_print_quick_checksum.yml index 8add957..aed4444 100644 --- a/.github/workflows/release_droid_print_quick_checksum.yml +++ b/.github/workflows/release_droid_print_quick_checksum.yml @@ -8,17 +8,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK 11 uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: "temurin" java-version: 11 - cache: 'maven' + cache: "maven" - name: Build with Maven skipping tests run: mvn --batch-mode clean verify -DskipTests - name: Print checksum run: echo 'checksum_start==';find target -maxdepth 1 -name *.jar -exec sha256sum "{}" + | xargs;echo '==checksum_end' - diff --git a/.github/workflows/release_droid_upload_github_release_assets.yml b/.github/workflows/release_droid_upload_github_release_assets.yml index 7350faf..7ae8bbb 100644 --- a/.github/workflows/release_droid_upload_github_release_assets.yml +++ b/.github/workflows/release_droid_upload_github_release_assets.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: inputs: upload_url: - description: 'Assets upload URL' + description: "Assets upload URL" required: true jobs: @@ -12,15 +12,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK 11 uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: "temurin" java-version: 11 - cache: 'maven' + cache: "maven" - name: Build with Maven skipping tests run: mvn --batch-mode clean verify -DskipTests - name: Generate sha256sum files diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 8b5a9aa..bb40c3f 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -111,7 +111,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.processAnnotations=enabled +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/dependencies.md b/dependencies.md index 1442715..93bfb92 100644 --- a/dependencies.md +++ b/dependencies.md @@ -39,7 +39,7 @@ | [Maven Surefire Plugin][35] | [Apache-2.0][31] | | [Versions Maven Plugin][36] | [Apache License, Version 2.0][31] | | [duplicate-finder-maven-plugin Maven Mojo][37] | [Apache License 2.0][38] | -| [Apache Maven Assembly Plugin][39] | [Apache License, Version 2.0][31] | +| [Apache Maven Assembly Plugin][39] | [Apache-2.0][31] | | [Apache Maven JAR Plugin][40] | [Apache License, Version 2.0][31] | | [Artifact reference checker and unifier][41] | [MIT License][42] | | [Project keeper maven plugin][43] | [The MIT License][44] | @@ -69,7 +69,7 @@ [11]: https://github.com/mockito/mockito/blob/main/LICENSE [12]: https://github.com/exasol/exasol-testcontainers/ [13]: https://github.com/exasol/exasol-testcontainers/blob/main/LICENSE -[14]: https://testcontainers.org +[14]: https://java.testcontainers.org [15]: http://opensource.org/licenses/MIT [16]: https://github.com/exasol/test-db-builder-java/ [17]: https://github.com/exasol/test-db-builder-java/blob/main/LICENSE @@ -92,7 +92,7 @@ [34]: https://sonatype.github.io/ossindex-maven/maven-plugin/ [35]: https://maven.apache.org/surefire/maven-surefire-plugin/ [36]: https://www.mojohaus.org/versions/versions-maven-plugin/ -[37]: https://github.com/basepom/duplicate-finder-maven-plugin +[37]: https://basepom.github.io/duplicate-finder-maven-plugin [38]: http://www.apache.org/licenses/LICENSE-2.0.html [39]: https://maven.apache.org/plugins/maven-assembly-plugin/ [40]: https://maven.apache.org/plugins/maven-jar-plugin/ diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index 33a7442..abe8faa 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,5 +1,6 @@ # Changes +* [2.2.2](changes_2.2.2.md) * [2.2.1](changes_2.2.1.md) * [2.2.0](changes_2.2.0.md) * [2.1.0](changes_2.1.0.md) diff --git a/doc/changes/changes_2.2.2.md b/doc/changes/changes_2.2.2.md new file mode 100644 index 0000000..55ffca0 --- /dev/null +++ b/doc/changes/changes_2.2.2.md @@ -0,0 +1,41 @@ +# Virtual Schema for PostgreSQL 2.2.2, released 2023-??-?? + +Code name: + +## Summary + +## Features + +* ISSUE_NUMBER: description + +## Dependency Updates + +### Compile Dependency Updates + +* Updated `com.exasol:virtual-schema-common-jdbc:10.5.0` to `11.0.2` + +### Test Dependency Updates + +* Updated `com.exasol:exasol-testcontainers:6.6.0` to `6.6.2` +* Updated `com.exasol:hamcrest-resultset-matcher:1.6.0` to `1.6.1` +* Updated `com.exasol:test-db-builder-java:3.4.2` to `3.5.1` +* Updated `com.exasol:udf-debugging-java:0.6.9` to `0.6.11` +* Updated `com.exasol:virtual-schema-common-jdbc:10.5.0` to `11.0.2` +* Updated `com.exasol:virtual-schema-shared-integration-tests:2.2.4` to `2.2.5` +* Updated `org.junit.jupiter:junit-jupiter:5.9.3` to `5.10.0` +* Updated `org.mockito:mockito-junit-jupiter:5.4.0` to `5.5.0` +* Updated `org.testcontainers:junit-jupiter:1.18.3` to `1.19.0` +* Updated `org.testcontainers:postgresql:1.18.3` to `1.19.0` + +### Plugin Dependency Updates + +* Updated `com.exasol:error-code-crawler-maven-plugin:1.2.3` to `1.3.0` +* Updated `com.exasol:project-keeper-maven-plugin:2.9.7` to `2.9.12` +* Updated `org.apache.maven.plugins:maven-assembly-plugin:3.5.0` to `3.6.0` +* Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.3.0` to `3.4.0` +* Updated `org.apache.maven.plugins:maven-failsafe-plugin:3.0.0` to `3.1.2` +* Updated `org.apache.maven.plugins:maven-surefire-plugin:3.0.0` to `3.1.2` +* Updated `org.basepom.maven:duplicate-finder-maven-plugin:1.5.1` to `2.0.1` +* Updated `org.codehaus.mojo:flatten-maven-plugin:1.4.1` to `1.5.0` +* Updated `org.codehaus.mojo:versions-maven-plugin:2.15.0` to `2.16.0` +* Updated `org.jacoco:jacoco-maven-plugin:0.8.9` to `0.8.10` diff --git a/doc/user_guide/postgresql_user_guide.md b/doc/user_guide/postgresql_user_guide.md index 9651332..c8a89ec 100644 --- a/doc/user_guide/postgresql_user_guide.md +++ b/doc/user_guide/postgresql_user_guide.md @@ -45,7 +45,7 @@ The SQL statement below creates the adapter script, defines the Java class that --/ CREATE OR REPLACE JAVA ADAPTER SCRIPT ADAPTER.JDBC_ADAPTER AS %scriptclass com.exasol.adapter.RequestDispatcher; - %jar /buckets///virtual-schema-dist-10.5.0-postgresql-2.2.1.jar; + %jar /buckets///virtual-schema-dist-11.0.2-postgresql-2.2.2.jar; %jar /buckets///postgresql-.jar; / ``` diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom index 683bfec..71b66ab 100644 --- a/pk_generated_parent.pom +++ b/pk_generated_parent.pom @@ -3,7 +3,7 @@ 4.0.0 com.exasol postgresql-virtual-schema-generated-parent - 2.2.1 + 2.2.2 pom UTF-8 @@ -51,7 +51,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.4.0 enforce-maven @@ -71,7 +71,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.4.1 + 1.5.0 true oss @@ -110,7 +110,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.1.2 @@ -121,7 +121,7 @@ org.codehaus.mojo versions-maven-plugin - 2.15.0 + 2.16.0 display-updates @@ -139,7 +139,7 @@ org.basepom.maven duplicate-finder-maven-plugin - 1.5.1 + 2.0.1 default @@ -157,7 +157,6 @@ true true false - true true false @@ -165,7 +164,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.5.0 + 3.6.0 src/assembly/all-dependencies.xml @@ -215,7 +214,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.1.2 @@ -236,7 +235,7 @@ org.jacoco jacoco-maven-plugin - 0.8.9 + 0.8.10 prepare-agent @@ -277,7 +276,7 @@ com.exasol error-code-crawler-maven-plugin - 1.2.3 + 1.3.0 verify diff --git a/pom.xml b/pom.xml index eaa9729..d6faa36 100644 --- a/pom.xml +++ b/pom.xml @@ -2,13 +2,13 @@ 4.0.0 postgresql-virtual-schema - 2.2.1 + 2.2.2 Virtual Schema for PostgreSQL Virtual Schema for connecting PostgreSQL as data source to Exasol + https://github.com/exasol/postgresql-virtual-schema/ - 10.5.0 - 1.18.3 - target/site/jacoco/jacoco.xml,target/site/jacoco-it/jacoco.xml + 11.0.2 + 1.19.0 @@ -43,20 +43,20 @@ org.junit.jupiter junit-jupiter - 5.9.3 + 5.10.0 test org.mockito mockito-junit-jupiter - 5.4.0 + 5.5.0 test com.exasol exasol-testcontainers - 6.6.0 + 6.6.2 test @@ -74,19 +74,19 @@ com.exasol test-db-builder-java - 3.4.2 + 3.5.1 test com.exasol hamcrest-resultset-matcher - 1.6.0 + 1.6.1 test com.exasol udf-debugging-java - 0.6.9 + 0.6.11 test @@ -104,7 +104,7 @@ com.exasol virtual-schema-shared-integration-tests - 2.2.4 + 2.2.5 test @@ -120,7 +120,7 @@ com.exasol project-keeper-maven-plugin - 2.9.7 + 2.9.12 @@ -179,24 +179,12 @@ false - - org.sonatype.ossindex.maven - ossindex-maven-plugin - - - - CVE-2022-38752 - CVE-2022-1471 - - - postgresql-virtual-schema-generated-parent com.exasol - 2.2.1 + 2.2.2 pk_generated_parent.pom - https://github.com/exasol/postgresql-virtual-schema/ diff --git a/src/test/java/com/exasol/adapter/dialects/postgresql/PostgresVirtualSchemaIntegrationTestSetup.java b/src/test/java/com/exasol/adapter/dialects/postgresql/PostgresVirtualSchemaIntegrationTestSetup.java index e5fa548..588dac2 100644 --- a/src/test/java/com/exasol/adapter/dialects/postgresql/PostgresVirtualSchemaIntegrationTestSetup.java +++ b/src/test/java/com/exasol/adapter/dialects/postgresql/PostgresVirtualSchemaIntegrationTestSetup.java @@ -26,7 +26,7 @@ * This class contains the common integration test setup for all PostgreSQL virtual schemas. */ public class PostgresVirtualSchemaIntegrationTestSetup implements Closeable { - private static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-10.5.0-postgresql-2.2.1.jar"; + private static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-11.0.2-postgresql-2.2.2.jar"; private static final Path PATH_TO_VIRTUAL_SCHEMAS_JAR = Path.of("target", VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION); private static final String SCHEMA_EXASOL = "SCHEMA_EXASOL"; private static final String ADAPTER_SCRIPT_EXASOL = "ADAPTER_SCRIPT_EXASOL";