diff --git standalone-metastore/DEV-README standalone-metastore/DEV-README index 84ed9383bb..5377849d2e 100644 --- standalone-metastore/DEV-README +++ standalone-metastore/DEV-README @@ -39,7 +39,7 @@ in the Oracle case specify the location of the JDBC driver, and optionally specify which test you want to run. You'll need to download and start docker. Make sure docker's memory is set to more than 3.5GB. To run all of the tests do: -mvn verify -Ditest.jdbc.jars=_oracle_jar_path -DskipITests=false -Dtest=nosuch +mvn verify -Ditest.jdbc.jars=_connector_jar_path -DskipITests=false -Dtest=nosuch To run just one test, do @@ -53,9 +53,10 @@ Supported databases for testing: By adding -Dverbose.schematool the Schema Tool output becomes more detailed. -You can download the Oracle driver at -http://www.oracle.com/technetwork/database/features/jdbc/index-091264.html -You should download Oracle 11g Release 1, ojdbc6.jar +Regarding connector jars: + - You can download the Oracle driver at + http://www.oracle.com/technetwork/database/features/jdbc/index-091264.html + You should download Oracle 11g Release 1, ojdbc6.jar Logs for tests are located under standalone-metastore/metastore-common/target/failsafe-reports diff --git standalone-metastore/metastore-server/pom.xml standalone-metastore/metastore-server/pom.xml index 6126cae118..7355e937d0 100644 --- standalone-metastore/metastore-server/pom.xml +++ standalone-metastore/metastore-server/pom.xml @@ -292,13 +292,6 @@ mockito-core test - - - org.mariadb.jdbc - mariadb-java-client - test - org.postgresql postgresql @@ -441,7 +434,24 @@ - + + + com.googlecode.maven-download-plugin + download-maven-plugin + 1.3.0 + + + verify + + wget + + + http://downloads.mariadb.com/Connectors/java/connector-java-2.2.0/mariadb-java-client-2.2.0.jar + mariadb-java-client-2.2.0.jar + + + + org.apache.maven.plugins maven-antrun-plugin @@ -587,6 +597,7 @@ ${log4j.conf.dir} ${itest.jdbc.jars} + ${project.build.directory}/mariadb-java-client-2.2.0.jar ${skipITests} diff --git standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Mysql.java standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Mysql.java index afa8f2a781..dcd9ec54fa 100644 --- standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Mysql.java +++ standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Mysql.java @@ -49,7 +49,7 @@ public String getDbRootPassword() { @Override public String getJdbcDriver() { - return org.mariadb.jdbc.Driver.class.getName(); + return "org.mariadb.jdbc.Driver"; } @Override @@ -59,7 +59,7 @@ public String getJdbcUrl() { @Override public String getInitialJdbcUrl() { - return "jdbc:mysql://localhost:3306/"; + return "jdbc:mysql://localhost:3306/?allowPublicKeyRetrieval=true"; } @Override diff --git standalone-metastore/pom.xml standalone-metastore/pom.xml index 26e82677eb..9b57c5925e 100644 --- standalone-metastore/pom.xml +++ standalone-metastore/pom.xml @@ -344,14 +344,6 @@ ${mockito-core.version} test - - - org.mariadb.jdbc - mariadb-java-client - 2.2.0 - test - org.postgresql postgresql