SQOOP-3428: Try to fix the CI (#85)

Author: Fokko

build.gradle

@@ -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) {

gradle.properties

@@ -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

src/scripts/thirdpartytest/docker-compose/db2scripts/db2entrypoint.sh

@@ -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

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

@@ -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"));