MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-25 22:55:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

mint: Use https for access to maven reposity (#8824)

Browse Source 
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.
This commit is contained in:
Anis Elleuch 2020-01-16 00:48:49 +01:00 committed by Harshavardhana
parent 069876e262
commit 169e8742fc
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mint/build/aws-sdk-java/build.xml
View File

@ -1,5 +1,5 @@
<project xmlns:ivy="antlib:org.apache.ivy.ant" name="aws-sdk-java-tests" default="run"> <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}"> <condition property="ivy.home" value="${env.IVY_HOME}">
<isset property="env.IVY_HOME" /> <isset property="env.IVY_HOME" />
</condition> </condition>

2
mint/build/aws-sdk-java/ivy.xml
View File

@ -1,6 +1,6 @@
<ivy-module version="2.0"> <ivy-module version="2.0">
<info organisation="org.apache" module="aws-sdk-java-tests"/> <info organisation="org.apache" module="aws-sdk-java-tests"/>
<dependencies> <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> </dependencies>
</ivy-module> </ivy-module>

4
mint/build/minio-java/install.sh
View File

@ -15,7 +15,7 @@
# limitations under the License. # 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 if [ -z "$MINIO_JAVA_VERSION" ]; then
echo "unable to get latest minio-java version from maven" echo "unable to get latest minio-java version from maven"
exit 1 exit 1
@ -24,7 +24,7 @@ fi
test_run_dir="$MINT_RUN_CORE_DIR/minio-java" 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" 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}") (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 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/" cp -a "${test_run_dir}/minio-java.git/functional"/*.class "$test_run_dir/"
rm -fr "$test_run_dir/minio-java.git" rm -fr "$test_run_dir/minio-java.git"