Skip to content

Commit 7d66c37

Browse files
committed
fix maven download url
1 parent 703c5ae commit 7d66c37

File tree

3 files changed

+27
-18
lines changed

3 files changed

+27
-18
lines changed

weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/installJdbcDrivers.sh

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,17 @@ function validate_input() {
6767
}
6868

6969
function install_maven() {
70-
curl -m ${curlMaxTime} --retry ${retryMaxAttempt} -fksL "${url4MavenInstaller}" -o ${mvnInstaller}
70+
local mavenUrl=$(curl -Ls -o /dev/null -w %{url_effective} ${url4MavenInstaller})
7171
if [ $? != 0 ]; then
72-
echo_stderr "Failed to download ${url4MavenInstaller}."
72+
echo_stderr "Failed to get maven download url."
73+
fi
74+
curl -m ${curlMaxTime} --retry ${retryMaxAttempt} -fksL "${mavenUrl}" -o ${mvnInstaller}
75+
if [ $? != 0 ]; then
76+
echo_stderr "Failed to download ${mavenUrl}."
7377
fi
7478

7579
tar xzvf ${mvnInstaller} -C /u01/app
76-
export MAVEN_HOME=/u01/app/apache-maven-${mvnVersion}
80+
export MAVEN_HOME=/u01/app/apache-maven
7781
. $oracleHome/oracle_common/common/bin/setWlstEnv.sh # set JAVA_HOME
7882
export PATH=${MAVEN_HOME}/bin:$PATH
7983

@@ -239,10 +243,9 @@ read oracleHome domainPath wlsServerName wlsAdminHost wlsAdminPort wlsUserName w
239243
export curlMaxTime=120 # seconds
240244
export gitUrl4AzureIdentityExtensionPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml"
241245
export gitUrl4MySQLDriverPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/mysql-connector-java.xml"
242-
export mvnVersion="3.9.0"
243-
export mvnInstaller="apache-maven-${mvnVersion}-bin.tar.gz"
244246
export retryMaxAttempt=5 # retry attempt for curl command
245-
export url4MavenInstaller="https://dlcdn.apache.org/maven/maven-3/${mvnVersion}/binaries/${mvnInstaller}"
247+
export mvnInstaller="apache-maven-bin.tar.gz"
248+
export url4MavenInstaller="https://aka.ms/wls-offer-maven-download-url"
246249
export wlsAdminURL=$wlsAdminHost:$wlsAdminPort
247250

248251
validate_input

weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/installJdbcDrivers.sh

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,17 @@ function validate_input() {
6767
}
6868

6969
function install_maven() {
70-
curl -m ${curlMaxTime} --retry ${retryMaxAttempt} -fksL "${url4MavenInstaller}" -o ${mvnInstaller}
70+
local mavenUrl=$(curl -Ls -o /dev/null -w %{url_effective} ${url4MavenInstaller})
7171
if [ $? != 0 ]; then
72-
echo_stderr "Failed to download ${url4MavenInstaller}."
72+
echo_stderr "Failed to get maven download url."
73+
fi
74+
curl -m ${curlMaxTime} --retry ${retryMaxAttempt} -fksL "${mavenUrl}" -o ${mvnInstaller}
75+
if [ $? != 0 ]; then
76+
echo_stderr "Failed to download ${mavenUrl}."
7377
fi
7478

7579
tar xzvf ${mvnInstaller} -C /u01/app
76-
export MAVEN_HOME=/u01/app/apache-maven-${mvnVersion}
80+
export MAVEN_HOME=/u01/app/apache-maven
7781
. $oracleHome/oracle_common/common/bin/setWlstEnv.sh # set JAVA_HOME
7882
export PATH=${MAVEN_HOME}/bin:$PATH
7983

@@ -239,10 +243,9 @@ read oracleHome domainPath wlsServerName wlsAdminHost wlsAdminPort wlsUserName w
239243
export curlMaxTime=120 # seconds
240244
export gitUrl4AzureIdentityExtensionPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml"
241245
export gitUrl4MySQLDriverPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/mysql-connector-java.xml"
242-
export mvnVersion="3.9.0"
243-
export mvnInstaller="apache-maven-${mvnVersion}-bin.tar.gz"
244246
export retryMaxAttempt=5 # retry attempt for curl command
245-
export url4MavenInstaller="https://dlcdn.apache.org/maven/maven-3/${mvnVersion}/binaries/${mvnInstaller}"
247+
export mvnInstaller="apache-maven-bin.tar.gz"
248+
export url4MavenInstaller="https://aka.ms/wls-offer-maven-download-url"
246249
export wlsAdminURL=$wlsAdminHost:$wlsAdminPort
247250

248251
validate_input

weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/installJdbcDrivers.sh

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,17 @@ function validate_input() {
6767
}
6868

6969
function install_maven() {
70-
curl -m ${curlMaxTime} --retry ${retryMaxAttempt} -fksL "${url4MavenInstaller}" -o ${mvnInstaller}
70+
local mavenUrl=$(curl -Ls -o /dev/null -w %{url_effective} ${url4MavenInstaller})
7171
if [ $? != 0 ]; then
72-
echo_stderr "Failed to download ${url4MavenInstaller}."
72+
echo_stderr "Failed to get maven download url."
73+
fi
74+
curl -m ${curlMaxTime} --retry ${retryMaxAttempt} -fksL "${mavenUrl}" -o ${mvnInstaller}
75+
if [ $? != 0 ]; then
76+
echo_stderr "Failed to download ${mavenUrl}."
7377
fi
7478

7579
tar xzvf ${mvnInstaller} -C /u01/app
76-
export MAVEN_HOME=/u01/app/apache-maven-${mvnVersion}
80+
export MAVEN_HOME=/u01/app/apache-maven
7781
. $oracleHome/oracle_common/common/bin/setWlstEnv.sh # set JAVA_HOME
7882
export PATH=${MAVEN_HOME}/bin:$PATH
7983

@@ -239,10 +243,9 @@ read oracleHome domainPath wlsServerName wlsAdminHost wlsAdminPort wlsUserName w
239243
export curlMaxTime=120 # seconds
240244
export gitUrl4AzureIdentityExtensionPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml"
241245
export gitUrl4MySQLDriverPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/mysql-connector-java.xml"
242-
export mvnVersion="3.9.0"
243-
export mvnInstaller="apache-maven-${mvnVersion}-bin.tar.gz"
244246
export retryMaxAttempt=5 # retry attempt for curl command
245-
export url4MavenInstaller="https://dlcdn.apache.org/maven/maven-3/${mvnVersion}/binaries/${mvnInstaller}"
247+
export mvnInstaller="apache-maven-bin.tar.gz"
248+
export url4MavenInstaller="https://aka.ms/wls-offer-maven-download-url"
246249
export wlsAdminURL=$wlsAdminHost:$wlsAdminPort
247250

248251
validate_input

0 commit comments

Comments
 (0)