github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-03 04:11:44 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'trunk' of https://github.com/apache/sqoop into SQOOP-3443

Browse Source
This commit is contained in:
Fokko Driesprong 2019-10-16 17:11:52 +02:00
commit 3fffc1d740
5 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@ -179,9 +179,8 @@ dependencies {
testCompile group: 'mysql', name: 'mysql-connector-java', version: mySqlConnectorVersion
testCompile group: 'cubrid', name: 'cubrid-jdbc', version: cubridJdbcDriverVersion
testCompile group: 'com.microsoft.sqlserver', name: 'mssql-jdbc', version: msSqlJdbcDriverVersion
testCompile group: 'com.ibm.db2.jcc', name: 'db2jcc4', version: db2JdbcDriverVersion
testCompile group: 'com.ibm.db2', name: 'jcc', version: db2JdbcDriverVersion
testCompile group: 'oracle', name: 'ojdbc6', version: oracleJdbcDriverVersion
}
task unitTest (type: Test) {

2
gradle.properties
View File

@ -54,7 +54,7 @@ assertjVersion=2.8.0
mySqlConnectorVersion=5.1.47
cubridJdbcDriverVersion=10.1.2.7694
msSqlJdbcDriverVersion=7.0.0.jre8
db2JdbcDriverVersion=10.1
db2JdbcDriverVersion=11.5.0.0
oracleJdbcDriverVersion=11.2.0.3
checkstyleVersion=5.5

22
src/scripts/thirdpartytest/docker-compose/db2scripts/db2entrypoint.sh
View File

@ -1,22 +0,0 @@
#!/bin/bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
set -e
echo -e "$DB2INST1_PASSWORD\n$DB2INST1_PASSWORD" | passwd db2inst1
su - db2inst1 -c "db2start;db2 create db SQOOP"
nohup /usr/sbin/sshd -D 2>&1 > /dev/null &
while true; do sleep 1000; done

8
src/scripts/thirdpartytest/docker-compose/sqoop-thirdpartytest-db-services.yml
View File

@ -110,18 +110,16 @@ services:
timeout: 5s
retries: 50
db2:
image: ibmcom/db2express-c:10.5.0.5-3.10.0
image: ibmcom/db2:11.5.0.0a
container_name: sqoop_db2_container
privileged: true
environment:
COMPOSE_HTTP_TIMEOUT: 200
DB2INST1_PASSWORD: Sqoop12345
DBNAME: SQOOP
LICENSE: accept
ports:
- 50000:50000
volumes:
- ./db2scripts:/home/db2inst1/db2scripts
entrypoint:
/home/db2inst1/db2scripts/db2entrypoint.sh
healthcheck:
test: ["CMD", "/home/db2inst1/sqllib/bin/db2", "CONNECT", "TO", "SQOOP"]
interval: 30s

4
src/test/org/apache/sqoop/metastore/JobToolTestBase.java
View File

@ -70,9 +70,7 @@ public void setUp() {
SqoopOptions options = getSqoopOptions();
Connection conn = getConnection(options);
try {
try(Connection conn = getConnection(options)) {
Statement statement = conn.createStatement();
statement.execute("DROP TABLE " + cm.escapeTableName("SQOOP_ROOT"));
statement.execute("DROP TABLE " + cm.escapeTableName("SQOOP_SESSIONS"));