From fa5bbbdb59326f4e7bb6cec00d6ef3305b41ca94 Mon Sep 17 00:00:00 2001
From: cspchen <cspchen@amazon.com>
Date: Tue, 17 Aug 2021 15:52:20 +0800
Subject: [PATCH] # This is a combination of 35 commits. parent
 1ea18edce197b402cbfbaaaa54a94347501d92ab author cspchen <cspchen@amazon.com>
 1629186478 +0800 committer cspchen <cspchen@amazon.com> 1629186485 +0800

# This is a combination of 21 commits.
# This is the 1st commit message:

FIX: loading on Linux platform

# This is the commit message #2:

UPDATE: ci for java-package

# This is the commit message #3:

UPDATE: ci for java-package

# This is the commit message #4:

UPDATE: ci for java-package

# This is the commit message #5:

UPDATE: ci for java-package

# This is the commit message #6:

UPDATE: ci for java-package

# This is the commit message #7:

UPDATE: ci for java-package

# This is the commit message #8:

UPDATE: ci for java-package

# This is the commit message #9:

UPDATE: ci for java-package

# This is the commit message #10:

UPDATE: ci for java-package

# This is the commit message #11:

UPDATE: ci for java-package

# This is the commit message #12:

UPDATE: ci for java-package

# This is the commit message #13:

UPDATE: ci for java-package

# This is the commit message #14:

UPDATE: ci for java-package

# This is the commit message #15:

UPDATE: ci for java-package

# This is the commit message #16:

UPDATE: ci for java-package

# This is the commit message #17:

UPDATE: ci for java-package

# This is the commit message #18:

UPDATE: ci for java-package

# This is the commit message #19:

UPDATE: ci for java-package

# This is the commit message #20:

UPDATE: ci for java-package

# This is the commit message #21:

UPDATE: ci for java-package

# This is the commit message #22:

UPDATE: ci for java-package

# This is the commit message #23:

UPDATE: jenkins ci scripts for java-package

# This is the commit message #24:

UPDATE: jenkins ci scripts for java-package

# This is the commit message #25:

UPDATE: jenkins ci scripts for java-package

# This is the commit message #26:

UPDATE: jenkins ci scripts for java-package

# This is the commit message #27:

UPDATE: jenkins ci scripts for java-package

# This is the commit message #28:

UPDATE: jenkins ci scripts for java-package

# This is the commit message #30:

UPDATE: jenkins ci scripts for java-package

# This is the commit message #31:

UPDATE: jenkins ci scripts for java-package

# This is the commit message #32:

UPDATE: jenkins ci scripts for java-package

# This is the commit message #33:

UPDATE: jenkins ci scripts for java-package

# This is the commit message #34:

FIX: issues in Resource close methods

# This is the commit message #35:

FIX: issues in Resource close methods
---
 ci/docker/runtime_functions.sh              |  3 ++-
 java-package/scripts/setup_gradle_ubuntu.sh | 15 ---------------
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 java-package/scripts/setup_gradle_ubuntu.sh

diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 85619f881f4b..76536ce0abe0 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -326,7 +326,8 @@ java_package_integration_test() {
     apt-get update -y
     apt-get install gradle -y
     # build java prokect
-    ./gradle build -x javadoc
+    cd /work/mxnet/java-package
+    ./gradlew build -x javadoc
     # generate native library
     ./gradlew :native:buildLocalLibraryJarDefault
     ./gradlew :native:mkl-linuxJar
diff --git a/java-package/scripts/setup_gradle_ubuntu.sh b/java-package/scripts/setup_gradle_ubuntu.sh
deleted file mode 100644
index 5450430fa6d5..000000000000
--- a/java-package/scripts/setup_gradle_ubuntu.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-integration_test() {
-    # install gradle
-    add-apt-repository ppa:cwchien/gradle
-    apt-get update -y
-    apt-get install gradle -y
-    # build java prokect
-    cd /work/mxnet/java-package
-    ./gradle build -x javadoc
-    # generate native library
-    ./gradlew :native:buildLocalLibraryJarDefault
-    ./gradlew :native:mkl-linuxJar
-    # run integration
-    ./gradlew :integration:run
-}
-