From 3053330e433635d7721223c16216d98b06af2c1f Mon Sep 17 00:00:00 2001 From: Pieterjan Spoelders Date: Wed, 15 Jun 2022 10:14:33 +0200 Subject: [PATCH] updated all dependencies, ran PK for linkchecker issue (#22) * updated all dependencies, ran PK for linkchecker issue * ignore netty vulnerability cve (temporarily) * fix jakarta.json.JsonException: Provider org.eclipse.parsson.JsonProviderImpl not found --- .github/workflows/broken_links_checker.yml | 6 +- dependencies.md | 119 ++++++++++-------- doc/changes/changelog.md | 1 + doc/changes/changes_2.2.2.md | 35 ++++++ doc/user_guide/oracle_user_guide.md | 2 +- pk_generated_parent.pom | 18 +-- pom.xml | 27 ++-- .../oracle/IntegrationTestConstants.java | 2 +- 8 files changed, 133 insertions(+), 77 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 8ad6578..29071df 100644 --- a/.github/workflows/broken_links_checker.yml +++ b/.github/workflows/broken_links_checker.yml @@ -2,7 +2,7 @@ name: Broken Links Checker on: schedule: - - cron: "0 5 * * *" + - cron: "0 5 * * 0" push: branches: - main @@ -19,8 +19,8 @@ jobs: - name: Configure broken links checker run: | mkdir -p ./target - echo '{ "aliveStatusCodes": [429, 200] }' > ./target/broken_links_checker.json - - uses: gaurav-nelson/github-action-markdown-link-check@1.0.13 + echo '{ "aliveStatusCodes": [429, 200], "ignorePatterns": [{"pattern": "^https?://(www.)?opensource.org"}] }' > ./target/broken_links_checker.json + - uses: gaurav-nelson/github-action-markdown-link-check@v1 with: use-quiet-mode: 'yes' use-verbose-mode: 'yes' diff --git a/dependencies.md b/dependencies.md index b8027df..8cb481d 100644 --- a/dependencies.md +++ b/dependencies.md @@ -28,77 +28,86 @@ | [virtual-schema-shared-integration-tests][30] | [MIT][1] | | [JaCoCo :: Agent][32] | [Eclipse Public License 2.0][33] | +## Runtime Dependencies + +| Dependency | License | +| ----------------------------- | -------------------------------------------------------------------------------------------------------------- | +| [JSON-P Default Provider][34] | [Eclipse Public License 2.0][35]; [GNU General Public License, version 2 with the GNU Classpath Exception][36] | + ## Plugin Dependencies | Dependency | License | | ------------------------------------------------------- | ---------------------------------------------- | -| [SonarQube Scanner for Maven][34] | [GNU LGPL 3][35] | -| [Apache Maven Compiler Plugin][36] | [Apache License, Version 2.0][17] | -| [Apache Maven Enforcer Plugin][38] | [Apache License, Version 2.0][17] | -| [Maven Flatten Plugin][40] | [Apache Software Licenese][41] | -| [org.sonatype.ossindex.maven:ossindex-maven-plugin][42] | [ASL2][41] | -| [Reproducible Build Maven Plugin][44] | [Apache 2.0][41] | -| [Maven Surefire Plugin][46] | [Apache License, Version 2.0][17] | -| [Versions Maven Plugin][48] | [Apache License, Version 2.0][17] | -| [Project keeper maven plugin][50] | [The MIT License][51] | -| [Apache Maven Assembly Plugin][52] | [Apache License, Version 2.0][17] | -| [Apache Maven JAR Plugin][54] | [Apache License, Version 2.0][17] | -| [Artifact reference checker and unifier][56] | [MIT][1] | -| [Apache Maven Dependency Plugin][58] | [Apache License, Version 2.0][17] | -| [Maven Failsafe Plugin][60] | [Apache License, Version 2.0][17] | -| [JaCoCo :: Maven Plugin][62] | [Eclipse Public License 2.0][33] | -| [error-code-crawler-maven-plugin][64] | [MIT][1] | -| [Maven Clean Plugin][66] | [The Apache Software License, Version 2.0][41] | -| [Maven Resources Plugin][68] | [The Apache Software License, Version 2.0][41] | -| [Maven Install Plugin][70] | [The Apache Software License, Version 2.0][41] | -| [Maven Deploy Plugin][72] | [The Apache Software License, Version 2.0][41] | -| [Maven Site Plugin 3][74] | [The Apache Software License, Version 2.0][41] | +| [SonarQube Scanner for Maven][37] | [GNU LGPL 3][38] | +| [Apache Maven Compiler Plugin][39] | [Apache License, Version 2.0][17] | +| [Apache Maven Enforcer Plugin][41] | [Apache License, Version 2.0][17] | +| [Maven Flatten Plugin][43] | [Apache Software Licenese][44] | +| [org.sonatype.ossindex.maven:ossindex-maven-plugin][45] | [ASL2][44] | +| [Reproducible Build Maven Plugin][47] | [Apache 2.0][44] | +| [Maven Surefire Plugin][49] | [Apache License, Version 2.0][17] | +| [Versions Maven Plugin][51] | [Apache License, Version 2.0][17] | +| [Project keeper maven plugin][53] | [The MIT License][54] | +| [Apache Maven Assembly Plugin][55] | [Apache License, Version 2.0][17] | +| [Apache Maven JAR Plugin][57] | [Apache License, Version 2.0][17] | +| [Artifact reference checker and unifier][59] | [MIT][1] | +| [Apache Maven Dependency Plugin][61] | [Apache License, Version 2.0][17] | +| [Maven Failsafe Plugin][63] | [Apache License, Version 2.0][17] | +| [JaCoCo :: Maven Plugin][65] | [Eclipse Public License 2.0][33] | +| [error-code-crawler-maven-plugin][67] | [MIT][1] | +| [Maven Clean Plugin][69] | [The Apache Software License, Version 2.0][44] | +| [Maven Resources Plugin][71] | [The Apache Software License, Version 2.0][44] | +| [Maven Install Plugin][73] | [The Apache Software License, Version 2.0][44] | +| [Maven Deploy Plugin][75] | [The Apache Software License, Version 2.0][44] | +| [Maven Site Plugin 3][77] | [The Apache Software License, Version 2.0][44] | [32]: https://www.eclemma.org/jacoco/index.html [4]: https://github.com/exasol/error-reporting-java -[6]: https://www.oracle.com/database/technologies/maven-central-guide.html -[2]: https://github.com/exasol/db-fundamentals-java -[24]: https://github.com/exasol/test-db-builder-java/ -[41]: http://www.apache.org/licenses/LICENSE-2.0.txt -[46]: https://maven.apache.org/surefire/maven-surefire-plugin/ -[66]: http://maven.apache.org/plugins/maven-clean-plugin/ +[44]: http://www.apache.org/licenses/LICENSE-2.0.txt +[49]: https://maven.apache.org/surefire/maven-surefire-plugin/ +[69]: http://maven.apache.org/plugins/maven-clean-plugin/ [7]: https://www.oracle.com/downloads/licenses/oracle-free-license.html [1]: https://opensource.org/licenses/MIT [14]: https://github.com/mockito/mockito -[60]: https://maven.apache.org/surefire/maven-failsafe-plugin/ -[30]: https://github.com/exasol/virtual-schema-shared-integration-tests -[48]: http://www.mojohaus.org/versions-maven-plugin/ -[50]: https://github.com/exasol/project-keeper/ +[43]: https://www.mojohaus.org/flatten-maven-plugin/ +[51]: http://www.mojohaus.org/versions-maven-plugin/ +[53]: https://github.com/exasol/project-keeper/ [11]: http://opensource.org/licenses/BSD-3-Clause -[36]: https://maven.apache.org/plugins/maven-compiler-plugin/ -[21]: http://opensource.org/licenses/MIT -[0]: https://github.com/exasol/virtual-schema-common-jdbc +[39]: https://maven.apache.org/plugins/maven-compiler-plugin/ [25]: https://github.com/exasol/test-db-builder-java/blob/main/LICENSE [33]: https://www.eclipse.org/legal/epl-2.0/ -[35]: http://www.gnu.org/licenses/lgpl.txt -[18]: https://github.com/exasol/exasol-testcontainers -[62]: https://www.jacoco.org/jacoco/trunk/doc/maven.html +[38]: http://www.gnu.org/licenses/lgpl.txt +[65]: https://www.jacoco.org/jacoco/trunk/doc/maven.html [15]: https://github.com/mockito/mockito/blob/main/LICENSE [28]: https://github.com/exasol/hamcrest-resultset-matcher -[44]: http://zlika.github.io/reproducible-build-maven-plugin -[51]: https://github.com/exasol/project-keeper/blob/main/LICENSE -[58]: https://maven.apache.org/plugins/maven-dependency-plugin/ +[47]: http://zlika.github.io/reproducible-build-maven-plugin +[37]: http://sonarsource.github.io/sonar-scanner-maven/ +[26]: https://github.com/exasol/udf-debugging-java/ +[12]: https://junit.org/junit5/ +[34]: https://github.com/eclipse-ee4j/jsonp +[10]: http://hamcrest.org/JavaHamcrest/ +[36]: https://projects.eclipse.org/license/secondary-gpl-2.0-cp +[71]: http://maven.apache.org/plugins/maven-resources-plugin/ +[59]: https://github.com/exasol/artifact-reference-checker-maven-plugin +[57]: https://maven.apache.org/plugins/maven-jar-plugin/ +[6]: https://www.oracle.com/database/technologies/maven-central-guide.html +[2]: https://github.com/exasol/db-fundamentals-java +[24]: https://github.com/exasol/test-db-builder-java/ +[63]: https://maven.apache.org/surefire/maven-failsafe-plugin/ +[30]: https://github.com/exasol/virtual-schema-shared-integration-tests +[21]: http://opensource.org/licenses/MIT +[0]: https://github.com/exasol/virtual-schema-common-jdbc +[18]: https://github.com/exasol/exasol-testcontainers +[54]: https://github.com/exasol/project-keeper/blob/main/LICENSE +[61]: https://maven.apache.org/plugins/maven-dependency-plugin/ +[35]: https://projects.eclipse.org/license/epl-2.0 [17]: https://www.apache.org/licenses/LICENSE-2.0.txt -[34]: http://sonarsource.github.io/sonar-scanner-maven/ [16]: https://www.jqno.nl/equalsverifier -[38]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ +[41]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ [13]: https://www.eclipse.org/legal/epl-v20.html -[70]: http://maven.apache.org/plugins/maven-install-plugin/ -[12]: https://junit.org/junit5/ -[42]: https://sonatype.github.io/ossindex-maven/maven-plugin/ +[73]: http://maven.apache.org/plugins/maven-install-plugin/ +[45]: https://sonatype.github.io/ossindex-maven/maven-plugin/ [20]: https://testcontainers.org -[40]: https://www.mojohaus.org/flatten-maven-plugin/flatten-maven-plugin -[26]: https://github.com/exasol/udf-debugging-java -[10]: http://hamcrest.org/JavaHamcrest/ -[72]: http://maven.apache.org/plugins/maven-deploy-plugin/ -[74]: http://maven.apache.org/plugins/maven-site-plugin/ -[68]: http://maven.apache.org/plugins/maven-resources-plugin/ -[56]: https://github.com/exasol/artifact-reference-checker-maven-plugin -[64]: https://github.com/exasol/error-code-crawler-maven-plugin -[54]: https://maven.apache.org/plugins/maven-jar-plugin/ -[52]: https://maven.apache.org/plugins/maven-assembly-plugin/ +[75]: http://maven.apache.org/plugins/maven-deploy-plugin/ +[77]: http://maven.apache.org/plugins/maven-site-plugin/ +[67]: https://github.com/exasol/error-code-crawler-maven-plugin +[55]: https://maven.apache.org/plugins/maven-assembly-plugin/ diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index 31bd1bb..95ad43f 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..74b1b04 --- /dev/null +++ b/doc/changes/changes_2.2.2.md @@ -0,0 +1,35 @@ +# Virtual Schema for Oracle 2.2.2, released 2022-06-15 + +Code name: Updated dependencies and plugins + +## Summary + +Updated dependencies, plugins, fixed broken links checker + +## Dependency Updates + +### Runtime Dependency Updates + +* Added `org.glassfish:jakarta.json:2.0.1` + +### Test Dependency Updates + +* Updated `com.exasol:exasol-testcontainers:6.0.0` to `6.1.1` +* Updated `com.exasol:test-db-builder-java:3.3.0` to `3.3.2` +* Updated `com.exasol:udf-debugging-java:0.5.0` to `0.6.2` +* Updated `nl.jqno.equalsverifier:equalsverifier:3.9` to `3.10` +* Updated `org.jacoco:org.jacoco.agent:0.8.5` to `0.8.8` +* Updated `org.mockito:mockito-junit-jupiter:4.3.1` to `4.6.1` +* Updated `org.testcontainers:junit-jupiter:1.16.3` to `1.17.2` +* Updated `org.testcontainers:oracle-xe:1.16.3` to `1.17.2` + +### Plugin Dependency Updates + +* Updated `com.exasol:error-code-crawler-maven-plugin:1.1.0` to `1.1.1` +* Updated `com.exasol:project-keeper-maven-plugin:2.3.0` to `2.4.6` +* Updated `org.apache.maven.plugins:maven-compiler-plugin:3.9.0` to `3.10.1` +* Updated `org.apache.maven.plugins:maven-dependency-plugin:3.2.0` to `3.3.0` +* Updated `org.apache.maven.plugins:maven-jar-plugin:3.2.0` to `3.2.2` +* Updated `org.codehaus.mojo:versions-maven-plugin:2.8.1` to `2.10.0` +* Updated `org.jacoco:jacoco-maven-plugin:0.8.7` to `0.8.8` +* Updated `org.sonatype.ossindex.maven:ossindex-maven-plugin:3.1.0` to `3.2.0` diff --git a/doc/user_guide/oracle_user_guide.md b/doc/user_guide/oracle_user_guide.md index 7cb6007..615bd73 100644 --- a/doc/user_guide/oracle_user_guide.md +++ b/doc/user_guide/oracle_user_guide.md @@ -48,7 +48,7 @@ The SQL statement below creates the adapter script, defines the Java class that ```sql CREATE JAVA ADAPTER SCRIPT ADAPTER.JDBC_ADAPTER AS %scriptclass com.exasol.adapter.RequestDispatcher; - %jar /buckets///virtual-schema-dist-9.0.4-oracle-2.2.1.jar; + %jar /buckets///virtual-schema-dist-9.0.4-oracle-2.2.2.jar; %jar /buckets///ojdbc.jar; / ; diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom index 4f022b8..0b75ca7 100644 --- a/pk_generated_parent.pom +++ b/pk_generated_parent.pom @@ -3,7 +3,7 @@ 4.0.0 com.exasol oracle-virtual-schema-generated-parent - 2.2.1 + 2.2.2 pom UTF-8 @@ -50,7 +50,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.9.0 + 3.10.1 ${java.version} ${java.version} @@ -104,7 +104,7 @@ org.sonatype.ossindex.maven ossindex-maven-plugin - 3.1.0 + 3.2.0 audit @@ -143,7 +143,7 @@ org.codehaus.mojo versions-maven-plugin - 2.8.1 + 2.10.0 display-updates @@ -159,8 +159,8 @@ - maven-assembly-plugin org.apache.maven.plugins + maven-assembly-plugin 3.3.0 @@ -182,7 +182,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.2.2 default-jar @@ -206,7 +206,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + 3.3.0 copy-jacoco @@ -249,7 +249,7 @@ org.jacoco jacoco-maven-plugin - 0.8.7 + 0.8.8 prepare-agent @@ -296,7 +296,7 @@ com.exasol error-code-crawler-maven-plugin - 1.1.0 + 1.1.1 verify diff --git a/pom.xml b/pom.xml index 5a2acc1..e2fcdff 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.exasol oracle-virtual-schema - 2.2.1 + 2.2.2 Virtual Schema for Oracle Virtual Schema for Oracle @@ -24,7 +24,7 @@ 9.0.4 0.4.1 0.7.1 - 1.16.3 + 1.17.2 target/site/jacoco/jacoco.xml,target/site/jacoco-it/jacoco.xml @@ -82,20 +82,20 @@ org.mockito mockito-junit-jupiter - 4.3.1 + 4.6.1 test nl.jqno.equalsverifier equalsverifier - 3.9 + 3.10 test com.exasol exasol-testcontainers - 6.0.0 + 6.1.1 test @@ -124,7 +124,7 @@ com.exasol udf-debugging-java - 0.5.0 + 0.6.2 test @@ -139,6 +139,14 @@ 2.2.0 test + + + org.glassfish + jakarta.json + 2.0.1 + module + runtime + @@ -150,6 +158,9 @@ 7ea56ad4-8a8b-4e51-8ed9-5aad83d8efb1 + + sonatype-2020-0026 @@ -163,7 +174,7 @@ com.exasol project-keeper-maven-plugin - 2.3.2 + 2.4.6 @@ -203,7 +214,7 @@ oracle-virtual-schema-generated-parent com.exasol - 2.2.1 + 2.2.2 pk_generated_parent.pom https://github.com/exasol/oracle-virtual-schema/ diff --git a/src/test/java/com/exasol/adapter/dialects/oracle/IntegrationTestConstants.java b/src/test/java/com/exasol/adapter/dialects/oracle/IntegrationTestConstants.java index 738e44e..0a23463 100644 --- a/src/test/java/com/exasol/adapter/dialects/oracle/IntegrationTestConstants.java +++ b/src/test/java/com/exasol/adapter/dialects/oracle/IntegrationTestConstants.java @@ -1,7 +1,7 @@ package com.exasol.adapter.dialects.oracle; public final class IntegrationTestConstants { - public static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-9.0.4-oracle-2.2.1.jar"; + public static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-9.0.4-oracle-2.2.2.jar"; public static final String EXASOL_DOCKER_IMAGE_REFERENCE = "exasol/docker-db:7.0.10"; public static final String ORACLE_CONTAINER_NAME = "gvenzl/oracle-xe:21.3.0"; public static final String SCHEMA_EXASOL = "SCHEMA_EXASOL";