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

SQOOP-3364: Upgrade Gradle version to 4.9

Browse Source 
(Szabolcs Vasas)
This commit is contained in:
Szabolcs Vasas 2018-08-22 16:29:31 +02:00
parent 005e5d6af8
commit f5eda1e208
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@ -223,7 +223,7 @@ jacocoTestReport {
reports { reports {
xml.enabled true xml.enabled true
csv.enabled false csv.enabled false
html.destination "$buildDir/jacocoHtml/test" html.destination file("$buildDir/jacocoHtml/test")
} }
} }
@ -234,7 +234,7 @@ task jacocoThirdPartyReport(type: JacocoReport){
reports { reports {
xml.enabled true xml.enabled true
csv.enabled false csv.enabled false
html.destination "$buildDir/jacocoHtml/3rd" html.destination file("$buildDir/jacocoHtml/3rd")
} }
} }
@ -245,7 +245,7 @@ task jacocoCompositeReport(type: JacocoReport){
reports { reports {
xml.enabled true xml.enabled true
csv.enabled false csv.enabled false
html.destination "$buildDir/jacocoHtml/" html.destination file("$buildDir/jacocoHtml/")
} }
} }
@ -401,6 +401,6 @@ publishing {
} }
} }
task wrapper(type: Wrapper) { wrapper {
gradleVersion = '3.5.1' gradleVersion = '4.9'
} }

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip

1
settings.gradle
View File

@ -16,3 +16,4 @@
* limitations under the License. * limitations under the License.
*/ */
rootProject.name ='Sqoop' rootProject.name ='Sqoop'
enableFeaturePreview('STABLE_PUBLISHING')

9
src/test/org/apache/sqoop/hbase/HBaseTestCase.java
View File

@ -19,6 +19,7 @@
package org.apache.sqoop.hbase; package org.apache.sqoop.hbase;
import static org.apache.hadoop.hbase.HConstants.MASTER_INFO_PORT; 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.HConstants.ZOOKEEPER_CLIENT_PORT;
import static org.apache.hadoop.hbase.coprocessor.CoprocessorHost.REGION_COPROCESSOR_CONF_KEY; import static org.apache.hadoop.hbase.coprocessor.CoprocessorHost.REGION_COPROCESSOR_CONF_KEY;
import static org.apache.hadoop.hbase.security.HBaseKerberosUtils.KRB_PRINCIPAL; 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( public static final Log LOG = LogFactory.getLog(
HBaseTestCase.class.getName()); 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 static final String DEFAULT_DFS_HTTPS_ADDRESS = "localhost:0";
private final KerberosConfigurationProvider kerberosConfigurationProvider; private final KerberosConfigurationProvider kerberosConfigurationProvider;
@ -177,8 +178,10 @@ public HBaseTestCase(KerberosConfigurationProvider kerberosConfigurationProvider
public void setUp() { public void setUp() {
try { try {
hbaseTestUtil = new HBaseTestingUtility(); 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. // 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, MASTER_INFO_PORT_DISABLE_WEB_UI); hbaseTestUtil.getConfiguration().set(MASTER_INFO_PORT, INFO_PORT_DISABLE_WEB_UI);
hbaseTestUtil.getConfiguration().set(REGIONSERVER_INFO_PORT, INFO_PORT_DISABLE_WEB_UI);
setupKerberos(); setupKerberos();
hbaseTestUtil.startMiniCluster(); hbaseTestUtil.startMiniCluster();