From 769f4df62666527c80076626db6e84dc02988cfb Mon Sep 17 00:00:00 2001 From: Christoph Kuhnke Date: Mon, 24 Oct 2022 17:07:54 +0200 Subject: [PATCH] Fixed #23 (#24) * Fixed #23 * override transitive dependency of mysql-connector-java to com.google.protobuf:protobuf-java:jar:3.19.4 * updated group id and artifact name for connector after relocation [WARNING] The artifact mysql:mysql-connector-java:jar:8.0.31 has been relocated to com.mysql:mysql-connector-j:jar:8.0.31: MySQL Connector/J artifacts moved to reverse-DNS compliant Maven 2+ coordinates. * Fixed name of driver in settings.cfg * removed pom content distributionManagement, forkCount, excludedGroups * removed versions-maven-plugin * added maven-failsafe-plugin, useModulePath false Co-authored-by: Christoph Pirkl --- .project-keeper.yml | 2 + dependencies.md | 147 +++++++++--------- doc/changes/changelog.md | 1 + doc/changes/changes_4.0.1.md | 40 +++++ doc/user_guide/mysql_user_guide.md | 2 +- pk_generated_parent.pom | 2 +- pom.xml | 61 +++----- .../dialects/mysql/MySQLSqlDialect.java | 4 +- .../mysql/IntegrationTestConstants.java | 12 +- ...ySQLVirtualSchemaIntegrationTestSetup.java | 8 +- src/test/resources/settings.cfg | 7 - 11 files changed, 158 insertions(+), 128 deletions(-) create mode 100644 doc/changes/changes_4.0.1.md delete mode 100644 src/test/resources/settings.cfg diff --git a/.project-keeper.yml b/.project-keeper.yml index 1297b39..1f1d2fb 100644 --- a/.project-keeper.yml +++ b/.project-keeper.yml @@ -5,3 +5,5 @@ sources: - integration_tests - udf_coverage - jar_artifact +linkReplacements: + - https://developers.google.com/protocol-buffers/protobuf-java/|https://developers.google.com/protocol-buffers diff --git a/dependencies.md b/dependencies.md index 1e119e0..0ede259 100644 --- a/dependencies.md +++ b/dependencies.md @@ -9,47 +9,48 @@ ## Test Dependencies -| Dependency | License | -| ----------------------------------------------- | ------------------------------------------------------ | -| [Virtual Schema Common JDBC][0] | [MIT License][1] | -| [Hamcrest][2] | [BSD License 3][3] | -| [JUnit Jupiter (Aggregator)][4] | [Eclipse Public License v2.0][5] | -| [mockito-junit-jupiter][6] | [The MIT License][7] | -| [Test containers for Exasol on Docker][8] | [MIT License][9] | -| [Testcontainers :: JUnit Jupiter Extension][10] | [MIT][11] | -| [Testcontainers :: JDBC :: MySQL][10] | [MIT][11] | -| [MySQL Connector/J][12] | The GNU General Public License, v2 with FOSS exception | -| [Test Database Builder for Java][13] | [MIT License][14] | -| [Matcher for SQL Result Sets][15] | [MIT License][16] | -| [virtual-schema-shared-integration-tests][17] | [MIT License][18] | -| [udf-debugging-java][19] | [MIT][20] | -| [JaCoCo :: Agent][21] | [Eclipse Public License 2.0][22] | +| Dependency | License | +| ----------------------------------------------- | ---------------------------------------------------------------------- | +| [Virtual Schema Common JDBC][0] | [MIT License][1] | +| [Hamcrest][2] | [BSD License 3][3] | +| [JUnit Jupiter (Aggregator)][4] | [Eclipse Public License v2.0][5] | +| [mockito-junit-jupiter][6] | [The MIT License][7] | +| [Test containers for Exasol on Docker][8] | [MIT License][9] | +| [Testcontainers :: JUnit Jupiter Extension][10] | [MIT][11] | +| [Testcontainers :: JDBC :: MySQL][10] | [MIT][11] | +| [MySQL Connector/J][12] | The GNU General Public License, v2 with Universal FOSS Exception, v1.0 | +| [Protocol Buffers [Core]][13] | [BSD-3-Clause][14] | +| [Test Database Builder for Java][15] | [MIT License][16] | +| [Matcher for SQL Result Sets][17] | [MIT License][18] | +| [virtual-schema-shared-integration-tests][19] | [MIT License][20] | +| [udf-debugging-java][21] | [MIT][22] | +| [JaCoCo :: Agent][23] | [Eclipse Public License 2.0][24] | ## Plugin Dependencies | Dependency | License | | ------------------------------------------------------- | ---------------------------------------------- | -| [SonarQube Scanner for Maven][23] | [GNU LGPL 3][24] | -| [Apache Maven Compiler Plugin][25] | [Apache License, Version 2.0][26] | -| [Apache Maven Enforcer Plugin][27] | [Apache License, Version 2.0][26] | -| [Maven Flatten Plugin][28] | [Apache Software Licenese][29] | -| [Project keeper maven plugin][30] | [The MIT License][31] | -| [org.sonatype.ossindex.maven:ossindex-maven-plugin][32] | [ASL2][29] | -| [Maven Surefire Plugin][33] | [Apache License, Version 2.0][26] | -| [Versions Maven Plugin][34] | [Apache License, Version 2.0][26] | -| [Apache Maven Assembly Plugin][35] | [Apache License, Version 2.0][26] | -| [Apache Maven JAR Plugin][36] | [Apache License, Version 2.0][26] | -| [Artifact reference checker and unifier][37] | [MIT][20] | -| [Apache Maven Dependency Plugin][38] | [Apache License, Version 2.0][26] | -| [Maven Failsafe Plugin][39] | [Apache License, Version 2.0][26] | -| [JaCoCo :: Maven Plugin][40] | [Eclipse Public License 2.0][22] | -| [error-code-crawler-maven-plugin][41] | [MIT License][42] | -| [Reproducible Build Maven Plugin][43] | [Apache 2.0][29] | -| [Maven Clean Plugin][44] | [The Apache Software License, Version 2.0][29] | -| [Maven Resources Plugin][45] | [The Apache Software License, Version 2.0][29] | -| [Maven Install Plugin][46] | [The Apache Software License, Version 2.0][29] | -| [Maven Deploy Plugin][47] | [The Apache Software License, Version 2.0][29] | -| [Maven Site Plugin 3][48] | [The Apache Software License, Version 2.0][29] | +| [SonarQube Scanner for Maven][25] | [GNU LGPL 3][26] | +| [Apache Maven Compiler Plugin][27] | [Apache License, Version 2.0][28] | +| [Apache Maven Enforcer Plugin][29] | [Apache License, Version 2.0][28] | +| [Maven Flatten Plugin][30] | [Apache Software Licenese][31] | +| [Project keeper maven plugin][32] | [The MIT License][33] | +| [org.sonatype.ossindex.maven:ossindex-maven-plugin][34] | [ASL2][31] | +| [Maven Surefire Plugin][35] | [Apache License, Version 2.0][28] | +| [Versions Maven Plugin][36] | [Apache License, Version 2.0][28] | +| [Apache Maven Assembly Plugin][37] | [Apache License, Version 2.0][28] | +| [Apache Maven JAR Plugin][38] | [Apache License, Version 2.0][28] | +| [Artifact reference checker and unifier][39] | [MIT][22] | +| [Apache Maven Dependency Plugin][40] | [Apache License, Version 2.0][28] | +| [Maven Failsafe Plugin][41] | [Apache License, Version 2.0][28] | +| [JaCoCo :: Maven Plugin][42] | [Eclipse Public License 2.0][24] | +| [error-code-crawler-maven-plugin][43] | [MIT License][44] | +| [Reproducible Build Maven Plugin][45] | [Apache 2.0][31] | +| [Maven Clean Plugin][46] | [The Apache Software License, Version 2.0][31] | +| [Maven Resources Plugin][47] | [The Apache Software License, Version 2.0][31] | +| [Maven Install Plugin][48] | [The Apache Software License, Version 2.0][31] | +| [Maven Deploy Plugin][49] | [The Apache Software License, Version 2.0][31] | +| [Maven Site Plugin 3][50] | [The Apache Software License, Version 2.0][31] | [0]: https://github.com/exasol/virtual-schema-common-jdbc/ [1]: https://github.com/exasol/virtual-schema-common-jdbc/blob/main/LICENSE @@ -64,39 +65,41 @@ [10]: https://testcontainers.org [11]: http://opensource.org/licenses/MIT [12]: http://dev.mysql.com/doc/connector-j/en/ -[13]: https://github.com/exasol/test-db-builder-java/ -[14]: https://github.com/exasol/test-db-builder-java/blob/main/LICENSE -[15]: https://github.com/exasol/hamcrest-resultset-matcher/ -[16]: https://github.com/exasol/hamcrest-resultset-matcher/blob/main/LICENSE -[17]: https://github.com/exasol/virtual-schema-shared-integration-tests/ -[18]: https://github.com/exasol/virtual-schema-shared-integration-tests/blob/main/LICENSE -[19]: https://github.com/exasol/udf-debugging-java/ -[20]: https://opensource.org/licenses/MIT -[21]: https://www.eclemma.org/jacoco/index.html -[22]: https://www.eclipse.org/legal/epl-2.0/ -[23]: http://sonarsource.github.io/sonar-scanner-maven/ -[24]: http://www.gnu.org/licenses/lgpl.txt -[25]: https://maven.apache.org/plugins/maven-compiler-plugin/ -[26]: https://www.apache.org/licenses/LICENSE-2.0.txt -[27]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ -[28]: https://www.mojohaus.org/flatten-maven-plugin/ -[29]: http://www.apache.org/licenses/LICENSE-2.0.txt -[30]: https://github.com/exasol/project-keeper/ -[31]: https://github.com/exasol/project-keeper/blob/main/LICENSE -[32]: https://sonatype.github.io/ossindex-maven/maven-plugin/ -[33]: https://maven.apache.org/surefire/maven-surefire-plugin/ -[34]: http://www.mojohaus.org/versions-maven-plugin/ -[35]: https://maven.apache.org/plugins/maven-assembly-plugin/ -[36]: https://maven.apache.org/plugins/maven-jar-plugin/ -[37]: https://github.com/exasol/artifact-reference-checker-maven-plugin -[38]: https://maven.apache.org/plugins/maven-dependency-plugin/ -[39]: https://maven.apache.org/surefire/maven-failsafe-plugin/ -[40]: https://www.jacoco.org/jacoco/trunk/doc/maven.html -[41]: https://github.com/exasol/error-code-crawler-maven-plugin/ -[42]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE -[43]: http://zlika.github.io/reproducible-build-maven-plugin -[44]: http://maven.apache.org/plugins/maven-clean-plugin/ -[45]: http://maven.apache.org/plugins/maven-resources-plugin/ -[46]: http://maven.apache.org/plugins/maven-install-plugin/ -[47]: http://maven.apache.org/plugins/maven-deploy-plugin/ -[48]: http://maven.apache.org/plugins/maven-site-plugin/ +[13]: https://developers.google.com/protocol-buffers +[14]: https://opensource.org/licenses/BSD-3-Clause +[15]: https://github.com/exasol/test-db-builder-java/ +[16]: https://github.com/exasol/test-db-builder-java/blob/main/LICENSE +[17]: https://github.com/exasol/hamcrest-resultset-matcher/ +[18]: https://github.com/exasol/hamcrest-resultset-matcher/blob/main/LICENSE +[19]: https://github.com/exasol/virtual-schema-shared-integration-tests/ +[20]: https://github.com/exasol/virtual-schema-shared-integration-tests/blob/main/LICENSE +[21]: https://github.com/exasol/udf-debugging-java/ +[22]: https://opensource.org/licenses/MIT +[23]: https://www.eclemma.org/jacoco/index.html +[24]: https://www.eclipse.org/legal/epl-2.0/ +[25]: http://sonarsource.github.io/sonar-scanner-maven/ +[26]: http://www.gnu.org/licenses/lgpl.txt +[27]: https://maven.apache.org/plugins/maven-compiler-plugin/ +[28]: https://www.apache.org/licenses/LICENSE-2.0.txt +[29]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ +[30]: https://www.mojohaus.org/flatten-maven-plugin/ +[31]: http://www.apache.org/licenses/LICENSE-2.0.txt +[32]: https://github.com/exasol/project-keeper/ +[33]: https://github.com/exasol/project-keeper/blob/main/LICENSE +[34]: https://sonatype.github.io/ossindex-maven/maven-plugin/ +[35]: https://maven.apache.org/surefire/maven-surefire-plugin/ +[36]: http://www.mojohaus.org/versions-maven-plugin/ +[37]: https://maven.apache.org/plugins/maven-assembly-plugin/ +[38]: https://maven.apache.org/plugins/maven-jar-plugin/ +[39]: https://github.com/exasol/artifact-reference-checker-maven-plugin +[40]: https://maven.apache.org/plugins/maven-dependency-plugin/ +[41]: https://maven.apache.org/surefire/maven-failsafe-plugin/ +[42]: https://www.jacoco.org/jacoco/trunk/doc/maven.html +[43]: https://github.com/exasol/error-code-crawler-maven-plugin/ +[44]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE +[45]: http://zlika.github.io/reproducible-build-maven-plugin +[46]: http://maven.apache.org/plugins/maven-clean-plugin/ +[47]: http://maven.apache.org/plugins/maven-resources-plugin/ +[48]: http://maven.apache.org/plugins/maven-install-plugin/ +[49]: http://maven.apache.org/plugins/maven-deploy-plugin/ +[50]: http://maven.apache.org/plugins/maven-site-plugin/ diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index 1176e40..e30e4ca 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,5 +1,6 @@ # Changes +* [4.0.1](changes_4.0.1.md) * [4.0.0](changes_4.0.0.md) * [3.0.0](changes_3.0.0.md) * [2.0.1](changes_2.0.1.md) diff --git a/doc/changes/changes_4.0.1.md b/doc/changes/changes_4.0.1.md new file mode 100644 index 0000000..4262635 --- /dev/null +++ b/doc/changes/changes_4.0.1.md @@ -0,0 +1,40 @@ +# Virtual Schema for MySQL 4.0.1, released 2022-10-24 + +Code name: Dependency Updates + +## Summary + +Updated dependencies to fix vulnerabilities. + +## Features + +* #23: Fixed CVE-2022-3171 reported for `com.google.protobuf:protobuf-java` by updating `com.mysql:mysql-connector-j`. + +## Dependency Updates + +### Compile Dependency Updates + +* Updated `com.exasol:virtual-schema-common-jdbc:9.0.5` to `10.0.1` + +### Test Dependency Updates + +* Updated `com.exasol:exasol-testcontainers:6.1.1` to `6.2.0` +* Updated `com.exasol:hamcrest-resultset-matcher:1.5.1` to `1.5.2` +* Updated `com.exasol:test-db-builder-java:3.3.2` to `3.4.0` +* Updated `com.exasol:udf-debugging-java:0.6.2` to `0.6.4` +* Updated `com.exasol:virtual-schema-common-jdbc:9.0.5` to `10.0.1` +* Updated `com.exasol:virtual-schema-shared-integration-tests:2.2.0` to `2.2.2` +* Added `com.google.protobuf:protobuf-java:3.21.8` +* Added `com.mysql:mysql-connector-j:8.0.31` +* Removed `mysql:mysql-connector-java:8.0.29` +* Updated `org.junit.jupiter:junit-jupiter:5.8.2` to `5.9.1` +* Updated `org.mockito:mockito-junit-jupiter:4.6.1` to `4.8.1` +* Updated `org.testcontainers:junit-jupiter:1.17.2` to `1.17.5` +* Updated `org.testcontainers:mysql:1.17.2` to `1.17.5` + +### Plugin Dependency Updates + +* Updated `com.exasol:error-code-crawler-maven-plugin:1.1.1` to `1.1.2` +* Updated `com.exasol:project-keeper-maven-plugin:2.4.6` to `2.8.0` +* Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.0.0` to `3.1.0` +* Updated `org.codehaus.mojo:versions-maven-plugin:2.11.0` to `2.10.0` diff --git a/doc/user_guide/mysql_user_guide.md b/doc/user_guide/mysql_user_guide.md index bcc45c9..9cbe988 100644 --- a/doc/user_guide/mysql_user_guide.md +++ b/doc/user_guide/mysql_user_guide.md @@ -51,7 +51,7 @@ The SQL statement below creates the adapter script, defines the Java class that ```sql CREATE OR REPLACE JAVA ADAPTER SCRIPT SCHEMA_FOR_VS_SCRIPT.ADAPTER_SCRIPT_MYSQL AS %scriptclass com.exasol.adapter.RequestDispatcher; - %jar /buckets///virtual-schema-dist-10.0.1-mysql-4.0.0.jar; + %jar /buckets///virtual-schema-dist-10.0.1-mysql-4.0.1.jar; %jar /buckets///mysql-connector-java-.jar; / ; diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom index 0f3e2b7..b7e733c 100644 --- a/pk_generated_parent.pom +++ b/pk_generated_parent.pom @@ -3,7 +3,7 @@ 4.0.0 com.exasol mysql-virtual-schema-generated-parent - 4.0.0 + 4.0.1 pom UTF-8 diff --git a/pom.xml b/pom.xml index 272cf6b..b5c4a3b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,23 +2,13 @@ 4.0.0 mysql-virtual-schema - 4.0.0 + 4.0.1 Virtual Schema for MySQL Virtual Schema for MySQL https://github.com/exasol/mysql-virtual-schema/ - - - maven.exasol.com - https://maven.exasol.com/artifactory/exasol-releases - - - maven.exasol.com - https://maven.exasol.com/artifactory/exasol-snapshots - - 10.0.1 - 1.17.3 + 1.17.5 @@ -65,7 +55,7 @@ org.mockito mockito-junit-jupiter - 4.8.0 + 4.8.1 test @@ -88,15 +78,22 @@ test - mysql - mysql-connector-java - 8.0.30 + com.mysql + mysql-connector-j + 8.0.31 + test + + + + com.google.protobuf + protobuf-java + 3.21.8 test com.exasol test-db-builder-java - 3.3.4 + 3.4.0 test @@ -131,30 +128,14 @@ compile - mysql - mysql-connector-java + com.mysql + mysql-connector-j ${project.build.directory}/mysql-driver true - - org.apache.maven.plugins - maven-failsafe-plugin - - 0 - ${test.excludeTags} - - - - org.apache.maven.plugins - maven-surefire-plugin - - 0 - ${test.excludeTags} - - org.apache.maven.plugins maven-assembly-plugin @@ -186,16 +167,18 @@ - org.codehaus.mojo - versions-maven-plugin - 2.11.0 + org.apache.maven.plugins + maven-failsafe-plugin + + false + mysql-virtual-schema-generated-parent com.exasol - 4.0.0 + 4.0.1 pk_generated_parent.pom diff --git a/src/main/java/com/exasol/adapter/dialects/mysql/MySQLSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/mysql/MySQLSqlDialect.java index 78b8a2b..4803065 100644 --- a/src/main/java/com/exasol/adapter/dialects/mysql/MySQLSqlDialect.java +++ b/src/main/java/com/exasol/adapter/dialects/mysql/MySQLSqlDialect.java @@ -124,8 +124,8 @@ protected RemoteMetadataReader createRemoteMetadataReader() { return new MySQLMetadataReader(this.connectionFactory.getConnection(), this.properties); } catch (final SQLException exception) { throw new RemoteMetadataReaderException(ExaError.messageBuilder("E-VSMYSQL-1") - .message("Unable to create MySQL remote metadata reader. Caused by: {{cause}}") - .unquotedParameter("cause", exception.getMessage()).toString(), exception); + .message("Unable to create MySQL remote metadata reader. Caused by: {{cause|uq}}") + .parameter("cause", exception.getMessage()).toString(), exception); } } diff --git a/src/test/java/com/exasol/adapter/dialects/mysql/IntegrationTestConstants.java b/src/test/java/com/exasol/adapter/dialects/mysql/IntegrationTestConstants.java index 0395de6..cf41020 100644 --- a/src/test/java/com/exasol/adapter/dialects/mysql/IntegrationTestConstants.java +++ b/src/test/java/com/exasol/adapter/dialects/mysql/IntegrationTestConstants.java @@ -3,7 +3,7 @@ import java.nio.file.Path; public final class IntegrationTestConstants { - public static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-10.0.1-mysql-4.0.0.jar"; + public static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-10.0.1-mysql-4.0.1.jar"; public static final String EXASOL_DOCKER_IMAGE_REFERENCE = "7.1.14"; public static final String MYSQL_DOCKER_IMAGE_REFERENCE = "mysql:8.0.30"; public static final Path PATH_TO_VIRTUAL_SCHEMAS_JAR = Path.of("target", VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION); @@ -12,7 +12,17 @@ public final class IntegrationTestConstants { public static final String TABLE_JOIN_1 = "TABLE_JOIN_1"; public static final String TABLE_JOIN_2 = "TABLE_JOIN_2"; public static final String DOCKER_IP_ADDRESS = "172.17.0.1"; + + public static final String JDBC_DRIVER_NAME = "mysql-connector-j.jar"; + public static final Path JDBC_DRIVER_PATH = Path.of("target", "mysql-driver", JDBC_DRIVER_NAME); public static final String JDBC_DRIVER_CONFIGURATION_FILE_NAME = "settings.cfg"; + public static final String JDBC_DRIVER_CONFIGURATION_FILE_CONTENT = "DRIVERNAME=MYSQL\n" // + + "JAR=" + JDBC_DRIVER_NAME + "\n" // + + "DRIVERMAIN=com.mysql.jdbc.Driver\n" // + + "PREFIX=jdbc:mysql:\n" // + + "NOSECURITY=YES\n" // + + "FETCHSIZE=100000\n" // + + "INSERTSIZE=-1\n"; private IntegrationTestConstants() { // intentionally left empty diff --git a/src/test/java/com/exasol/adapter/dialects/mysql/MySQLVirtualSchemaIntegrationTestSetup.java b/src/test/java/com/exasol/adapter/dialects/mysql/MySQLVirtualSchemaIntegrationTestSetup.java index 03a21a0..6cc2910 100644 --- a/src/test/java/com/exasol/adapter/dialects/mysql/MySQLVirtualSchemaIntegrationTestSetup.java +++ b/src/test/java/com/exasol/adapter/dialects/mysql/MySQLVirtualSchemaIntegrationTestSetup.java @@ -5,7 +5,6 @@ import java.io.Closeable; import java.io.FileNotFoundException; -import java.nio.file.Path; import java.sql.*; import java.util.*; import java.util.concurrent.TimeoutException; @@ -32,8 +31,7 @@ public class MySQLVirtualSchemaIntegrationTestSetup implements Closeable { private static final String SCHEMA_EXASOL = "SCHEMA_EXASOL"; private static final String ADAPTER_SCRIPT_EXASOL = "ADAPTER_SCRIPT_EXASOL"; private static final Logger LOGGER = Logger.getLogger(MySQLVirtualSchemaIntegrationTestSetup.class.getName()); - private static final String JDBC_DRIVER_NAME = "mysql-connector-java.jar"; - private static final Path JDBC_DRIVER_PATH = Path.of("target", "mysql-driver", JDBC_DRIVER_NAME); + private static final boolean USE_JACOCO = true; private final Statement mySqlStatement; private final MySQLContainer mySqlContainer = new MySQLContainer<>(MYSQL_DOCKER_IMAGE_REFERENCE) @@ -87,8 +85,8 @@ public class MySQLVirtualSchemaIntegrationTestSetup implements Closeable { private static void uploadDriverToBucket(final Bucket bucket) throws InterruptedException, TimeoutException, BucketAccessException { try { - final Path pathToSettingsFile = Path.of("src", "test", "resources", JDBC_DRIVER_CONFIGURATION_FILE_NAME); - bucket.uploadFile(pathToSettingsFile, "drivers/jdbc/" + JDBC_DRIVER_CONFIGURATION_FILE_NAME); + bucket.uploadStringContent(JDBC_DRIVER_CONFIGURATION_FILE_CONTENT, + "drivers/jdbc/" + JDBC_DRIVER_CONFIGURATION_FILE_NAME); bucket.uploadFile(JDBC_DRIVER_PATH, "drivers/jdbc/" + JDBC_DRIVER_NAME); } catch (final BucketAccessException | FileNotFoundException exception) { throw new IllegalStateException( diff --git a/src/test/resources/settings.cfg b/src/test/resources/settings.cfg deleted file mode 100644 index 384efa1..0000000 --- a/src/test/resources/settings.cfg +++ /dev/null @@ -1,7 +0,0 @@ -DRIVERNAME=MYSQL -JAR=mysql-connector-java.jar -DRIVERMAIN=com.mysql.jdbc.Driver -PREFIX=jdbc:mysql: -NOSECURITY=YES -FETCHSIZE=100000 -INSERTSIZE=-1