From 169e8742fc1f144eeb081159453e692214aeebe8 Mon Sep 17 00:00:00 2001
From: Anis Elleuch <vadmeste@users.noreply.github.com>
Date: Thu, 16 Jan 2020 00:48:49 +0100
Subject: [PATCH] mint: Use https for access to maven reposity (#8824)

Maven repository requires HTTPS now. This lead to issues
building mint image in aws-sdk-java & minio-java.

The PR fixes the issue and also bump aws sdk version in
aws-sdk-java to the latest.
---
 mint/build/aws-sdk-java/build.xml | 2 +-
 mint/build/aws-sdk-java/ivy.xml   | 2 +-
 mint/build/minio-java/install.sh  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mint/build/aws-sdk-java/build.xml b/mint/build/aws-sdk-java/build.xml
index 312c54c1f..c7da03693 100644
--- a/mint/build/aws-sdk-java/build.xml
+++ b/mint/build/aws-sdk-java/build.xml
@@ -1,5 +1,5 @@
 <project xmlns:ivy="antlib:org.apache.ivy.ant" name="aws-sdk-java-tests" default="run">
-    <property name="ivy.install.version" value="2.1.0-rc2" />
+    <property name="ivy.install.version" value="2.5.0" />
     <condition property="ivy.home" value="${env.IVY_HOME}">
       <isset property="env.IVY_HOME" />
     </condition>
diff --git a/mint/build/aws-sdk-java/ivy.xml b/mint/build/aws-sdk-java/ivy.xml
index 115c593f3..e61fd0d33 100644
--- a/mint/build/aws-sdk-java/ivy.xml
+++ b/mint/build/aws-sdk-java/ivy.xml
@@ -1,6 +1,6 @@
 <ivy-module version="2.0">
     <info organisation="org.apache" module="aws-sdk-java-tests"/>
     <dependencies>
-	<dependency org="com.amazonaws" name="aws-java-sdk-s3" rev="1.11.289"/>
+	<dependency org="com.amazonaws" name="aws-java-sdk-s3" rev="1.11.706"/>
     </dependencies>
 </ivy-module>
diff --git a/mint/build/minio-java/install.sh b/mint/build/minio-java/install.sh
index 692190b67..399934d8c 100755
--- a/mint/build/minio-java/install.sh
+++ b/mint/build/minio-java/install.sh
@@ -15,7 +15,7 @@
 #  limitations under the License.
 #
 
-MINIO_JAVA_VERSION=$(curl --retry 10 -s "http://repo1.maven.org/maven2/io/minio/minio/maven-metadata.xml" | sed -n "/<latest>/{s/<.[^>]*>//g;p;q}" | sed "s/  *//g")
+MINIO_JAVA_VERSION=$(curl --retry 10 -s "https://repo1.maven.org/maven2/io/minio/minio/maven-metadata.xml" | sed -n "/<latest>/{s/<.[^>]*>//g;p;q}" | sed "s/  *//g")
 if [ -z "$MINIO_JAVA_VERSION" ]; then
     echo "unable to get latest minio-java version from maven"
     exit 1
@@ -24,7 +24,7 @@ fi
 test_run_dir="$MINT_RUN_CORE_DIR/minio-java"
 git clone --quiet https://github.com/minio/minio-java.git "$test_run_dir/minio-java.git"
 (cd "$test_run_dir/minio-java.git"; git checkout --quiet "tags/${MINIO_JAVA_VERSION}")
-$WGET --output-document="$test_run_dir/minio-${MINIO_JAVA_VERSION}-all.jar" "http://repo1.maven.org/maven2/io/minio/minio/${MINIO_JAVA_VERSION}/minio-${MINIO_JAVA_VERSION}-all.jar"
+$WGET --output-document="$test_run_dir/minio-${MINIO_JAVA_VERSION}-all.jar" "https://repo1.maven.org/maven2/io/minio/minio/${MINIO_JAVA_VERSION}/minio-${MINIO_JAVA_VERSION}-all.jar"
 javac -cp "$test_run_dir/minio-${MINIO_JAVA_VERSION}-all.jar" "${test_run_dir}/minio-java.git/functional"/*.java
 cp -a "${test_run_dir}/minio-java.git/functional"/*.class "$test_run_dir/"
 rm -fr "$test_run_dir/minio-java.git"