SQOOP-3364: Upgrade Gradle version to 4.9
authorSzabolcs Vasas <vasas@apache.org>
Wed, 22 Aug 2018 14:29:31 +0000 (16:29 +0200)
committerSzabolcs Vasas <vasas@apache.org>
Wed, 22 Aug 2018 14:29:31 +0000 (16:29 +0200)
(Szabolcs Vasas)

build.gradle
gradle/wrapper/gradle-wrapper.jar
gradle/wrapper/gradle-wrapper.properties
settings.gradle
src/test/org/apache/sqoop/hbase/HBaseTestCase.java

index 709172c..9a2b55c 100644 (file)
@@ -223,7 +223,7 @@ jacocoTestReport {
     reports {
         xml.enabled true
         csv.enabled false
-        html.destination "$buildDir/jacocoHtml/test"
+        html.destination file("$buildDir/jacocoHtml/test")
     }
 }
 
@@ -234,7 +234,7 @@ task jacocoThirdPartyReport(type: JacocoReport){
     reports {
         xml.enabled true
         csv.enabled false
-        html.destination "$buildDir/jacocoHtml/3rd"
+        html.destination file("$buildDir/jacocoHtml/3rd")
     }
 }
 
@@ -245,7 +245,7 @@ task jacocoCompositeReport(type: JacocoReport){
     reports {
         xml.enabled true
         csv.enabled false
-        html.destination "$buildDir/jacocoHtml/"
+        html.destination file("$buildDir/jacocoHtml/")
     }
 }
 
@@ -401,6 +401,6 @@ publishing {
     }
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '3.5.1'
+wrapper {
+    gradleVersion = '4.9'
 }
index 99340b4..0d4a951 100644 (file)
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
index 90a06ce..a95009c 100644 (file)
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip
index 7d64af5..4656b1a 100644 (file)
@@ -16,3 +16,4 @@
  * limitations under the License.
  */
 rootProject.name ='Sqoop'
+enableFeaturePreview('STABLE_PUBLISHING')
index 87fce34..94b71b6 100644 (file)
@@ -19,6 +19,7 @@
 package org.apache.sqoop.hbase;
 
 import static org.apache.hadoop.hbase.HConstants.MASTER_INFO_PORT;
+import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_INFO_PORT;
 import static org.apache.hadoop.hbase.HConstants.ZOOKEEPER_CLIENT_PORT;
 import static org.apache.hadoop.hbase.coprocessor.CoprocessorHost.REGION_COPROCESSOR_CONF_KEY;
 import static org.apache.hadoop.hbase.security.HBaseKerberosUtils.KRB_PRINCIPAL;
@@ -77,7 +78,7 @@ public abstract class HBaseTestCase extends ImportJobTestCase {
 
   public static final Log LOG = LogFactory.getLog(
       HBaseTestCase.class.getName());
-  private static final String MASTER_INFO_PORT_DISABLE_WEB_UI = "-1";
+  private static final String INFO_PORT_DISABLE_WEB_UI = "-1";
   private static final String DEFAULT_DFS_HTTPS_ADDRESS = "localhost:0";
 
   private final KerberosConfigurationProvider kerberosConfigurationProvider;
@@ -177,8 +178,10 @@ public abstract class HBaseTestCase extends ImportJobTestCase {
   public void setUp() {
     try {
       hbaseTestUtil = new HBaseTestingUtility();
-      // We set the port for the hbase master web UI to -1 because we do not want the info server to run.
-      hbaseTestUtil.getConfiguration().set(MASTER_INFO_PORT, MASTER_INFO_PORT_DISABLE_WEB_UI);
+      // We set the port for the hbase master and regionserver web UI to -1 because we do not want the info server to run.
+      hbaseTestUtil.getConfiguration().set(MASTER_INFO_PORT, INFO_PORT_DISABLE_WEB_UI);
+      hbaseTestUtil.getConfiguration().set(REGIONSERVER_INFO_PORT, INFO_PORT_DISABLE_WEB_UI);
+
       setupKerberos();
 
       hbaseTestUtil.startMiniCluster();