From 36c2adb3fee041d3c11156c8fae1583f8d8f55b7 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Thu, 26 Oct 2023 16:21:57 +0200 Subject: [PATCH 1/3] Increment version --- dependencies.md | 2 +- doc/changes/changelog.md | 1 + doc/changes/changes_2.4.3.md | 19 +++++++++++++++++++ doc/user_guide/oracle_user_guide.md | 2 +- lombok.config | 2 -- pk_generated_parent.pom | 2 +- pom.xml | 8 ++++---- .../oracle/IntegrationTestConstants.java | 2 +- 8 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 doc/changes/changes_2.4.3.md delete mode 100644 lombok.config diff --git a/dependencies.md b/dependencies.md index 75a32e0..9442cde 100644 --- a/dependencies.md +++ b/dependencies.md @@ -17,7 +17,7 @@ | [Virtual Schema Common JDBC][0] | [MIT License][1] | | [Hamcrest][8] | [BSD License 3][9] | | [JUnit Jupiter (Aggregator)][10] | [Eclipse Public License v2.0][11] | -| [mockito-junit-jupiter][12] | [The MIT License][13] | +| [mockito-junit-jupiter][12] | [MIT][13] | | [EqualsVerifier \| release normal jar][14] | [Apache License, Version 2.0][15] | | [SLF4J JDK14 Provider][16] | [MIT License][17] | | [Test containers for Exasol on Docker][18] | [MIT License][19] | diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index a51aa88..927ce84 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,5 +1,6 @@ # Changes +* [2.4.3](changes_2.4.3.md) * [2.4.2](changes_2.4.2.md) * [2.4.1](changes_2.4.1.md) * [2.4.0](changes_2.4.0.md) diff --git a/doc/changes/changes_2.4.3.md b/doc/changes/changes_2.4.3.md new file mode 100644 index 0000000..63b7782 --- /dev/null +++ b/doc/changes/changes_2.4.3.md @@ -0,0 +1,19 @@ +# Virtual Schema for Oracle 2.4.3, released 2023-??-?? + +Code name: + +## Summary + +## Refactoring + +* #15: Fix reuse of oracle-db in integration test + +## Dependency Updates + +### Test Dependency Updates + +* Updated `org.mockito:mockito-junit-jupiter:5.5.0` to `5.6.0` + +### Plugin Dependency Updates + +* Updated `com.exasol:project-keeper-maven-plugin:2.9.12` to `2.9.14` diff --git a/doc/user_guide/oracle_user_guide.md b/doc/user_guide/oracle_user_guide.md index e3226e7..4ee90a5 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-11.0.2-oracle-2.4.2.jar; + %jar /buckets///virtual-schema-dist-11.0.2-oracle-2.4.3.jar; %jar /buckets///ojdbc.jar; / ; diff --git a/lombok.config b/lombok.config deleted file mode 100644 index a23edb4..0000000 --- a/lombok.config +++ /dev/null @@ -1,2 +0,0 @@ -config.stopBubbling = true -lombok.addLombokGeneratedAnnotation = true \ No newline at end of file diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom index cc12800..8336008 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.4.2 + 2.4.3 pom UTF-8 diff --git a/pom.xml b/pom.xml index cd026ae..9adf70e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.exasol oracle-virtual-schema - 2.4.2 + 2.4.3 Virtual Schema for Oracle Virtual Schema for Oracle https://github.com/exasol/oracle-virtual-schema/ @@ -50,7 +50,7 @@ org.mockito mockito-junit-jupiter - 5.5.0 + 5.6.0 test @@ -137,7 +137,7 @@ com.exasol project-keeper-maven-plugin - 2.9.12 + 2.9.14 @@ -185,7 +185,7 @@ oracle-virtual-schema-generated-parent com.exasol - 2.4.2 + 2.4.3 pk_generated_parent.pom 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 c744164..32d7d4e 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-11.0.2-oracle-2.4.2.jar"; + public static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-11.0.2-oracle-2.4.3.jar"; public static final String ORACLE_CONTAINER_NAME = "gvenzl/oracle-xe:21.3.0"; public static final String SCHEMA_EXASOL = "SCHEMA_EXASOL"; public static final String TABLE_JOIN_1 = "TABLE_JOIN_1"; From c9cbbaf4e2d951502d124e0fd221643e3e0c9355 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Thu, 26 Oct 2023 16:24:22 +0200 Subject: [PATCH 2/3] #15: Create a unique oracle schema for each test run --- .../com/exasol/adapter/dialects/oracle/OracleSqlDialectIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectIT.java b/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectIT.java index 93a7477..68d3cb9 100644 --- a/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectIT.java +++ b/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectIT.java @@ -42,7 +42,7 @@ class OracleSqlDialectIT { private static final String ORACLE_CONTAINER_NAME = IntegrationTestConstants.ORACLE_CONTAINER_NAME; - private static final String SCHEMA_ORACLE = "SCHEMA_ORACLE"; + private static final String SCHEMA_ORACLE = "SCHEMA_ORACLE_" + System.currentTimeMillis(); private static final String ORACLE_JDBC_CONNECTION_NAME = "JDBC_CONNECTION"; private static final String ORACLE_OCI_CONNECTION_NAME = "ORACLE_CONNECTION"; From 4bb2865a54fa8a7f3c9812360a28092756054665 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Thu, 26 Oct 2023 16:27:23 +0200 Subject: [PATCH 3/3] Run PK fix --- dependencies.md | 48 ++++++++++++++---------------------- doc/changes/changes_2.4.3.md | 6 +++++ pk_generated_parent.pom | 14 +++++------ 3 files changed, 32 insertions(+), 36 deletions(-) diff --git a/dependencies.md b/dependencies.md index 9442cde..caea3fe 100644 --- a/dependencies.md +++ b/dependencies.md @@ -37,30 +37,25 @@ ## Plugin Dependencies -| Dependency | License | -| ------------------------------------------------------- | ---------------------------------------------- | -| [SonarQube Scanner for Maven][35] | [GNU LGPL 3][36] | -| [Apache Maven Compiler Plugin][37] | [Apache-2.0][15] | -| [Apache Maven Enforcer Plugin][38] | [Apache-2.0][15] | -| [Maven Flatten Plugin][39] | [Apache Software Licenese][15] | -| [org.sonatype.ossindex.maven:ossindex-maven-plugin][40] | [ASL2][41] | -| [Maven Surefire Plugin][42] | [Apache-2.0][15] | -| [Versions Maven Plugin][43] | [Apache License, Version 2.0][15] | -| [duplicate-finder-maven-plugin Maven Mojo][44] | [Apache License 2.0][45] | -| [Project keeper maven plugin][46] | [The MIT License][47] | -| [Apache Maven Assembly Plugin][48] | [Apache-2.0][15] | -| [Apache Maven JAR Plugin][49] | [Apache License, Version 2.0][15] | -| [Artifact reference checker and unifier][50] | [MIT License][51] | -| [Apache Maven Dependency Plugin][52] | [Apache-2.0][15] | -| [Maven Failsafe Plugin][53] | [Apache-2.0][15] | -| [JaCoCo :: Maven Plugin][54] | [Eclipse Public License 2.0][31] | -| [error-code-crawler-maven-plugin][55] | [MIT License][56] | -| [Reproducible Build Maven Plugin][57] | [Apache 2.0][41] | -| [Maven Clean Plugin][58] | [The Apache Software License, Version 2.0][41] | -| [Maven Resources Plugin][59] | [The Apache Software License, Version 2.0][41] | -| [Maven Install Plugin][60] | [The Apache Software License, Version 2.0][41] | -| [Maven Deploy Plugin][61] | [The Apache Software License, Version 2.0][41] | -| [Maven Site Plugin 3][62] | [The Apache Software License, Version 2.0][41] | +| Dependency | License | +| ------------------------------------------------------- | --------------------------------- | +| [SonarQube Scanner for Maven][35] | [GNU LGPL 3][36] | +| [Apache Maven Compiler Plugin][37] | [Apache-2.0][15] | +| [Apache Maven Enforcer Plugin][38] | [Apache-2.0][15] | +| [Maven Flatten Plugin][39] | [Apache Software Licenese][15] | +| [org.sonatype.ossindex.maven:ossindex-maven-plugin][40] | [ASL2][41] | +| [Maven Surefire Plugin][42] | [Apache-2.0][15] | +| [Versions Maven Plugin][43] | [Apache License, Version 2.0][15] | +| [duplicate-finder-maven-plugin Maven Mojo][44] | [Apache License 2.0][45] | +| [Project keeper maven plugin][46] | [The MIT License][47] | +| [Apache Maven Assembly Plugin][48] | [Apache-2.0][15] | +| [Apache Maven JAR Plugin][49] | [Apache License, Version 2.0][15] | +| [Artifact reference checker and unifier][50] | [MIT License][51] | +| [Apache Maven Dependency Plugin][52] | [Apache-2.0][15] | +| [Maven Failsafe Plugin][53] | [Apache-2.0][15] | +| [JaCoCo :: Maven Plugin][54] | [Eclipse Public License 2.0][31] | +| [error-code-crawler-maven-plugin][55] | [MIT License][56] | +| [Reproducible Build Maven Plugin][57] | [Apache 2.0][41] | [0]: https://github.com/exasol/virtual-schema-common-jdbc/ [1]: https://github.com/exasol/virtual-schema-common-jdbc/blob/main/LICENSE @@ -120,8 +115,3 @@ [55]: https://github.com/exasol/error-code-crawler-maven-plugin/ [56]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE [57]: http://zlika.github.io/reproducible-build-maven-plugin -[58]: http://maven.apache.org/plugins/maven-clean-plugin/ -[59]: http://maven.apache.org/plugins/maven-resources-plugin/ -[60]: http://maven.apache.org/plugins/maven-install-plugin/ -[61]: http://maven.apache.org/plugins/maven-deploy-plugin/ -[62]: http://maven.apache.org/plugins/maven-site-plugin/ diff --git a/doc/changes/changes_2.4.3.md b/doc/changes/changes_2.4.3.md index 63b7782..b201d79 100644 --- a/doc/changes/changes_2.4.3.md +++ b/doc/changes/changes_2.4.3.md @@ -12,8 +12,14 @@ Code name: ### Test Dependency Updates +* Updated `org.jacoco:org.jacoco.agent:0.8.10` to `0.8.11` * Updated `org.mockito:mockito-junit-jupiter:5.5.0` to `5.6.0` ### Plugin Dependency Updates +* Updated `com.exasol:error-code-crawler-maven-plugin:1.3.0` to `1.3.1` * Updated `com.exasol:project-keeper-maven-plugin:2.9.12` to `2.9.14` +* Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.4.0` to `3.4.1` +* Updated `org.codehaus.mojo:versions-maven-plugin:2.16.0` to `2.16.1` +* Updated `org.jacoco:jacoco-maven-plugin:0.8.10` to `0.8.11` +* Updated `org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184` to `3.10.0.2594` diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom index 8336008..8cb7fdb 100644 --- a/pk_generated_parent.pom +++ b/pk_generated_parent.pom @@ -35,7 +35,7 @@ org.jacoco org.jacoco.agent - 0.8.10 + 0.8.11 test runtime @@ -45,7 +45,7 @@ org.sonarsource.scanner.maven sonar-maven-plugin - 3.9.1.2184 + 3.10.0.2594 org.apache.maven.plugins @@ -59,7 +59,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.4.0 + 3.4.1 enforce-maven @@ -69,7 +69,7 @@ - [3.8.7,3.9.0) + 3.6.3 @@ -129,7 +129,7 @@ org.codehaus.mojo versions-maven-plugin - 2.16.0 + 2.16.1 display-updates @@ -265,7 +265,7 @@ org.jacoco jacoco-maven-plugin - 0.8.10 + 0.8.11 prepare-agent @@ -312,7 +312,7 @@ com.exasol error-code-crawler-maven-plugin - 1.3.0 + 1.3.1 verify